Forgotten test file.

author: murphy <murphy@rubychan.de> 2009-06-13 01:25:38 +0000
committer: murphy <murphy@rubychan.de> 2009-06-13 01:25:38 +0000
commit: 811e389a2b1c1967178ee5797c8e0934bfe83a29 (patch)
tree: 8629253c87601360b1b312d87dd4c59e60e559e7
parent: 6287a02ff06e5f3af73e031117ab3876f1db348a (diff)
download: coderay-811e389a2b1c1967178ee5797c8e0934bfe83a29.tar.gz
1 files changed, 779 insertions, 779 deletions
diff --git a/test/scanners/python/pygments.expected.raydebug b/test/scanners/python/pygments.expected.raydebug
index 7084bd7..5d82bb0 100644
--- a/test/scanners/python/pygments.expected.raydebug
+++ b/test/scanners/python/pygments.expected.raydebug
@@ -36,7 +36,7 @@ ident(LEXERDOC) operator(=) string<delimiter(''')content(
 )content(
 )delimiter(''')>
 
-keyword(def) ident(generate_lexer_docs)operator(()operator(\))operator(:)
+keyword(def) method(generate_lexer_docs)operator(()operator(\))operator(:)
     keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(LEXERS)
 
     ident(out) operator(=) operator([)operator(])
@@ -65,7 +65,7 @@ keyword(def) ident(generate_lexer_docs)operator(()operator(\))operator(:)
             ident(out)operator(.)ident(append)operator(()ident(LEXERDOC) operator(%) ident(data)operator(\))
     keyword(return) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(out)operator(\))
 
-keyword(def) ident(generate_formatter_docs)operator(()operator(\))operator(:)
+keyword(def) method(generate_formatter_docs)operator(()operator(\))operator(:)
     keyword(from) ident(pygments)operator(.)ident(formatters) keyword(import) ident(FORMATTERS)
 
     ident(out) operator(=) operator([)operator(])
@@ -82,7 +82,7 @@ keyword(def) ident(generate_formatter_docs)operator(()operator(\))operator(:)
 )delimiter(''')> operator(%) operator(()string<delimiter(')content(, )delimiter(')>operator(.)ident(join)operator(()ident(data)operator([)integer(1)operator(])operator(\)) keyword(or) string<delimiter(')content(None)delimiter(')>operator(,) string<delimiter(')content(, )delimiter(')>operator(.)ident(join)operator(()ident(data)operator([)integer(2)operator(])operator(\))operator(.)ident(replace)operator(()string<delimiter(')content(*)delimiter(')>operator(,) string<delimiter(')char(\\\\)content(*)delimiter(')>operator(\)) keyword(or) string<delimiter(')content(None)delimiter(')>operator(\))operator(\))
     keyword(return) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(out)operator(\))
 
-keyword(def) ident(generate_filter_docs)operator(()operator(\))operator(:)
+keyword(def) method(generate_filter_docs)operator(()operator(\))operator(:)
     keyword(from) ident(pygments)operator(.)ident(filters) keyword(import) ident(FILTERS)
 
     ident(out) operator(=) operator([)operator(])
@@ -94,7 +94,7 @@ keyword(def) ident(generate_filter_docs)operator(()operator(\))operator(:)
 )delimiter(''')> operator(%) operator(()ident(cls)operator(.)ident(__name__)operator(,) ident(cls)operator(.)ident(__doc__)operator(,) ident(name)operator(\))operator(\))
     keyword(return) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(out)operator(\))
 
-keyword(def) ident(generate_changelog)operator(()operator(\))operator(:)
+keyword(def) method(generate_changelog)operator(()operator(\))operator(:)
     ident(fn) operator(=) ident(os)operator(.)ident(path)operator(.)ident(abspath)operator(()ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(os)operator(.)ident(path)operator(.)ident(dirname)operator(()ident(__file__)operator(\))operator(,) string<delimiter(')content(..)delimiter(')>operator(,)
                          string<delimiter(')content(CHANGES)delimiter(')>operator(\))operator(\))
     ident(f) operator(=) predefined(file)operator(()ident(fn)operator(\))
@@ -112,7 +112,7 @@ keyword(def) ident(generate_changelog)operator(()operator(\))operator(:)
     ident(f)operator(.)ident(close)operator(()operator(\))
     keyword(return) string<delimiter(')char(\\n)delimiter(')>operator(.)ident(join)operator(()ident(result)operator(\))
 
-keyword(def) ident(generate_authors)operator(()operator(\))operator(:)
+keyword(def) method(generate_authors)operator(()operator(\))operator(:)
     ident(fn) operator(=) ident(os)operator(.)ident(path)operator(.)ident(abspath)operator(()ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(os)operator(.)ident(path)operator(.)ident(dirname)operator(()ident(__file__)operator(\))operator(,) string<delimiter(')content(..)delimiter(')>operator(,)
                          string<delimiter(')content(AUTHORS)delimiter(')>operator(\))operator(\))
     ident(f) operator(=) predefined(file)operator(()ident(fn)operator(\))
@@ -310,7 +310,7 @@ ident(STYLESHEET) operator(=) string<delimiter(''')char(\\
 )delimiter(''')> comment(#')
 
 
-keyword(def) ident(pygments_directive)operator(()ident(name)operator(,) ident(arguments)operator(,) ident(options)operator(,) ident(content)operator(,) ident(lineno)operator(,)
+keyword(def) method(pygments_directive)operator(()ident(name)operator(,) ident(arguments)operator(,) ident(options)operator(,) ident(content)operator(,) ident(lineno)operator(,)
                       ident(content_offset)operator(,) ident(block_text)operator(,) ident(state)operator(,) ident(state_machine)operator(\))operator(:)
     keyword(try)operator(:)
         ident(lexer) operator(=) ident(get_lexer_by_name)operator(()ident(arguments)operator([)integer(0)operator(])operator(\))
@@ -324,9 +324,9 @@ ident(pygments_directive)operator(.)ident(content) operator(=) integer(1)
 ident(directives)operator(.)ident(register_directive)operator(()string<delimiter(')content(sourcecode)delimiter(')>operator(,) ident(pygments_directive)operator(\))
 
 
-keyword(def) ident(create_translator)operator(()ident(link_style)operator(\))operator(:)
-    keyword(class) ident(Translator)operator(()ident(html4css1)operator(.)ident(HTMLTranslator)operator(\))operator(:)
-        keyword(def) ident(visit_reference)operator(()pre_constant(self)operator(,) ident(node)operator(\))operator(:)
+keyword(def) method(create_translator)operator(()ident(link_style)operator(\))operator(:)
+    keyword(class) class(Translator)operator(()ident(html4css1)operator(.)ident(HTMLTranslator)operator(\))operator(:)
+        keyword(def) method(visit_reference)operator(()pre_constant(self)operator(,) ident(node)operator(\))operator(:)
             ident(refuri) operator(=) ident(node)operator(.)ident(get)operator(()string<delimiter(')content(refuri)delimiter(')>operator(\))
             keyword(if) ident(refuri) keyword(is) keyword(not) pre_constant(None) keyword(and) string<delimiter(')content(/)delimiter(')> keyword(not) keyword(in) ident(refuri) keyword(and) ident(refuri)operator(.)ident(endswith)operator(()string<delimiter(')content(.txt)delimiter(')>operator(\))operator(:)
                 ident(node)operator([)string<delimiter(')content(refuri)delimiter(')>operator(]) operator(=) ident(link_style)operator(()ident(refuri)operator([)operator(:)operator(-)integer(4)operator(])operator(\))
@@ -334,13 +334,13 @@ keyword(def) ident(create_translator)operator(()ident(link_style)operator(\))ope
     keyword(return) ident(Translator)
 
 
-keyword(class) ident(DocumentationWriter)operator(()ident(html4css1)operator(.)ident(Writer)operator(\))operator(:)
+keyword(class) class(DocumentationWriter)operator(()ident(html4css1)operator(.)ident(Writer)operator(\))operator(:)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(link_style)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(link_style)operator(\))operator(:)
         ident(html4css1)operator(.)ident(Writer)operator(.)ident(__init__)operator(()pre_constant(self)operator(\))
         pre_constant(self)operator(.)ident(translator_class) operator(=) ident(create_translator)operator(()ident(link_style)operator(\))
 
-    keyword(def) ident(translate)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(translate)operator(()pre_constant(self)operator(\))operator(:)
         ident(html4css1)operator(.)ident(Writer)operator(.)ident(translate)operator(()pre_constant(self)operator(\))
         comment(# generate table of contents)
         ident(contents) operator(=) pre_constant(self)operator(.)ident(build_contents)operator(()pre_constant(self)operator(.)ident(document)operator(\))
@@ -350,7 +350,7 @@ keyword(class) ident(DocumentationWriter)operator(()ident(html4css1)operator(.)i
         ident(contents_doc)operator(.)ident(walkabout)operator(()ident(contents_visitor)operator(\))
         pre_constant(self)operator(.)ident(parts)operator([)string<delimiter(')content(toc)delimiter(')>operator(]) operator(=) pre_constant(self)operator(.)ident(_generated_toc)
 
-    keyword(def) ident(build_contents)operator(()pre_constant(self)operator(,) ident(node)operator(,) ident(level)operator(=)integer(0)operator(\))operator(:)
+    keyword(def) method(build_contents)operator(()pre_constant(self)operator(,) ident(node)operator(,) ident(level)operator(=)integer(0)operator(\))operator(:)
         ident(sections) operator(=) operator([)operator(])
         ident(i) operator(=) predefined(len)operator(()ident(node)operator(\)) operator(-) integer(1)
         keyword(while) ident(i) operator(>=) integer(0) keyword(and) predefined(isinstance)operator(()ident(node)operator([)ident(i)operator(])operator(,) ident(nodes)operator(.)ident(section)operator(\))operator(:)
@@ -372,7 +372,7 @@ keyword(class) ident(DocumentationWriter)operator(()ident(html4css1)operator(.)i
         keyword(return) operator([)operator(])
 
 
-keyword(def) ident(generate_documentation)operator(()ident(data)operator(,) ident(link_style)operator(\))operator(:)
+keyword(def) method(generate_documentation)operator(()ident(data)operator(,) ident(link_style)operator(\))operator(:)
     ident(writer) operator(=) ident(DocumentationWriter)operator(()ident(link_style)operator(\))
     ident(data) operator(=) ident(data)operator(.)ident(replace)operator(()string<delimiter(')content([builtin_lexer_docs])delimiter(')>operator(,) ident(LEXERDOCS)operator(\))operator(.)\
                 ident(replace)operator(()string<delimiter(')content([builtin_formatter_docs])delimiter(')>operator(,) ident(FORMATTERDOCS)operator(\))operator(.)\
@@ -394,11 +394,11 @@ keyword(def) ident(generate_documentation)operator(()ident(data)operator(,) iden
     operator(})
 
 
-keyword(def) ident(handle_python)operator(()ident(filename)operator(,) ident(fp)operator(,) ident(dst)operator(\))operator(:)
+keyword(def) method(handle_python)operator(()ident(filename)operator(,) ident(fp)operator(,) ident(dst)operator(\))operator(:)
     ident(now) operator(=) ident(datetime)operator(.)ident(now)operator(()operator(\))
     ident(title) operator(=) ident(os)operator(.)ident(path)operator(.)ident(basename)operator(()ident(filename)operator(\))operator([)operator(:)operator(-)integer(4)operator(])
     ident(content) operator(=) ident(fp)operator(.)ident(read)operator(()operator(\))
-    keyword(def) ident(urlize)operator(()ident(href)operator(\))operator(:)
+    keyword(def) method(urlize)operator(()ident(href)operator(\))operator(:)
         comment(# create links for the pygments webpage)
         keyword(if) ident(href) operator(==) string<delimiter(')content(index.txt)delimiter(')>operator(:)
             keyword(return) string<delimiter(')content(/docs/)delimiter(')>
@@ -418,7 +418,7 @@ keyword(def) ident(handle_python)operator(()ident(filename)operator(,) ident(fp)
     ident(result)operator(.)ident(close)operator(()operator(\))
 
 
-keyword(def) ident(handle_html)operator(()ident(filename)operator(,) ident(fp)operator(,) ident(dst)operator(\))operator(:)
+keyword(def) method(handle_html)operator(()ident(filename)operator(,) ident(fp)operator(,) ident(dst)operator(\))operator(:)
     ident(now) operator(=) ident(datetime)operator(.)ident(now)operator(()operator(\))
     ident(title) operator(=) ident(os)operator(.)ident(path)operator(.)ident(basename)operator(()ident(filename)operator(\))operator([)operator(:)operator(-)integer(4)operator(])
     ident(content) operator(=) ident(fp)operator(.)ident(read)operator(()operator(\))
@@ -432,7 +432,7 @@ keyword(def) ident(handle_html)operator(()ident(filename)operator(,) ident(fp)op
     ident(result)operator(.)ident(close)operator(()operator(\))
 
 
-keyword(def) ident(run)operator(()ident(handle_file)operator(,) ident(dst)operator(,) ident(sources)operator(=)operator(()operator(\))operator(\))operator(:)
+keyword(def) method(run)operator(()ident(handle_file)operator(,) ident(dst)operator(,) ident(sources)operator(=)operator(()operator(\))operator(\))operator(:)
     ident(path) operator(=) ident(os)operator(.)ident(path)operator(.)ident(abspath)operator(()ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(os)operator(.)ident(path)operator(.)ident(dirname)operator(()ident(__file__)operator(\))operator(,) string<delimiter(')content(src)delimiter(')>operator(\))operator(\))
     keyword(if) keyword(not) ident(sources)operator(:)
         ident(sources) operator(=) operator([)ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(path)operator(,) ident(fn)operator(\)) keyword(for) ident(fn) keyword(in) ident(os)operator(.)ident(listdir)operator(()ident(path)operator(\))operator(])
@@ -447,7 +447,7 @@ keyword(def) ident(run)operator(()ident(handle_file)operator(,) ident(dst)operat
             ident(f)operator(.)ident(close)operator(()operator(\))
 
 
-keyword(def) ident(main)operator(()ident(mode)operator(,) ident(dst)operator(=)string<delimiter(')content(build/)delimiter(')>operator(,) operator(*)ident(sources)operator(\))operator(:)
+keyword(def) method(main)operator(()ident(mode)operator(,) ident(dst)operator(=)string<delimiter(')content(build/)delimiter(')>operator(,) operator(*)ident(sources)operator(\))operator(:)
     keyword(try)operator(:)
         ident(handler) operator(=) operator({)
             string<delimiter(')content(html)delimiter(')>operator(:)         ident(handle_html)operator(,)
@@ -513,15 +513,15 @@ keyword(from) ident(pygments)operator(.)ident(formatters) keyword(import) ident(
 keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(get_lexer_by_name)operator(,) ident(TextLexer)
 
 
-keyword(class) ident(CodeBlockPreprocessor)operator(()ident(TextPreprocessor)operator(\))operator(:)
+keyword(class) class(CodeBlockPreprocessor)operator(()ident(TextPreprocessor)operator(\))operator(:)
 
     ident(pattern) operator(=) ident(re)operator(.)ident(compile)operator(()
         string<modifier(r)delimiter(')content(\\[)content(sourcecode:(.+?\))content(\\])content((.+?\))content(\\[)content(/sourcecode)content(\\])delimiter(')>operator(,) ident(re)operator(.)ident(S)operator(\))
 
     ident(formatter) operator(=) ident(HtmlFormatter)operator(()ident(noclasses)operator(=)ident(INLINESTYLES)operator(\))
 
-    keyword(def) ident(run)operator(()pre_constant(self)operator(,) ident(lines)operator(\))operator(:)
-        keyword(def) ident(repl)operator(()ident(m)operator(\))operator(:)
+    keyword(def) method(run)operator(()pre_constant(self)operator(,) ident(lines)operator(\))operator(:)
+        keyword(def) method(repl)operator(()ident(m)operator(\))operator(:)
             keyword(try)operator(:)
                 ident(lexer) operator(=) ident(get_lexer_by_name)operator(()ident(m)operator(.)ident(group)operator(()integer(1)operator(\))operator(\))
             keyword(except) exception(ValueError)operator(:)
@@ -587,8 +587,8 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(ClassN
 
 
 comment(# wrap lines in <span>s so that the Moin-generated line numbers work)
-keyword(class) ident(MoinHtmlFormatter)operator(()ident(HtmlFormatter)operator(\))operator(:)
-    keyword(def) ident(wrap)operator(()pre_constant(self)operator(,) ident(source)operator(,) ident(outfile)operator(\))operator(:)
+keyword(class) class(MoinHtmlFormatter)operator(()ident(HtmlFormatter)operator(\))operator(:)
+    keyword(def) method(wrap)operator(()pre_constant(self)operator(,) ident(source)operator(,) ident(outfile)operator(\))operator(:)
         keyword(for) ident(line) keyword(in) ident(source)operator(:)
             keyword(yield) integer(1)operator(,) string<delimiter(')content(<span class="line">)delimiter(')> operator(+) ident(line)operator([)integer(1)operator(]) operator(+) string<delimiter(')content(</span>)delimiter(')>
 
@@ -597,7 +597,7 @@ ident(textlexer) operator(=) ident(TextLexer)operator(()operator(\))
 ident(codeid) operator(=) operator([)integer(0)operator(])
 
 
-keyword(class) ident(Parser)operator(:)
+keyword(class) class(Parser)operator(:)
     string<delimiter(""")content(
 )content(    MoinMoin Pygments parser.)content(
 )content(    )delimiter(""")>
@@ -608,7 +608,7 @@ keyword(class) ident(Parser)operator(:)
 
     ident(Dependencies) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(raw)operator(,) ident(request)operator(,) operator(**)ident(kw)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(raw)operator(,) ident(request)operator(,) operator(**)ident(kw)operator(\))operator(:)
         pre_constant(self)operator(.)ident(raw) operator(=) ident(raw)
         pre_constant(self)operator(.)ident(req) operator(=) ident(request)
         keyword(if) string<delimiter(")content(format_args)delimiter(")> keyword(in) ident(kw)operator(:)
@@ -635,9 +635,9 @@ keyword(class) ident(Parser)operator(:)
         keyword(except) ident(ClassNotFound)operator(:)
             pre_constant(self)operator(.)ident(lexer) operator(=) ident(textlexer)
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(formatter)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(formatter)operator(\))operator(:)
         ident(codeid)operator([)integer(0)operator(]) operator(+=) integer(1)
-        predefined(id) operator(=) string<delimiter(")content(pygments_%s)delimiter(")> operator(%) ident(codeid)operator([)integer(0)operator(])
+        ident(id) operator(=) string<delimiter(")content(pygments_%s)delimiter(")> operator(%) ident(codeid)operator([)integer(0)operator(])
         ident(w) operator(=) pre_constant(self)operator(.)ident(req)operator(.)ident(write)
         ident(w)operator(()ident(formatter)operator(.)ident(code_area)operator(()integer(1)operator(,) predefined(id)operator(,) ident(start)operator(=)integer(1)operator(,) ident(step)operator(=)integer(1)operator(\))operator(\))
         ident(w)operator(()ident(formatter)operator(.)ident(rawHTML)operator(()ident(highlight)operator(()pre_constant(self)operator(.)ident(raw)operator(,) pre_constant(self)operator(.)ident(lexer)operator(,) ident(htmlformatter)operator(\))operator(\))operator(\))
@@ -702,7 +702,7 @@ keyword(from) ident(docutils)operator(.)ident(parsers)operator(.)ident(rst) keyw
 keyword(from) ident(pygments) keyword(import) ident(highlight)
 keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(get_lexer_by_name)operator(,) ident(TextLexer)
 
-keyword(def) ident(pygments_directive)operator(()ident(name)operator(,) ident(arguments)operator(,) ident(options)operator(,) ident(content)operator(,) ident(lineno)operator(,)
+keyword(def) method(pygments_directive)operator(()ident(name)operator(,) ident(arguments)operator(,) ident(options)operator(,) ident(content)operator(,) ident(lineno)operator(,)
                        ident(content_offset)operator(,) ident(block_text)operator(,) ident(state)operator(,) ident(state_machine)operator(\))operator(:)
     keyword(try)operator(:)
         ident(lexer) operator(=) ident(get_lexer_by_name)operator(()ident(arguments)operator([)integer(0)operator(])operator(\))
@@ -779,7 +779,7 @@ keyword(import) ident(sys)operator(,) ident(os)
 keyword(try)operator(:) keyword(from) ident(hashlib) keyword(import) ident(md5)
 keyword(except) exception(ImportError)operator(:) keyword(from) ident(md5) keyword(import) ident(md5)
 
-keyword(def) ident(_validate_md5)operator(()ident(egg_name)operator(,) ident(data)operator(\))operator(:)
+keyword(def) method(_validate_md5)operator(()ident(egg_name)operator(,) ident(data)operator(\))operator(:)
     keyword(if) ident(egg_name) keyword(in) ident(md5_data)operator(:)
         ident(digest) operator(=) ident(md5)operator(()ident(data)operator(\))operator(.)ident(hexdigest)operator(()operator(\))
         keyword(if) ident(digest) operator(!=) ident(md5_data)operator([)ident(egg_name)operator(])operator(:)
@@ -790,7 +790,7 @@ keyword(def) ident(_validate_md5)operator(()ident(egg_name)operator(,) ident(dat
             ident(sys)operator(.)ident(exit)operator(()integer(2)operator(\))
     keyword(return) ident(data)
 
-keyword(def) ident(use_setuptools)operator(()
+keyword(def) method(use_setuptools)operator(()
     ident(version)operator(=)ident(DEFAULT_VERSION)operator(,) ident(download_base)operator(=)ident(DEFAULT_URL)operator(,) ident(to_dir)operator(=)ident(os)operator(.)ident(curdir)operator(,)
     ident(download_delay)operator(=)integer(15)
 operator(\))operator(:)
@@ -806,7 +806,7 @@ operator(\))operator(:)
 )content(    an attempt to abort the calling script.)content(
 )content(    )delimiter(""")>
     ident(was_imported) operator(=) string<delimiter(')content(pkg_resources)delimiter(')> keyword(in) ident(sys)operator(.)ident(modules) keyword(or) string<delimiter(')content(setuptools)delimiter(')> keyword(in) ident(sys)operator(.)ident(modules)
-    keyword(def) ident(do_download)operator(()operator(\))operator(:)
+    keyword(def) method(do_download)operator(()operator(\))operator(:)
         ident(egg) operator(=) ident(download_setuptools)operator(()ident(version)operator(,) ident(download_base)operator(,) ident(to_dir)operator(,) ident(download_delay)operator(\))
         ident(sys)operator(.)ident(path)operator(.)ident(insert)operator(()integer(0)operator(,) ident(egg)operator(\))
         keyword(import) ident(setuptools)operator(;) ident(setuptools)operator(.)ident(bootstrap_install_from) operator(=) ident(egg)
@@ -831,7 +831,7 @@ operator(\))operator(:)
     keyword(except) ident(pkg_resources)operator(.)ident(DistributionNotFound)operator(:)
         keyword(return) ident(do_download)operator(()operator(\))
 
-keyword(def) ident(download_setuptools)operator(()
+keyword(def) method(download_setuptools)operator(()
     ident(version)operator(=)ident(DEFAULT_VERSION)operator(,) ident(download_base)operator(=)ident(DEFAULT_URL)operator(,) ident(to_dir)operator(=)ident(os)operator(.)ident(curdir)operator(,)
     ident(delay) operator(=) integer(15)
 operator(\))operator(:)
@@ -913,7 +913,7 @@ operator(\))operator(:)
 
 
 
-keyword(def) ident(main)operator(()ident(argv)operator(,) ident(version)operator(=)ident(DEFAULT_VERSION)operator(\))operator(:)
+keyword(def) method(main)operator(()ident(argv)operator(,) ident(version)operator(=)ident(DEFAULT_VERSION)operator(\))operator(:)
     string<delimiter(""")content(Install or upgrade setuptools and EasyInstall)delimiter(""")>
     keyword(try)operator(:)
         keyword(import) ident(setuptools)
@@ -954,7 +954,7 @@ keyword(def) ident(main)operator(()ident(argv)operator(,) ident(version)operator
             keyword(print) string<delimiter(")content(Setuptools version)delimiter(")>operator(,)ident(version)operator(,)string<delimiter(")content(or greater has been installed.)delimiter(")>
             keyword(print) string<delimiter(')content((Run "ez_setup.py -U setuptools" to reinstall or upgrade.\))delimiter(')>
 
-keyword(def) ident(update_md5)operator(()ident(filenames)operator(\))operator(:)
+keyword(def) method(update_md5)operator(()ident(filenames)operator(\))operator(:)
     string<delimiter(""")content(Update our built-in md5 registry)delimiter(""")>
 
     keyword(import) ident(re)
@@ -1032,7 +1032,7 @@ keyword(import) ident(sys)operator(,) ident(os)
 keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(StringIO)operator(,) ident(BytesIO)
 
 
-keyword(def) ident(lex)operator(()ident(code)operator(,) ident(lexer)operator(\))operator(:)
+keyword(def) method(lex)operator(()ident(code)operator(,) ident(lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lex ``code`` with ``lexer`` and return an iterable of tokens.)content(
 )content(    )delimiter(""")>
@@ -1046,7 +1046,7 @@ keyword(def) ident(lex)operator(()ident(code)operator(,) ident(lexer)operator(\)
         keyword(raise)
 
 
-keyword(def) ident(format)operator(()ident(tokens)operator(,) ident(formatter)operator(,) ident(outfile)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(format)operator(()ident(tokens)operator(,) ident(formatter)operator(,) ident(outfile)operator(=)pre_constant(None)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Format a tokenlist ``tokens`` with the formatter ``formatter``.)content(
 )content(
@@ -1070,7 +1070,7 @@ keyword(def) ident(format)operator(()ident(tokens)operator(,) ident(formatter)op
         keyword(raise)
 
 
-keyword(def) ident(highlight)operator(()ident(code)operator(,) ident(lexer)operator(,) ident(formatter)operator(,) ident(outfile)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(highlight)operator(()ident(code)operator(,) ident(lexer)operator(,) ident(formatter)operator(,) ident(outfile)operator(=)pre_constant(None)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``.)content(
 )content(
@@ -1167,7 +1167,7 @@ ident(USAGE) operator(=) string<delimiter(""")char(\\
 )delimiter(""")>
 
 
-keyword(def) ident(_parse_options)operator(()ident(o_strs)operator(\))operator(:)
+keyword(def) method(_parse_options)operator(()ident(o_strs)operator(\))operator(:)
     ident(opts) operator(=) operator({)operator(})
     keyword(if) keyword(not) ident(o_strs)operator(:)
         keyword(return) ident(opts)
@@ -1188,7 +1188,7 @@ keyword(def) ident(_parse_options)operator(()ident(o_strs)operator(\))operator(:
     keyword(return) ident(opts)
 
 
-keyword(def) ident(_parse_filters)operator(()ident(f_strs)operator(\))operator(:)
+keyword(def) method(_parse_filters)operator(()ident(f_strs)operator(\))operator(:)
     ident(filters) operator(=) operator([)operator(])
     keyword(if) keyword(not) ident(f_strs)operator(:)
         keyword(return) ident(filters)
@@ -1201,7 +1201,7 @@ keyword(def) ident(_parse_filters)operator(()ident(f_strs)operator(\))operator(:
     keyword(return) ident(filters)
 
 
-keyword(def) ident(_print_help)operator(()ident(what)operator(,) ident(name)operator(\))operator(:)
+keyword(def) method(_print_help)operator(()ident(what)operator(,) ident(name)operator(\))operator(:)
     keyword(try)operator(:)
         keyword(if) ident(what) operator(==) string<delimiter(')content(lexer)delimiter(')>operator(:)
             ident(cls) operator(=) ident(find_lexer_class)operator(()ident(name)operator(\))
@@ -1219,7 +1219,7 @@ keyword(def) ident(_print_help)operator(()ident(what)operator(,) ident(name)oper
         keyword(print) operator(>>)ident(sys)operator(.)ident(stderr)operator(,) string<delimiter(")content(%s not found!)delimiter(")> operator(%) ident(what)
 
 
-keyword(def) ident(_print_list)operator(()ident(what)operator(\))operator(:)
+keyword(def) method(_print_list)operator(()ident(what)operator(\))operator(:)
     keyword(if) ident(what) operator(==) string<delimiter(')content(lexer)delimiter(')>operator(:)
         keyword(print)
         keyword(print) string<delimiter(")content(Lexers:)delimiter(")>
@@ -1270,7 +1270,7 @@ keyword(def) ident(_print_list)operator(()ident(what)operator(\))operator(:)
             keyword(print) string<delimiter(")content(    %s)delimiter(")> operator(%) ident(docstring_headline)operator(()ident(cls)operator(\))
 
 
-keyword(def) ident(main)operator(()ident(args)operator(=)ident(sys)operator(.)ident(argv)operator(\))operator(:)
+keyword(def) method(main)operator(()ident(args)operator(=)ident(sys)operator(.)ident(argv)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Main command line entry point.)content(
 )content(    )delimiter(""")>
@@ -1557,15 +1557,15 @@ ident(codes)operator([)string<delimiter(")content(fuscia)delimiter(")>operator(]
 ident(codes)operator([)string<delimiter(")content(white)delimiter(")>operator(])      operator(=) ident(codes)operator([)string<delimiter(")content(bold)delimiter(")>operator(])
 
 
-keyword(def) ident(reset_color)operator(()operator(\))operator(:)
+keyword(def) method(reset_color)operator(()operator(\))operator(:)
     keyword(return) ident(codes)operator([)string<delimiter(")content(reset)delimiter(")>operator(])
 
 
-keyword(def) ident(colorize)operator(()ident(color_key)operator(,) ident(text)operator(\))operator(:)
+keyword(def) method(colorize)operator(()ident(color_key)operator(,) ident(text)operator(\))operator(:)
     keyword(return) ident(codes)operator([)ident(color_key)operator(]) operator(+) ident(text) operator(+) ident(codes)operator([)string<delimiter(")content(reset)delimiter(")>operator(])
 
 
-keyword(def) ident(ansiformat)operator(()ident(attr)operator(,) ident(text)operator(\))operator(:)
+keyword(def) method(ansiformat)operator(()ident(attr)operator(,) ident(text)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Format ``text`` with a color and/or some attributes::)content(
 )content(
@@ -1600,13 +1600,13 @@ string<delimiter(""")content(
 )delimiter(""")>
 
 
-keyword(def) ident(apply_filters)operator(()ident(stream)operator(,) ident(filters)operator(,) ident(lexer)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(apply_filters)operator(()ident(stream)operator(,) ident(filters)operator(,) ident(lexer)operator(=)pre_constant(None)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Use this method to apply an iterable of filters to)content(
 )content(    a stream. If lexer is given it's forwarded to the)content(
 )content(    filter, otherwise the filter receives `None`.)content(
 )content(    )delimiter(""")>
-    keyword(def) ident(_apply)operator(()ident(filter_)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(_apply)operator(()ident(filter_)operator(,) ident(stream)operator(\))operator(:)
         keyword(for) ident(token) keyword(in) ident(filter_)operator(.)ident(filter)operator(()ident(lexer)operator(,) ident(stream)operator(\))operator(:)
             keyword(yield) ident(token)
     keyword(for) ident(filter_) keyword(in) ident(filters)operator(:)
@@ -1614,7 +1614,7 @@ keyword(def) ident(apply_filters)operator(()ident(stream)operator(,) ident(filte
     keyword(return) ident(stream)
 
 
-keyword(def) ident(simplefilter)operator(()ident(f)operator(\))operator(:)
+keyword(def) method(simplefilter)operator(()ident(f)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Decorator that converts a function into a filter::)content(
 )content(
@@ -1630,20 +1630,20 @@ keyword(def) ident(simplefilter)operator(()ident(f)operator(\))operator(:)
             operator(})operator(\))
 
 
-keyword(class) ident(Filter)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(Filter)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Default filter. Subclass this class or use the `simplefilter`)content(
 )content(    decorator to create own filters.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(options) operator(=) ident(options)
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         keyword(raise) exception(NotImplementedError)operator(()operator(\))
 
 
-keyword(class) ident(FunctionFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(FunctionFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Abstract class used by `simplefilter` to create simple)content(
 )content(    function filters on the fly. The `simplefilter` decorator)content(
@@ -1652,13 +1652,13 @@ keyword(class) ident(FunctionFilter)operator(()ident(Filter)operator(\))operator
 )content(    )delimiter(""")>
     ident(function) operator(=) pre_constant(None)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         keyword(if) keyword(not) predefined(hasattr)operator(()pre_constant(self)operator(,) string<delimiter(')content(function)delimiter(')>operator(\))operator(:)
             keyword(raise) exception(TypeError)operator(()string<delimiter(')content(%r used without bound function)delimiter(')> operator(%)
                             pre_constant(self)operator(.)ident(__class__)operator(.)ident(__name__)operator(\))
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         comment(# pylint: disable-msg=E1102)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) pre_constant(self)operator(.)ident(function)operator(()ident(lexer)operator(,) ident(stream)operator(,) pre_constant(self)operator(.)ident(options)operator(\))operator(:)
             keyword(yield) ident(ttype)operator(,) ident(value)
@@ -1687,7 +1687,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_li
 keyword(from) ident(pygments)operator(.)ident(plugin) keyword(import) ident(find_plugin_filters)
 
 
-keyword(def) ident(find_filter_class)operator(()ident(filtername)operator(\))operator(:)
+keyword(def) method(find_filter_class)operator(()ident(filtername)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lookup a filter by name. Return None if not found.)content(
 )content(    )delimiter(""")>
@@ -1699,7 +1699,7 @@ keyword(def) ident(find_filter_class)operator(()ident(filtername)operator(\))ope
     keyword(return) pre_constant(None)
 
 
-keyword(def) ident(get_filter_by_name)operator(()ident(filtername)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_filter_by_name)operator(()ident(filtername)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return an instantiated filter. Options are passed to the filter)content(
 )content(    initializer if wanted. Raise a ClassNotFound if not found.)content(
@@ -1711,7 +1711,7 @@ keyword(def) ident(get_filter_by_name)operator(()ident(filtername)operator(,) op
         keyword(raise) ident(ClassNotFound)operator(()string<delimiter(')content(filter %r not found)delimiter(')> operator(%) ident(filtername)operator(\))
 
 
-keyword(def) ident(get_all_filters)operator(()operator(\))operator(:)
+keyword(def) method(get_all_filters)operator(()operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return a generator of all filter names.)content(
 )content(    )delimiter(""")>
@@ -1721,7 +1721,7 @@ keyword(def) ident(get_all_filters)operator(()operator(\))operator(:)
         keyword(yield) ident(name)
 
 
-keyword(def) ident(_replace_special)operator(()ident(ttype)operator(,) ident(value)operator(,) ident(regex)operator(,) ident(specialttype)operator(,)
+keyword(def) method(_replace_special)operator(()ident(ttype)operator(,) ident(value)operator(,) ident(regex)operator(,) ident(specialttype)operator(,)
                      ident(replacefunc)operator(=)keyword(lambda) ident(x)operator(:) ident(x)operator(\))operator(:)
     ident(last) operator(=) integer(0)
     keyword(for) ident(match) keyword(in) ident(regex)operator(.)ident(finditer)operator(()ident(value)operator(\))operator(:)
@@ -1734,7 +1734,7 @@ keyword(def) ident(_replace_special)operator(()ident(ttype)operator(,) ident(val
         keyword(yield) ident(ttype)operator(,) ident(value)operator([)ident(last)operator(:)operator(])
 
 
-keyword(class) ident(CodeTagFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(CodeTagFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Highlight special code tags in comments and docstrings.)content(
 )content(
@@ -1745,7 +1745,7 @@ keyword(class) ident(CodeTagFilter)operator(()ident(Filter)operator(\))operator(
 )content(       highlight ``XXX``, ``TODO``, ``BUG`` and ``NOTE``.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         ident(tags) operator(=) ident(get_list_opt)operator(()ident(options)operator(,) string<delimiter(')content(codetags)delimiter(')>operator(,)
                             operator([)string<delimiter(')content(XXX)delimiter(')>operator(,) string<delimiter(')content(TODO)delimiter(')>operator(,) string<delimiter(')content(BUG)delimiter(')>operator(,) string<delimiter(')content(NOTE)delimiter(')>operator(])operator(\))
@@ -1753,7 +1753,7 @@ keyword(class) ident(CodeTagFilter)operator(()ident(Filter)operator(\))operator(
             ident(re)operator(.)ident(escape)operator(()ident(tag)operator(\)) keyword(for) ident(tag) keyword(in) ident(tags) keyword(if) ident(tag)
         operator(])operator(\))operator(\))
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         ident(regex) operator(=) pre_constant(self)operator(.)ident(tag_re)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(stream)operator(:)
             keyword(if) ident(ttype) keyword(in) ident(String)operator(.)ident(Doc) keyword(or) \
@@ -1766,7 +1766,7 @@ keyword(class) ident(CodeTagFilter)operator(()ident(Filter)operator(\))operator(
                 keyword(yield) ident(ttype)operator(,) ident(value)
 
 
-keyword(class) ident(KeywordCaseFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(KeywordCaseFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Convert keywords to lowercase or uppercase or capitalize them, which)content(
 )content(    means first letter uppercase, rest lowercase.)content(
@@ -1781,12 +1781,12 @@ keyword(class) ident(KeywordCaseFilter)operator(()ident(Filter)operator(\))opera
 )content(       ``'upper'`` or ``'capitalize'``.  The default is ``'lower'``.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         ident(case) operator(=) ident(get_choice_opt)operator(()ident(options)operator(,) string<delimiter(')content(case)delimiter(')>operator(,) operator([)string<delimiter(')content(lower)delimiter(')>operator(,) string<delimiter(')content(upper)delimiter(')>operator(,) string<delimiter(')content(capitalize)delimiter(')>operator(])operator(,) string<delimiter(')content(lower)delimiter(')>operator(\))
         pre_constant(self)operator(.)ident(convert) operator(=) predefined(getattr)operator(()predefined(unicode)operator(,) ident(case)operator(\))
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(stream)operator(:)
             keyword(if) ident(ttype) keyword(in) ident(Keyword)operator(:)
                 keyword(yield) ident(ttype)operator(,) pre_constant(self)operator(.)ident(convert)operator(()ident(value)operator(\))
@@ -1794,7 +1794,7 @@ keyword(class) ident(KeywordCaseFilter)operator(()ident(Filter)operator(\))opera
                 keyword(yield) ident(ttype)operator(,) ident(value)
 
 
-keyword(class) ident(NameHighlightFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(NameHighlightFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Highlight a normal Name token with a different token type.)content(
 )content(
@@ -1819,7 +1819,7 @@ keyword(class) ident(NameHighlightFilter)operator(()ident(Filter)operator(\))ope
 )content(      `Name.Function`.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(names) operator(=) predefined(set)operator(()ident(get_list_opt)operator(()ident(options)operator(,) string<delimiter(')content(names)delimiter(')>operator(,) operator([)operator(])operator(\))operator(\))
         ident(tokentype) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(tokentype)delimiter(')>operator(\))
@@ -1828,7 +1828,7 @@ keyword(class) ident(NameHighlightFilter)operator(()ident(Filter)operator(\))ope
         keyword(else)operator(:)
             pre_constant(self)operator(.)ident(tokentype) operator(=) ident(Name)operator(.)ident(Function)
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(stream)operator(:)
             keyword(if) ident(ttype) keyword(is) ident(Name) keyword(and) ident(value) keyword(in) pre_constant(self)operator(.)ident(names)operator(:)
                 keyword(yield) pre_constant(self)operator(.)ident(tokentype)operator(,) ident(value)
@@ -1836,10 +1836,10 @@ keyword(class) ident(NameHighlightFilter)operator(()ident(Filter)operator(\))ope
                 keyword(yield) ident(ttype)operator(,) ident(value)
 
 
-keyword(class) ident(ErrorToken)operator(()exception(Exception)operator(\))operator(:)
+keyword(class) class(ErrorToken)operator(()exception(Exception)operator(\))operator(:)
     keyword(pass)
 
-keyword(class) ident(RaiseOnErrorTokenFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(RaiseOnErrorTokenFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Raise an exception when the lexer generates an error token.)content(
 )content(
@@ -1852,7 +1852,7 @@ keyword(class) ident(RaiseOnErrorTokenFilter)operator(()ident(Filter)operator(\)
 )content(    *New in Pygments 0.8.*)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(exception) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(excclass)delimiter(')>operator(,) ident(ErrorToken)operator(\))
         keyword(try)operator(:)
@@ -1862,14 +1862,14 @@ keyword(class) ident(RaiseOnErrorTokenFilter)operator(()ident(Filter)operator(\)
         keyword(except) exception(TypeError)operator(:)
             keyword(raise) ident(OptionError)operator(()string<delimiter(')content(excclass option is not an exception class)delimiter(')>operator(\))
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(stream)operator(:)
             keyword(if) ident(ttype) keyword(is) ident(Error)operator(:)
                 keyword(raise) pre_constant(self)operator(.)ident(exception)operator(()ident(value)operator(\))
             keyword(yield) ident(ttype)operator(,) ident(value)
 
 
-keyword(class) ident(VisibleWhitespaceFilter)operator(()ident(Filter)operator(\))operator(:)
+keyword(class) class(VisibleWhitespaceFilter)operator(()ident(Filter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Convert tabs, newlines and/or spaces to visible characters.)content(
 )content(
@@ -1900,7 +1900,7 @@ keyword(class) ident(VisibleWhitespaceFilter)operator(()ident(Filter)operator(\)
 )content(    *New in Pygments 0.8.*)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Filter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         keyword(for) ident(name)operator(,) ident(default) keyword(in) operator({)string<delimiter(')content(spaces)delimiter(')>operator(:) string<modifier(u)delimiter(')content(·)delimiter(')>operator(,) string<delimiter(')content(tabs)delimiter(')>operator(:) string<modifier(u)delimiter(')content(»)delimiter(')>operator(,) string<delimiter(')content(newlines)delimiter(')>operator(:) string<modifier(u)delimiter(')content(¶)delimiter(')>operator(})operator(.)ident(items)operator(()operator(\))operator(:)
             ident(opt) operator(=) ident(options)operator(.)ident(get)operator(()ident(name)operator(,) pre_constant(False)operator(\))
@@ -1915,13 +1915,13 @@ keyword(class) ident(VisibleWhitespaceFilter)operator(()ident(Filter)operator(\)
             pre_constant(self)operator(.)ident(newlines) operator(+=) string<delimiter(')char(\\n)delimiter(')>
         pre_constant(self)operator(.)ident(wstt) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(wstokentype)delimiter(')>operator(,) pre_constant(True)operator(\))
 
-    keyword(def) predefined(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
+    keyword(def) method(filter)operator(()pre_constant(self)operator(,) ident(lexer)operator(,) ident(stream)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(wstt)operator(:)
             ident(spaces) operator(=) pre_constant(self)operator(.)ident(spaces) keyword(or) string<delimiter(')content( )delimiter(')>
             ident(tabs) operator(=) pre_constant(self)operator(.)ident(tabs) keyword(or) string<delimiter(')char(\\t)delimiter(')>
             ident(newlines) operator(=) pre_constant(self)operator(.)ident(newlines) keyword(or) string<delimiter(')char(\\n)delimiter(')>
             ident(regex) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(\\s)delimiter(')>operator(\))
-            keyword(def) ident(replacefunc)operator(()ident(wschar)operator(\))operator(:)
+            keyword(def) method(replacefunc)operator(()ident(wschar)operator(\))operator(:)
                 keyword(if) ident(wschar) operator(==) string<delimiter(')content( )delimiter(')>operator(:)
                     keyword(return) ident(spaces)
                 keyword(elif) ident(wschar) operator(==) string<delimiter(')char(\\t)delimiter(')>operator(:)
@@ -1973,13 +1973,13 @@ keyword(from) ident(pygments)operator(.)ident(styles) keyword(import) ident(get_
 ident(__all__) operator(=) operator([)string<delimiter(')content(Formatter)delimiter(')>operator(])
 
 
-keyword(def) ident(_lookup_style)operator(()ident(style)operator(\))operator(:)
+keyword(def) method(_lookup_style)operator(()ident(style)operator(\))operator(:)
     keyword(if) predefined(isinstance)operator(()ident(style)operator(,) predefined(basestring)operator(\))operator(:)
         keyword(return) ident(get_style_by_name)operator(()ident(style)operator(\))
     keyword(return) ident(style)
 
 
-keyword(class) ident(Formatter)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(Formatter)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Converts a token stream to text.)content(
 )content(
@@ -2019,7 +2019,7 @@ keyword(class) ident(Formatter)operator(()predefined(object)operator(\))operator
     comment(#: option is given.)
     ident(unicodeoutput) operator(=) pre_constant(True)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(style) operator(=) ident(_lookup_style)operator(()ident(options)operator(.)ident(get)operator(()string<delimiter(')content(style)delimiter(')>operator(,) string<delimiter(')content(default)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(full)  operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(full)delimiter(')>operator(,) pre_constant(False)operator(\))
         pre_constant(self)operator(.)ident(title) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(title)delimiter(')>operator(,) string<delimiter(')delimiter(')>operator(\))
@@ -2027,7 +2027,7 @@ keyword(class) ident(Formatter)operator(()predefined(object)operator(\))operator
         pre_constant(self)operator(.)ident(encoding) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(outencoding)delimiter(')>operator(,) pre_constant(None)operator(\)) keyword(or) pre_constant(self)operator(.)ident(encoding)
         pre_constant(self)operator(.)ident(options) operator(=) ident(options)
 
-    keyword(def) ident(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
+    keyword(def) method(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Return the style definitions for the current style as a string.)content(
 )content(
@@ -2037,7 +2037,7 @@ keyword(class) ident(Formatter)operator(()predefined(object)operator(\))operator
 )content(        )delimiter(""")>
         keyword(return) string<delimiter(')delimiter(')>
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Format ``tokensource``, an iterable of ``(tokentype, tokenstring\)``)content(
 )content(        tuples and write it into ``outfile``.)content(
@@ -2075,7 +2075,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(get_formatter_b
 ident(_formatter_alias_cache) operator(=) operator({)operator(})
 ident(_formatter_filename_cache) operator(=) operator([)operator(])
 
-keyword(def) ident(_init_formatter_cache)operator(()operator(\))operator(:)
+keyword(def) method(_init_formatter_cache)operator(()operator(\))operator(:)
     keyword(if) ident(_formatter_alias_cache)operator(:)
         keyword(return)
     keyword(for) ident(cls) keyword(in) ident(get_all_formatters)operator(()operator(\))operator(:)
@@ -2085,13 +2085,13 @@ keyword(def) ident(_init_formatter_cache)operator(()operator(\))operator(:)
             ident(_formatter_filename_cache)operator(.)ident(append)operator(()operator(()ident(fn)operator(,) ident(cls)operator(\))operator(\))
 
 
-keyword(def) ident(find_formatter_class)operator(()ident(name)operator(\))operator(:)
+keyword(def) method(find_formatter_class)operator(()ident(name)operator(\))operator(:)
     ident(_init_formatter_cache)operator(()operator(\))
     ident(cls) operator(=) ident(_formatter_alias_cache)operator(.)ident(get)operator(()ident(name)operator(,) pre_constant(None)operator(\))
     keyword(return) ident(cls)
 
 
-keyword(def) ident(get_formatter_by_name)operator(()ident(name)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_formatter_by_name)operator(()ident(name)operator(,) operator(**)ident(options)operator(\))operator(:)
     ident(_init_formatter_cache)operator(()operator(\))
     ident(cls) operator(=) ident(_formatter_alias_cache)operator(.)ident(get)operator(()ident(name)operator(,) pre_constant(None)operator(\))
     keyword(if) keyword(not) ident(cls)operator(:)
@@ -2099,7 +2099,7 @@ keyword(def) ident(get_formatter_by_name)operator(()ident(name)operator(,) opera
     keyword(return) ident(cls)operator(()operator(**)ident(options)operator(\))
 
 
-keyword(def) ident(get_formatter_for_filename)operator(()ident(fn)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_formatter_for_filename)operator(()ident(fn)operator(,) operator(**)ident(options)operator(\))operator(:)
     ident(_init_formatter_cache)operator(()operator(\))
     ident(fn) operator(=) ident(os)operator(.)ident(path)operator(.)ident(basename)operator(()ident(fn)operator(\))
     keyword(for) ident(pattern)operator(,) ident(cls) keyword(in) ident(_formatter_filename_cache)operator(:)
@@ -2108,7 +2108,7 @@ keyword(def) ident(get_formatter_for_filename)operator(()ident(fn)operator(,) op
     keyword(raise) ident(ClassNotFound)operator(()string<delimiter(")content(No formatter found for file name %r)delimiter(")> operator(%) ident(fn)operator(\))
 
 
-keyword(def) ident(get_all_formatters)operator(()operator(\))operator(:)
+keyword(def) method(get_all_formatters)operator(()operator(\))operator(:)
     string<delimiter(""")content(Return a generator for all formatters.)delimiter(""")>
     keyword(for) ident(formatter) keyword(in) ident(FORMATTERS)operator(:)
         keyword(yield) ident(formatter)
@@ -2224,7 +2224,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_bo
 ident(__all__) operator(=) operator([)string<delimiter(')content(BBCodeFormatter)delimiter(')>operator(])
 
 
-keyword(class) ident(BBCodeFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(BBCodeFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Format tokens with BBcodes. These formatting codes are used by many)content(
 )content(    bulletin boards, so you can highlight your sourcecode with pygments before)content(
@@ -2257,7 +2257,7 @@ keyword(class) ident(BBCodeFormatter)operator(()ident(Formatter)operator(\))oper
     ident(aliases) operator(=) operator([)string<delimiter(')content(bbcode)delimiter(')>operator(,) string<delimiter(')content(bb)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(_code) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(codetag)delimiter(')>operator(,) pre_constant(False)operator(\))
         pre_constant(self)operator(.)ident(_mono) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(monofont)delimiter(')>operator(,) pre_constant(False)operator(\))
@@ -2265,7 +2265,7 @@ keyword(class) ident(BBCodeFormatter)operator(()ident(Formatter)operator(\))oper
         pre_constant(self)operator(.)ident(styles) operator(=) operator({)operator(})
         pre_constant(self)operator(.)ident(_make_styles)operator(()operator(\))
 
-    keyword(def) ident(_make_styles)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_make_styles)operator(()pre_constant(self)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(ndef) keyword(in) pre_constant(self)operator(.)ident(style)operator(:)
             ident(start) operator(=) ident(end) operator(=) string<delimiter(')delimiter(')>
             keyword(if) ident(ndef)operator([)string<delimiter(')content(color)delimiter(')>operator(])operator(:)
@@ -2284,7 +2284,7 @@ keyword(class) ident(BBCodeFormatter)operator(()ident(Formatter)operator(\))oper
 
             pre_constant(self)operator(.)ident(styles)operator([)ident(ttype)operator(]) operator(=) ident(start)operator(,) ident(end)
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(_code)operator(:)
             ident(outfile)operator(.)ident(write)operator(()string<delimiter(')content([code])delimiter(')>operator(\))
         keyword(if) pre_constant(self)operator(.)ident(_mono)operator(:)
@@ -2341,7 +2341,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_bo
 ident(__all__) operator(=) operator([)string<delimiter(')content(HtmlFormatter)delimiter(')>operator(])
 
 
-keyword(def) ident(escape_html)operator(()ident(text)operator(\))operator(:)
+keyword(def) method(escape_html)operator(()ident(text)operator(\))operator(:)
     string<delimiter(""")content(Escape &, <, > as well as single and double quotes for HTML.)delimiter(""")>
     keyword(return) ident(text)operator(.)ident(replace)operator(()string<delimiter(')content(&)delimiter(')>operator(,) string<delimiter(')content(&amp;)delimiter(')>operator(\))operator(.)  \
                 ident(replace)operator(()string<delimiter(')content(<)delimiter(')>operator(,) string<delimiter(')content(&lt;)delimiter(')>operator(\))operator(.)   \
@@ -2350,7 +2350,7 @@ keyword(def) ident(escape_html)operator(()ident(text)operator(\))operator(:)
                 ident(replace)operator(()string<delimiter(")content(')delimiter(")>operator(,) string<delimiter(')content(&#39;)delimiter(')>operator(\))
 
 
-keyword(def) ident(get_random_id)operator(()operator(\))operator(:)
+keyword(def) method(get_random_id)operator(()operator(\))operator(:)
     string<delimiter(""")content(Return a random id for javascript fields.)delimiter(""")>
     keyword(from) ident(random) keyword(import) ident(random)
     keyword(from) ident(time) keyword(import) ident(time)
@@ -2362,7 +2362,7 @@ keyword(def) ident(get_random_id)operator(()operator(\))operator(:)
     keyword(return) ident(sha)operator(()string<delimiter(')content(%s|%s)delimiter(')> operator(%) operator(()ident(random)operator(()operator(\))operator(,) ident(time)operator(()operator(\))operator(\))operator(\))operator(.)ident(hexdigest)operator(()operator(\))
 
 
-keyword(def) ident(_get_ttype_class)operator(()ident(ttype)operator(\))operator(:)
+keyword(def) method(_get_ttype_class)operator(()ident(ttype)operator(\))operator(:)
     ident(fname) operator(=) ident(STANDARD_TYPES)operator(.)ident(get)operator(()ident(ttype)operator(\))
     keyword(if) ident(fname)operator(:)
         keyword(return) ident(fname)
@@ -2419,7 +2419,7 @@ ident(DOC_FOOTER) operator(=) string<delimiter(''')char(\\
 )delimiter(''')>
 
 
-keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(HtmlFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<modifier(r)delimiter(""")content(
 )content(    Format tokens as HTML 4 ``<span>`` tags within a ``<pre>`` tag, wrapped)content(
 )content(    in a ``<div>`` tag. The ``<div>``'s CSS class can be set by the `cssclass`)content(
@@ -2657,7 +2657,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
     ident(aliases) operator(=) operator([)string<delimiter(')content(html)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(,) string<delimiter(')content(*.htm)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(title) operator(=) pre_constant(self)operator(.)ident(_decodeifneeded)operator(()pre_constant(self)operator(.)ident(title)operator(\))
         pre_constant(self)operator(.)ident(nowrap) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(nowrap)delimiter(')>operator(,) pre_constant(False)operator(\))
@@ -2694,14 +2694,14 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
         pre_constant(self)operator(.)ident(_class_cache) operator(=) operator({)operator(})
         pre_constant(self)operator(.)ident(_create_stylesheet)operator(()operator(\))
 
-    keyword(def) ident(_get_css_class)operator(()pre_constant(self)operator(,) ident(ttype)operator(\))operator(:)
+    keyword(def) method(_get_css_class)operator(()pre_constant(self)operator(,) ident(ttype)operator(\))operator(:)
         string<delimiter(""")content(Return the css class of this token type prefixed with)content(
 )content(        the classprefix option.)delimiter(""")>
         keyword(if) ident(ttype) keyword(in) pre_constant(self)operator(.)ident(_class_cache)operator(:)
             keyword(return) pre_constant(self)operator(.)ident(_class_cache)operator([)ident(ttype)operator(])
         keyword(return) pre_constant(self)operator(.)ident(classprefix) operator(+) ident(_get_ttype_class)operator(()ident(ttype)operator(\))
 
-    keyword(def) ident(_create_stylesheet)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_create_stylesheet)operator(()pre_constant(self)operator(\))operator(:)
         ident(t2c) operator(=) pre_constant(self)operator(.)ident(ttype2class) operator(=) operator({)ident(Token)operator(:) string<delimiter(')delimiter(')>operator(})
         ident(c2s) operator(=) pre_constant(self)operator(.)ident(class2style) operator(=) operator({)operator(})
         ident(cp) operator(=) pre_constant(self)operator(.)ident(classprefix)
@@ -2726,7 +2726,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
                 comment(# hierarchy (necessary for CSS cascading rules!\))
                 ident(c2s)operator([)ident(name)operator(]) operator(=) operator(()ident(style)operator([)operator(:)operator(-)integer(2)operator(])operator(,) ident(ttype)operator(,) predefined(len)operator(()ident(ttype)operator(\))operator(\))
 
-    keyword(def) ident(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Return CSS style definitions for the classes produced by the current)content(
 )content(        highlighting style. ``arg`` can be a string or list of selectors to)content(
@@ -2739,7 +2739,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
         keyword(else)operator(:)
             ident(args) operator(=) predefined(list)operator(()ident(arg)operator(\))
 
-        keyword(def) ident(prefix)operator(()ident(cls)operator(\))operator(:)
+        keyword(def) method(prefix)operator(()ident(cls)operator(\))operator(:)
             keyword(if) ident(cls)operator(:)
                 ident(cls) operator(=) string<delimiter(')content(.)delimiter(')> operator(+) ident(cls)
             ident(tmp) operator(=) operator([)operator(])
@@ -2765,14 +2765,14 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
                          operator(()ident(prefix)operator(()string<delimiter(')delimiter(')>operator(\))operator(,) pre_constant(self)operator(.)ident(style)operator(.)ident(highlight_color)operator(\))operator(\))
         keyword(return) string<delimiter(')char(\\n)delimiter(')>operator(.)ident(join)operator(()ident(lines)operator(\))
 
-    keyword(def) ident(_decodeifneeded)operator(()pre_constant(self)operator(,) ident(value)operator(\))operator(:)
+    keyword(def) method(_decodeifneeded)operator(()pre_constant(self)operator(,) ident(value)operator(\))operator(:)
         keyword(if) predefined(isinstance)operator(()ident(value)operator(,) predefined(bytes)operator(\))operator(:)
             keyword(if) pre_constant(self)operator(.)ident(encoding)operator(:)
                 keyword(return) ident(value)operator(.)ident(decode)operator(()pre_constant(self)operator(.)ident(encoding)operator(\))
             keyword(return) ident(value)operator(.)ident(decode)operator(()operator(\))
         keyword(return) ident(value)
 
-    keyword(def) ident(_wrap_full)operator(()pre_constant(self)operator(,) ident(inner)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(_wrap_full)operator(()pre_constant(self)operator(,) ident(inner)operator(,) ident(outfile)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(cssfile)operator(:)
             keyword(if) ident(os)operator(.)ident(path)operator(.)ident(isabs)operator(()pre_constant(self)operator(.)ident(cssfile)operator(\))operator(:)
                 comment(# it's an absolute filename)
@@ -2814,7 +2814,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
             keyword(yield) ident(t)operator(,) ident(line)
         keyword(yield) integer(0)operator(,) ident(DOC_FOOTER)
 
-    keyword(def) ident(_wrap_tablelinenos)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
+    keyword(def) method(_wrap_tablelinenos)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
         ident(dummyoutfile) operator(=) ident(StringIO)operator(.)ident(StringIO)operator(()operator(\))
         ident(lncount) operator(=) integer(0)
         keyword(for) ident(t)operator(,) ident(line) keyword(in) ident(inner)operator(:)
@@ -2868,7 +2868,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
         keyword(yield) integer(0)operator(,) ident(dummyoutfile)operator(.)ident(getvalue)operator(()operator(\))
         keyword(yield) integer(0)operator(,) string<delimiter(')content(</td></tr></table>)delimiter(')>
 
-    keyword(def) ident(_wrap_inlinelinenos)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
+    keyword(def) method(_wrap_inlinelinenos)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
         comment(# need a list of lines since we need the width of a single number :()
         ident(lines) operator(=) predefined(list)operator(()ident(inner)operator(\))
         ident(sp) operator(=) pre_constant(self)operator(.)ident(linenospecial)
@@ -2888,7 +2888,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
                     ident(mw)operator(,) operator(()ident(num)operator(%)ident(st) keyword(and) string<delimiter(')content( )delimiter(')> keyword(or) ident(num)operator(\))operator(\)) operator(+) ident(line)
                 ident(num) operator(+=) integer(1)
 
-    keyword(def) ident(_wrap_lineanchors)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
+    keyword(def) method(_wrap_lineanchors)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
         ident(s) operator(=) pre_constant(self)operator(.)ident(lineanchors)
         ident(i) operator(=) integer(0)
         keyword(for) ident(t)operator(,) ident(line) keyword(in) ident(inner)operator(:)
@@ -2898,21 +2898,21 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
             keyword(else)operator(:)
                 keyword(yield) integer(0)operator(,) ident(line)
 
-    keyword(def) ident(_wrap_div)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
+    keyword(def) method(_wrap_div)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
         keyword(yield) integer(0)operator(,) operator(()string<delimiter(')content(<div)delimiter(')> operator(+) operator(()pre_constant(self)operator(.)ident(cssclass) keyword(and) string<delimiter(')content( class="%s")delimiter(')> operator(%) pre_constant(self)operator(.)ident(cssclass)operator(\))
                   operator(+) operator(()pre_constant(self)operator(.)ident(cssstyles) keyword(and) string<delimiter(')content( style="%s")delimiter(')> operator(%) pre_constant(self)operator(.)ident(cssstyles)operator(\)) operator(+) string<delimiter(')content(>)delimiter(')>operator(\))
         keyword(for) ident(tup) keyword(in) ident(inner)operator(:)
             keyword(yield) ident(tup)
         keyword(yield) integer(0)operator(,) string<delimiter(')content(</div>)char(\\n)delimiter(')>
 
-    keyword(def) ident(_wrap_pre)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
+    keyword(def) method(_wrap_pre)operator(()pre_constant(self)operator(,) ident(inner)operator(\))operator(:)
         keyword(yield) integer(0)operator(,) operator(()string<delimiter(')content(<pre)delimiter(')>
                   operator(+) operator(()pre_constant(self)operator(.)ident(prestyles) keyword(and) string<delimiter(')content( style="%s")delimiter(')> operator(%) pre_constant(self)operator(.)ident(prestyles)operator(\)) operator(+) string<delimiter(')content(>)delimiter(')>operator(\))
         keyword(for) ident(tup) keyword(in) ident(inner)operator(:)
             keyword(yield) ident(tup)
         keyword(yield) integer(0)operator(,) string<delimiter(')content(</pre>)delimiter(')>
 
-    keyword(def) ident(_format_lines)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
+    keyword(def) method(_format_lines)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Just format the tokens, without any wrapping tags.)content(
 )content(        Yield individual lines.)content(
@@ -2967,7 +2967,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
         keyword(if) ident(line)operator(:)
             keyword(yield) integer(1)operator(,) ident(line) operator(+) operator(()ident(lspan) keyword(and) string<delimiter(')content(</span>)delimiter(')>operator(\)) operator(+) ident(lsep)
 
-    keyword(def) ident(_highlight_lines)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
+    keyword(def) method(_highlight_lines)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Highlighted the lines specified in the `hl_lines` option by)content(
 )content(        post-processing the token stream coming from `_format_lines`.)content(
@@ -2982,7 +2982,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
             keyword(else)operator(:)
                 keyword(yield) integer(1)operator(,) ident(value)
 
-    keyword(def) ident(wrap)operator(()pre_constant(self)operator(,) ident(source)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(wrap)operator(()pre_constant(self)operator(,) ident(source)operator(,) ident(outfile)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Wrap the ``source``, which is a generator yielding)content(
 )content(        individual lines, in custom generators. See docstring)content(
@@ -2990,7 +2990,7 @@ keyword(class) ident(HtmlFormatter)operator(()ident(Formatter)operator(\))operat
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(_wrap_div)operator(()pre_constant(self)operator(.)ident(_wrap_pre)operator(()ident(source)operator(\))operator(\))
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        The formatting process uses several nested generators; which of)content(
 )content(        them are used is determined by the user's options.)content(
@@ -3066,20 +3066,20 @@ ident(DEFAULT_FONT_NAME_NIX) operator(=) string<delimiter(')content(Bitstream Ve
 ident(DEFAULT_FONT_NAME_WIN) operator(=) string<delimiter(')content(Courier New)delimiter(')>
 
 
-keyword(class) ident(PilNotAvailable)operator(()exception(ImportError)operator(\))operator(:)
+keyword(class) class(PilNotAvailable)operator(()exception(ImportError)operator(\))operator(:)
     string<delimiter(""")content(When Python imaging library is not available)delimiter(""")>
 
 
-keyword(class) ident(FontNotFound)operator(()exception(Exception)operator(\))operator(:)
+keyword(class) class(FontNotFound)operator(()exception(Exception)operator(\))operator(:)
     string<delimiter(""")content(When there are no usable fonts specified)delimiter(""")>
 
 
-keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(FontManager)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Manages a set of fonts: normal, italic, bold, etc...)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(font_name)operator(,) ident(font_size)operator(=)integer(14)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(font_name)operator(,) ident(font_size)operator(=)integer(14)operator(\))operator(:)
         pre_constant(self)operator(.)ident(font_name) operator(=) ident(font_name)
         pre_constant(self)operator(.)ident(font_size) operator(=) ident(font_size)
         pre_constant(self)operator(.)ident(fonts) operator(=) operator({)operator(})
@@ -3093,7 +3093,7 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
                 pre_constant(self)operator(.)ident(font_name) operator(=) ident(DEFAULT_FONT_NAME_NIX)
             pre_constant(self)operator(.)ident(_create_nix)operator(()operator(\))
 
-    keyword(def) ident(_get_nix_font_path)operator(()pre_constant(self)operator(,) ident(name)operator(,) ident(style)operator(\))operator(:)
+    keyword(def) method(_get_nix_font_path)operator(()pre_constant(self)operator(,) ident(name)operator(,) ident(style)operator(\))operator(:)
         predefined(exit)operator(,) ident(out) operator(=) ident(getstatusoutput)operator(()string<delimiter(')content(fc-list "%s:style=%s" file)delimiter(')> operator(%)
                                     operator(()ident(name)operator(,) ident(style)operator(\))operator(\))
         keyword(if) keyword(not) predefined(exit)operator(:)
@@ -3102,7 +3102,7 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
                 ident(path) operator(=) ident(lines)operator([)integer(0)operator(])operator(.)ident(strip)operator(()operator(\))operator(.)ident(strip)operator(()string<delimiter(')content(:)delimiter(')>operator(\))
                 keyword(return) ident(path)
 
-    keyword(def) ident(_create_nix)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_create_nix)operator(()pre_constant(self)operator(\))operator(:)
         keyword(for) ident(name) keyword(in) ident(STYLES)operator([)string<delimiter(')content(NORMAL)delimiter(')>operator(])operator(:)
             ident(path) operator(=) pre_constant(self)operator(.)ident(_get_nix_font_path)operator(()pre_constant(self)operator(.)ident(font_name)operator(,) ident(name)operator(\))
             keyword(if) ident(path) keyword(is) keyword(not) pre_constant(None)operator(:)
@@ -3123,7 +3123,7 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
                 keyword(else)operator(:)
                     pre_constant(self)operator(.)ident(fonts)operator([)ident(style)operator(]) operator(=) pre_constant(self)operator(.)ident(fonts)operator([)string<delimiter(')content(NORMAL)delimiter(')>operator(])
 
-    keyword(def) ident(_lookup_win)operator(()pre_constant(self)operator(,) ident(key)operator(,) ident(basename)operator(,) ident(styles)operator(,) ident(fail)operator(=)pre_constant(False)operator(\))operator(:)
+    keyword(def) method(_lookup_win)operator(()pre_constant(self)operator(,) ident(key)operator(,) ident(basename)operator(,) ident(styles)operator(,) ident(fail)operator(=)pre_constant(False)operator(\))operator(:)
         keyword(for) ident(suffix) keyword(in) operator(()string<delimiter(')delimiter(')>operator(,) string<delimiter(')content( (TrueType\))delimiter(')>operator(\))operator(:)
             keyword(for) ident(style) keyword(in) ident(styles)operator(:)
                 keyword(try)operator(:)
@@ -3138,7 +3138,7 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
                                    operator(()ident(basename)operator(,) ident(styles)operator([)integer(0)operator(])operator(\))operator(\))
             keyword(return) pre_constant(None)
 
-    keyword(def) ident(_create_win)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_create_win)operator(()pre_constant(self)operator(\))operator(:)
         keyword(try)operator(:)
             ident(key) operator(=) ident(_winreg)operator(.)ident(OpenKey)operator(()
                 ident(_winreg)operator(.)ident(HKEY_LOCAL_MACHINE)operator(,)
@@ -3165,13 +3165,13 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
         keyword(finally)operator(:)
             ident(_winreg)operator(.)ident(CloseKey)operator(()ident(key)operator(\))
 
-    keyword(def) ident(get_char_size)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(get_char_size)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the character size.)content(
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(fonts)operator([)string<delimiter(')content(NORMAL)delimiter(')>operator(])operator(.)ident(getsize)operator(()string<delimiter(')content(M)delimiter(')>operator(\))
 
-    keyword(def) ident(get_font)operator(()pre_constant(self)operator(,) ident(bold)operator(,) ident(oblique)operator(\))operator(:)
+    keyword(def) method(get_font)operator(()pre_constant(self)operator(,) ident(bold)operator(,) ident(oblique)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the font based on bold and italic flags.)content(
 )content(        )delimiter(""")>
@@ -3185,7 +3185,7 @@ keyword(class) ident(FontManager)operator(()predefined(object)operator(\))operat
             keyword(return) pre_constant(self)operator(.)ident(fonts)operator([)string<delimiter(')content(NORMAL)delimiter(')>operator(])
 
 
-keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(ImageFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Create a PNG image from source code. This uses the Python Imaging Library to)content(
 )content(    generate a pixmap from the source code.)content(
@@ -3283,7 +3283,7 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
 
     ident(default_image_format) operator(=) string<delimiter(')content(png)delimiter(')>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        See the class docstring for explanation of options.)content(
 )content(        )delimiter(""")>
@@ -3328,47 +3328,47 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
             pre_constant(self)operator(.)ident(line_number_width) operator(=) integer(0)
         pre_constant(self)operator(.)ident(drawables) operator(=) operator([)operator(])
 
-    keyword(def) ident(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
+    keyword(def) method(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
         keyword(raise) exception(NotImplementedError)operator(()string<delimiter(')content(The -S option is meaningless for the image )delimiter(')>
                                   string<delimiter(')content(formatter. Use -O style=<stylename> instead.)delimiter(')>operator(\))
 
-    keyword(def) ident(_get_line_height)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_get_line_height)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the height of a line.)content(
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(fonth) operator(+) pre_constant(self)operator(.)ident(line_pad)
 
-    keyword(def) ident(_get_line_y)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
+    keyword(def) method(_get_line_y)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the Y coordinate of a line number.)content(
 )content(        )delimiter(""")>
         keyword(return) ident(lineno) operator(*) pre_constant(self)operator(.)ident(_get_line_height)operator(()operator(\)) operator(+) pre_constant(self)operator(.)ident(image_pad)
 
-    keyword(def) ident(_get_char_width)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_get_char_width)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the width of a character.)content(
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(fontw)
 
-    keyword(def) ident(_get_char_x)operator(()pre_constant(self)operator(,) ident(charno)operator(\))operator(:)
+    keyword(def) method(_get_char_x)operator(()pre_constant(self)operator(,) ident(charno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the X coordinate of a character position.)content(
 )content(        )delimiter(""")>
         keyword(return) ident(charno) operator(*) pre_constant(self)operator(.)ident(fontw) operator(+) pre_constant(self)operator(.)ident(image_pad) operator(+) pre_constant(self)operator(.)ident(line_number_width)
 
-    keyword(def) ident(_get_text_pos)operator(()pre_constant(self)operator(,) ident(charno)operator(,) ident(lineno)operator(\))operator(:)
+    keyword(def) method(_get_text_pos)operator(()pre_constant(self)operator(,) ident(charno)operator(,) ident(lineno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the actual position for a character and line position.)content(
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(_get_char_x)operator(()ident(charno)operator(\))operator(,) pre_constant(self)operator(.)ident(_get_line_y)operator(()ident(lineno)operator(\))
 
-    keyword(def) ident(_get_linenumber_pos)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
+    keyword(def) method(_get_linenumber_pos)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the actual position for the start of a line number.)content(
 )content(        )delimiter(""")>
         keyword(return) operator(()pre_constant(self)operator(.)ident(image_pad)operator(,) pre_constant(self)operator(.)ident(_get_line_y)operator(()ident(lineno)operator(\))operator(\))
 
-    keyword(def) ident(_get_text_color)operator(()pre_constant(self)operator(,) ident(style)operator(\))operator(:)
+    keyword(def) method(_get_text_color)operator(()pre_constant(self)operator(,) ident(style)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the correct color for the token from the style.)content(
 )content(        )delimiter(""")>
@@ -3378,20 +3378,20 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
             ident(fill) operator(=) string<delimiter(')content(#000)delimiter(')>
         keyword(return) ident(fill)
 
-    keyword(def) ident(_get_style_font)operator(()pre_constant(self)operator(,) ident(style)operator(\))operator(:)
+    keyword(def) method(_get_style_font)operator(()pre_constant(self)operator(,) ident(style)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the correct font for the style.)content(
 )content(        )delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(fonts)operator(.)ident(get_font)operator(()ident(style)operator([)string<delimiter(')content(bold)delimiter(')>operator(])operator(,) ident(style)operator([)string<delimiter(')content(italic)delimiter(')>operator(])operator(\))
 
-    keyword(def) ident(_get_image_size)operator(()pre_constant(self)operator(,) ident(maxcharno)operator(,) ident(maxlineno)operator(\))operator(:)
+    keyword(def) method(_get_image_size)operator(()pre_constant(self)operator(,) ident(maxcharno)operator(,) ident(maxlineno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Get the required image size.)content(
 )content(        )delimiter(""")>
         keyword(return) operator(()pre_constant(self)operator(.)ident(_get_char_x)operator(()ident(maxcharno)operator(\)) operator(+) pre_constant(self)operator(.)ident(image_pad)operator(,)
                 pre_constant(self)operator(.)ident(_get_line_y)operator(()ident(maxlineno) operator(+) integer(0)operator(\)) operator(+) pre_constant(self)operator(.)ident(image_pad)operator(\))
 
-    keyword(def) ident(_draw_linenumber)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
+    keyword(def) method(_draw_linenumber)operator(()pre_constant(self)operator(,) ident(lineno)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Remember a line number drawable to paint later.)content(
 )content(        )delimiter(""")>
@@ -3403,13 +3403,13 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
             ident(fill)operator(=)pre_constant(self)operator(.)ident(line_number_fg)operator(,)
         operator(\))
 
-    keyword(def) ident(_draw_text)operator(()pre_constant(self)operator(,) ident(pos)operator(,) ident(text)operator(,) ident(font)operator(,) operator(**)ident(kw)operator(\))operator(:)
+    keyword(def) method(_draw_text)operator(()pre_constant(self)operator(,) ident(pos)operator(,) ident(text)operator(,) ident(font)operator(,) operator(**)ident(kw)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Remember a single drawable tuple to paint later.)content(
 )content(        )delimiter(""")>
         pre_constant(self)operator(.)ident(drawables)operator(.)ident(append)operator(()operator(()ident(pos)operator(,) ident(text)operator(,) ident(font)operator(,) ident(kw)operator(\))operator(\))
 
-    keyword(def) ident(_create_drawables)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
+    keyword(def) method(_create_drawables)operator(()pre_constant(self)operator(,) ident(tokensource)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Create drawables for the token content.)content(
 )content(        )delimiter(""")>
@@ -3442,7 +3442,7 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
         pre_constant(self)operator(.)ident(maxcharno) operator(=) ident(maxcharno)
         pre_constant(self)operator(.)ident(maxlineno) operator(=) ident(lineno)
 
-    keyword(def) ident(_draw_line_numbers)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_draw_line_numbers)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Create drawables for the line numbers.)content(
 )content(        )delimiter(""")>
@@ -3452,7 +3452,7 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
             keyword(if) operator(()operator(()ident(i) operator(+) integer(1)operator(\)) operator(%) pre_constant(self)operator(.)ident(line_number_step)operator(\)) operator(==) integer(0)operator(:)
                 pre_constant(self)operator(.)ident(_draw_linenumber)operator(()ident(i)operator(\))
 
-    keyword(def) ident(_paint_line_number_bg)operator(()pre_constant(self)operator(,) ident(im)operator(\))operator(:)
+    keyword(def) method(_paint_line_number_bg)operator(()pre_constant(self)operator(,) ident(im)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Paint the line number background on the image.)content(
 )content(        )delimiter(""")>
@@ -3469,7 +3469,7 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
         ident(draw)operator(.)ident(line)operator(()operator([)operator(()ident(rectw)operator(,) integer(0)operator(\))operator(,) operator(()ident(rectw)operator(,) ident(recth)operator(\))operator(])operator(,) ident(fill)operator(=)pre_constant(self)operator(.)ident(line_number_fg)operator(\))
         keyword(del) ident(draw)
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Format ``tokensource``, an iterable of ``(tokentype, tokenstring\)``)content(
 )content(        tuples and write it into ``outfile``.)content(
@@ -3494,7 +3494,7 @@ keyword(class) ident(ImageFormatter)operator(()ident(Formatter)operator(\))opera
 comment(# Add one formatter per format, so that the "-f gif" option gives the correct result)
 comment(# when used in pygmentize.)
 
-keyword(class) ident(GifImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
+keyword(class) class(GifImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Create a GIF image from source code. This uses the Python Imaging Library to)content(
 )content(    generate a pixmap from the source code.)content(
@@ -3509,7 +3509,7 @@ keyword(class) ident(GifImageFormatter)operator(()ident(ImageFormatter)operator(
     ident(default_image_format) operator(=) string<delimiter(')content(gif)delimiter(')>
 
 
-keyword(class) ident(JpgImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
+keyword(class) class(JpgImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Create a JPEG image from source code. This uses the Python Imaging Library to)content(
 )content(    generate a pixmap from the source code.)content(
@@ -3524,7 +3524,7 @@ keyword(class) ident(JpgImageFormatter)operator(()ident(ImageFormatter)operator(
     ident(default_image_format) operator(=) string<delimiter(')content(jpeg)delimiter(')>
 
 
-keyword(class) ident(BmpImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
+keyword(class) class(BmpImageFormatter)operator(()ident(ImageFormatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Create a bitmap image from source code. This uses the Python Imaging Library to)content(
 )content(    generate a pixmap from the source code.)content(
@@ -3556,7 +3556,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_bo
 ident(__all__) operator(=) operator([)string<delimiter(')content(LatexFormatter)delimiter(')>operator(])
 
 
-keyword(def) ident(escape_tex)operator(()ident(text)operator(,) ident(commandprefix)operator(\))operator(:)
+keyword(def) method(escape_tex)operator(()ident(text)operator(,) ident(commandprefix)operator(\))operator(:)
     keyword(return) ident(text)operator(.)ident(replace)operator(()string<delimiter(')content(@)delimiter(')>operator(,) string<delimiter(')char(\\x00)delimiter(')>operator(\))operator(.)    \
                 ident(replace)operator(()string<delimiter(')content([)delimiter(')>operator(,) string<delimiter(')char(\\x01)delimiter(')>operator(\))operator(.)    \
                 ident(replace)operator(()string<delimiter(')content(])delimiter(')>operator(,) string<delimiter(')char(\\x02)delimiter(')>operator(\))operator(.)    \
@@ -3638,7 +3638,7 @@ ident(STYLE_TEMPLATE) operator(=) string<modifier(r)delimiter(''')content(
 )delimiter(''')>
 
 
-keyword(def) ident(_get_ttype_name)operator(()ident(ttype)operator(\))operator(:)
+keyword(def) method(_get_ttype_name)operator(()ident(ttype)operator(\))operator(:)
     ident(fname) operator(=) ident(STANDARD_TYPES)operator(.)ident(get)operator(()ident(ttype)operator(\))
     keyword(if) ident(fname)operator(:)
         keyword(return) ident(fname)
@@ -3650,7 +3650,7 @@ keyword(def) ident(_get_ttype_name)operator(()ident(ttype)operator(\))operator(:
     keyword(return) ident(fname) operator(+) ident(aname)
 
 
-keyword(class) ident(LatexFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(LatexFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<modifier(r)delimiter(""")content(
 )content(    Format tokens as LaTeX code. This needs the `fancyvrb` and `color`)content(
 )content(    standard packages.)content(
@@ -3721,7 +3721,7 @@ keyword(class) ident(LatexFormatter)operator(()ident(Formatter)operator(\))opera
     ident(aliases) operator(=) operator([)string<delimiter(')content(latex)delimiter(')>operator(,) string<delimiter(')content(tex)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.tex)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(docclass) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(docclass)delimiter(')>operator(,) string<delimiter(')content(article)delimiter(')>operator(\))
         pre_constant(self)operator(.)ident(preamble) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(preamble)delimiter(')>operator(,) string<delimiter(')delimiter(')>operator(\))
@@ -3735,12 +3735,12 @@ keyword(class) ident(LatexFormatter)operator(()ident(Formatter)operator(\))opera
         pre_constant(self)operator(.)ident(_create_stylesheet)operator(()operator(\))
 
 
-    keyword(def) ident(_create_stylesheet)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_create_stylesheet)operator(()pre_constant(self)operator(\))operator(:)
         ident(t2n) operator(=) pre_constant(self)operator(.)ident(ttype2name) operator(=) operator({)ident(Token)operator(:) string<delimiter(')delimiter(')>operator(})
         ident(c2d) operator(=) pre_constant(self)operator(.)ident(cmd2def) operator(=) operator({)operator(})
         ident(cp) operator(=) pre_constant(self)operator(.)ident(commandprefix)
 
-        keyword(def) ident(rgbcolor)operator(()ident(col)operator(\))operator(:)
+        keyword(def) method(rgbcolor)operator(()ident(col)operator(\))operator(:)
             keyword(if) ident(col)operator(:)
                 keyword(return) string<delimiter(')content(,)delimiter(')>operator(.)ident(join)operator(()operator([)string<delimiter(')content(%.2f)delimiter(')> operator(%)operator(()predefined(int)operator(()ident(col)operator([)ident(i)operator(]) operator(+) ident(col)operator([)ident(i) operator(+) integer(1)operator(])operator(,) integer(16)operator(\)) operator(/) float(255.0)operator(\))
                                  keyword(for) ident(i) keyword(in) operator(()integer(0)operator(,) integer(2)operator(,) integer(4)operator(\))operator(])operator(\))
@@ -3778,7 +3778,7 @@ keyword(class) ident(LatexFormatter)operator(()ident(Formatter)operator(\))opera
             ident(t2n)operator([)ident(ttype)operator(]) operator(=) ident(name)
             ident(c2d)operator([)ident(name)operator(]) operator(=) ident(cmndef)
 
-    keyword(def) ident(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
+    keyword(def) method(get_style_defs)operator(()pre_constant(self)operator(,) ident(arg)operator(=)string<delimiter(')delimiter(')>operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Return the command sequences needed to define the commands)content(
 )content(        used to format text in the verbatim environment. ``arg`` is ignored.)content(
@@ -3790,7 +3790,7 @@ keyword(class) ident(LatexFormatter)operator(()ident(Formatter)operator(\))opera
         keyword(return) ident(STYLE_TEMPLATE) operator(%) operator({)string<delimiter(')content(cp)delimiter(')>operator(:) pre_constant(self)operator(.)ident(commandprefix)operator(,)
                                  string<delimiter(')content(styles)delimiter(')>operator(:) string<delimiter(')char(\\n)delimiter(')>operator(.)ident(join)operator(()ident(styles)operator(\))operator(})
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         comment(# TODO: add support for background colors)
         ident(t2n) operator(=) pre_constant(self)operator(.)ident(ttype2name)
         ident(cp) operator(=) pre_constant(self)operator(.)ident(commandprefix)
@@ -3860,7 +3860,7 @@ keyword(from) ident(pygments)operator(.)ident(console) keyword(import) ident(col
 ident(__all__) operator(=) operator([)string<delimiter(')content(NullFormatter)delimiter(')>operator(,) string<delimiter(')content(RawTokenFormatter)delimiter(')>operator(])
 
 
-keyword(class) ident(NullFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(NullFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Output the text unchanged without any formatting.)content(
 )content(    )delimiter(""")>
@@ -3868,7 +3868,7 @@ keyword(class) ident(NullFormatter)operator(()ident(Formatter)operator(\))operat
     ident(aliases) operator(=) operator([)string<delimiter(')content(text)delimiter(')>operator(,) string<delimiter(')content(null)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.txt)delimiter(')>operator(])
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         ident(enc) operator(=) pre_constant(self)operator(.)ident(encoding)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(tokensource)operator(:)
             keyword(if) ident(enc)operator(:)
@@ -3877,7 +3877,7 @@ keyword(class) ident(NullFormatter)operator(()ident(Formatter)operator(\))operat
                 ident(outfile)operator(.)ident(write)operator(()ident(value)operator(\))
 
 
-keyword(class) ident(RawTokenFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(RawTokenFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<modifier(r)delimiter(""")content(
 )content(    Format tokens as a raw representation for storing token streams.)content(
 )content(
@@ -3902,7 +3902,7 @@ keyword(class) ident(RawTokenFormatter)operator(()ident(Formatter)operator(\))op
 
     ident(unicodeoutput) operator(=) pre_constant(False)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         keyword(if) pre_constant(self)operator(.)ident(encoding)operator(:)
             keyword(raise) ident(OptionError)operator(()string<delimiter(')content(the raw formatter does not support the )delimiter(')>
@@ -3920,7 +3920,7 @@ keyword(class) ident(RawTokenFormatter)operator(()ident(Formatter)operator(\))op
                 keyword(raise) exception(ValueError)operator(()string<delimiter(")content(Invalid color %r specified)delimiter(")> operator(%)
                                  pre_constant(self)operator(.)ident(error_color)operator(\))
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         keyword(try)operator(:)
             ident(outfile)operator(.)ident(write)operator(()ident(b)operator(()string<delimiter(')delimiter(')>operator(\))operator(\))
         keyword(except) exception(TypeError)operator(:)
@@ -3929,19 +3929,19 @@ keyword(class) ident(RawTokenFormatter)operator(()ident(Formatter)operator(\))op
         keyword(if) pre_constant(self)operator(.)ident(compress) operator(==) string<delimiter(')content(gz)delimiter(')>operator(:)
             keyword(import) ident(gzip)
             ident(outfile) operator(=) ident(gzip)operator(.)ident(GzipFile)operator(()string<delimiter(')delimiter(')>operator(,) string<delimiter(')content(wb)delimiter(')>operator(,) integer(9)operator(,) ident(outfile)operator(\))
-            keyword(def) ident(write)operator(()ident(text)operator(\))operator(:)
+            keyword(def) method(write)operator(()ident(text)operator(\))operator(:)
                 ident(outfile)operator(.)ident(write)operator(()ident(text)operator(.)ident(encode)operator(()operator(\))operator(\))
             ident(flush) operator(=) ident(outfile)operator(.)ident(flush)
         keyword(elif) pre_constant(self)operator(.)ident(compress) operator(==) string<delimiter(')content(bz2)delimiter(')>operator(:)
             keyword(import) ident(bz2)
             ident(compressor) operator(=) ident(bz2)operator(.)ident(BZ2Compressor)operator(()integer(9)operator(\))
-            keyword(def) ident(write)operator(()ident(text)operator(\))operator(:)
+            keyword(def) method(write)operator(()ident(text)operator(\))operator(:)
                 ident(outfile)operator(.)ident(write)operator(()ident(compressor)operator(.)ident(compress)operator(()ident(text)operator(.)ident(encode)operator(()operator(\))operator(\))operator(\))
-            keyword(def) ident(flush)operator(()operator(\))operator(:)
+            keyword(def) method(flush)operator(()operator(\))operator(:)
                 ident(outfile)operator(.)ident(write)operator(()ident(compressor)operator(.)ident(flush)operator(()operator(\))operator(\))
                 ident(outfile)operator(.)ident(flush)operator(()operator(\))
         keyword(else)operator(:)
-            keyword(def) ident(write)operator(()ident(text)operator(\))operator(:)
+            keyword(def) method(write)operator(()ident(text)operator(\))operator(:)
                 ident(outfile)operator(.)ident(write)operator(()ident(text)operator(.)ident(encode)operator(()operator(\))operator(\))
             ident(flush) operator(=) ident(outfile)operator(.)ident(flush)
 
@@ -3975,7 +3975,7 @@ keyword(from) ident(pygments)operator(.)ident(formatter) keyword(import) ident(F
 ident(__all__) operator(=) operator([)string<delimiter(')content(RtfFormatter)delimiter(')>operator(])
 
 
-keyword(class) ident(RtfFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(RtfFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Format tokens as RTF markup. This formatter automatically outputs full RTF)content(
 )content(    documents with color information and other useful stuff. Perfect for Copy and)content(
@@ -3999,7 +3999,7 @@ keyword(class) ident(RtfFormatter)operator(()ident(Formatter)operator(\))operato
 
     ident(unicodeoutput) operator(=) pre_constant(False)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Additional options accepted:)content(
 )content(
@@ -4013,12 +4013,12 @@ keyword(class) ident(RtfFormatter)operator(()ident(Formatter)operator(\))operato
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(fontface) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(fontface)delimiter(')>operator(\)) keyword(or) string<delimiter(')delimiter(')>
 
-    keyword(def) ident(_escape)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(_escape)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(return) ident(text)operator(.)ident(replace)operator(()string<delimiter(')char(\\\\)delimiter(')>operator(,) string<delimiter(')char(\\\\)char(\\\\)delimiter(')>operator(\)) \
                    operator(.)ident(replace)operator(()string<delimiter(')content({)delimiter(')>operator(,) string<delimiter(')char(\\\\)content({)delimiter(')>operator(\)) \
                    operator(.)ident(replace)operator(()string<delimiter(')content(})delimiter(')>operator(,) string<delimiter(')char(\\\\)content(})delimiter(')>operator(\))
 
-    keyword(def) ident(_escape_text)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(_escape_text)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         comment(# empty strings, should give a small performance improvment)
         keyword(if) keyword(not) ident(text)operator(:)
             keyword(return) string<delimiter(')delimiter(')>
@@ -4044,7 +4044,7 @@ keyword(class) ident(RtfFormatter)operator(()ident(Formatter)operator(\))operato
 
         keyword(return) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(buf)operator(\))operator(.)ident(replace)operator(()string<delimiter(')char(\\n)delimiter(')>operator(,) string<delimiter(')char(\\\\)content(par)char(\\n)delimiter(')>operator(\))
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         comment(# rtf 1.8 header)
         ident(outfile)operator(.)ident(write)operator(()string<modifier(r)delimiter(')content({)content(\\r)content(tf1)content(\\a)content(nsi)content(\\d)content(eff0)delimiter(')>
                       string<modifier(r)delimiter(')content({)content(\\f)content(onttbl{)content(\\f)content(0)content(\\f)content(modern)content(\\f)content(prq1)content(\\f)content(charset0%s;}})delimiter(')>
@@ -4111,7 +4111,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_bo
 ident(__all__) operator(=) operator([)string<delimiter(')content(SvgFormatter)delimiter(')>operator(])
 
 
-keyword(def) ident(escape_html)operator(()ident(text)operator(\))operator(:)
+keyword(def) method(escape_html)operator(()ident(text)operator(\))operator(:)
     string<delimiter(""")content(Escape &, <, > as well as single and double quotes for HTML.)delimiter(""")>
     keyword(return) ident(text)operator(.)ident(replace)operator(()string<delimiter(')content(&)delimiter(')>operator(,) string<delimiter(')content(&amp;)delimiter(')>operator(\))operator(.)  \
                 ident(replace)operator(()string<delimiter(')content(<)delimiter(')>operator(,) string<delimiter(')content(&lt;)delimiter(')>operator(\))operator(.)   \
@@ -4122,7 +4122,7 @@ keyword(def) ident(escape_html)operator(()ident(text)operator(\))operator(:)
 
 ident(class2style) operator(=) operator({)operator(})
 
-keyword(class) ident(SvgFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(SvgFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Format tokens as an SVG graphics file.  This formatter is still experimental.)content(
 )content(    Each line of code is a ``<text>`` element with explicit ``x`` and ``y``)content(
@@ -4173,7 +4173,7 @@ keyword(class) ident(SvgFormatter)operator(()ident(Formatter)operator(\))operato
     ident(aliases) operator(=) operator([)string<delimiter(')content(svg)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.svg)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         comment(# XXX outencoding)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(nowrap) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(nowrap)delimiter(')>operator(,) pre_constant(False)operator(\))
@@ -4191,7 +4191,7 @@ keyword(class) ident(SvgFormatter)operator(()ident(Formatter)operator(\))operato
         pre_constant(self)operator(.)ident(spacehack) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(spacehack)delimiter(')>operator(,) pre_constant(True)operator(\))
         pre_constant(self)operator(.)ident(_stylecache) operator(=) operator({)operator(})
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Format ``tokensource``, an iterable of ``(tokentype, tokenstring\)``)content(
 )content(        tuples and write it into ``outfile``.)content(
@@ -4232,7 +4232,7 @@ keyword(class) ident(SvgFormatter)operator(()ident(Formatter)operator(\))operato
         keyword(if) keyword(not) pre_constant(self)operator(.)ident(nowrap)operator(:)
             ident(outfile)operator(.)ident(write)operator(()string<delimiter(')content(</g></svg>)char(\\n)delimiter(')>operator(\))
 
-    keyword(def) ident(_get_style)operator(()pre_constant(self)operator(,) ident(tokentype)operator(\))operator(:)
+    keyword(def) method(_get_style)operator(()pre_constant(self)operator(,) ident(tokentype)operator(\))operator(:)
         keyword(if) ident(tokentype) keyword(in) pre_constant(self)operator(.)ident(_stylecache)operator(:)
             keyword(return) pre_constant(self)operator(.)ident(_stylecache)operator([)ident(tokentype)operator(])
         ident(otokentype) operator(=) ident(tokentype)
@@ -4303,7 +4303,7 @@ ident(TERMINAL_COLORS) operator(=) operator({)
 operator(})
 
 
-keyword(class) ident(TerminalFormatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(TerminalFormatter)operator(()ident(Formatter)operator(\))operator(:)
     string<modifier(r)delimiter(""")content(
 )content(    Format tokens with ANSI color sequences, for output in a text console.)content(
 )content(    Color sequences are terminated at newlines, so that paging the output)content(
@@ -4326,13 +4326,13 @@ keyword(class) ident(TerminalFormatter)operator(()ident(Formatter)operator(\))op
     ident(aliases) operator(=) operator([)string<delimiter(')content(terminal)delimiter(')>operator(,) string<delimiter(')content(console)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(darkbg) operator(=) ident(get_choice_opt)operator(()ident(options)operator(,) string<delimiter(')content(bg)delimiter(')>operator(,)
                                      operator([)string<delimiter(')content(light)delimiter(')>operator(,) string<delimiter(')content(dark)delimiter(')>operator(])operator(,) string<delimiter(')content(light)delimiter(')>operator(\)) operator(==) string<delimiter(')content(dark)delimiter(')>
         pre_constant(self)operator(.)ident(colorscheme) operator(=) ident(options)operator(.)ident(get)operator(()string<delimiter(')content(colorscheme)delimiter(')>operator(,) pre_constant(None)operator(\)) keyword(or) ident(TERMINAL_COLORS)
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         comment(# hack: if the output is a terminal and has an encoding set,)
         comment(# use that to avoid unicode encode problems)
         keyword(if) keyword(not) pre_constant(self)operator(.)ident(encoding) keyword(and) predefined(hasattr)operator(()ident(outfile)operator(,) string<delimiter(")content(encoding)delimiter(")>operator(\)) keyword(and) \
@@ -4340,7 +4340,7 @@ keyword(class) ident(TerminalFormatter)operator(()ident(Formatter)operator(\))op
             pre_constant(self)operator(.)ident(encoding) operator(=) ident(outfile)operator(.)ident(encoding)
         keyword(return) ident(Formatter)operator(.)ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(tokensource)operator(:)
             ident(color) operator(=) pre_constant(self)operator(.)ident(colorscheme)operator(.)ident(get)operator(()ident(ttype)operator(\))
             keyword(while) ident(color) keyword(is) pre_constant(None)operator(:)
@@ -4389,19 +4389,19 @@ keyword(from) ident(pygments)operator(.)ident(formatter) keyword(import) ident(F
 ident(__all__) operator(=) operator([)string<delimiter(')content(Terminal256Formatter)delimiter(')>operator(])
 
 
-keyword(class) ident(EscapeSequence)operator(:)
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(fg)operator(=)pre_constant(None)operator(,) ident(bg)operator(=)pre_constant(None)operator(,) ident(bold)operator(=)pre_constant(False)operator(,) ident(underline)operator(=)pre_constant(False)operator(\))operator(:)
+keyword(class) class(EscapeSequence)operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(fg)operator(=)pre_constant(None)operator(,) ident(bg)operator(=)pre_constant(None)operator(,) ident(bold)operator(=)pre_constant(False)operator(,) ident(underline)operator(=)pre_constant(False)operator(\))operator(:)
         pre_constant(self)operator(.)ident(fg) operator(=) ident(fg)
         pre_constant(self)operator(.)ident(bg) operator(=) ident(bg)
         pre_constant(self)operator(.)ident(bold) operator(=) ident(bold)
         pre_constant(self)operator(.)ident(underline) operator(=) ident(underline)
 
-    keyword(def) ident(escape)operator(()pre_constant(self)operator(,) ident(attrs)operator(\))operator(:)
+    keyword(def) method(escape)operator(()pre_constant(self)operator(,) ident(attrs)operator(\))operator(:)
         keyword(if) predefined(len)operator(()ident(attrs)operator(\))operator(:)
             keyword(return) string<delimiter(")char(\\x1b)content([)delimiter(")> operator(+) string<delimiter(")content(;)delimiter(")>operator(.)ident(join)operator(()ident(attrs)operator(\)) operator(+) string<delimiter(")content(m)delimiter(")>
         keyword(return) string<delimiter(")delimiter(")>
 
-    keyword(def) ident(color_string)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(color_string)operator(()pre_constant(self)operator(\))operator(:)
         ident(attrs) operator(=) operator([)operator(])
         keyword(if) pre_constant(self)operator(.)ident(fg) keyword(is) keyword(not) pre_constant(None)operator(:)
             ident(attrs)operator(.)ident(extend)operator(()operator(()string<delimiter(")content(38)delimiter(")>operator(,) string<delimiter(")content(5)delimiter(")>operator(,) string<delimiter(")content(%i)delimiter(")> operator(%) pre_constant(self)operator(.)ident(fg)operator(\))operator(\))
@@ -4413,7 +4413,7 @@ keyword(class) ident(EscapeSequence)operator(:)
             ident(attrs)operator(.)ident(append)operator(()string<delimiter(")content(04)delimiter(")>operator(\))
         keyword(return) pre_constant(self)operator(.)ident(escape)operator(()ident(attrs)operator(\))
 
-    keyword(def) ident(reset_string)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(reset_string)operator(()pre_constant(self)operator(\))operator(:)
         ident(attrs) operator(=) operator([)operator(])
         keyword(if) pre_constant(self)operator(.)ident(fg) keyword(is) keyword(not) pre_constant(None)operator(:)
             ident(attrs)operator(.)ident(append)operator(()string<delimiter(")content(39)delimiter(")>operator(\))
@@ -4423,7 +4423,7 @@ keyword(class) ident(EscapeSequence)operator(:)
             ident(attrs)operator(.)ident(append)operator(()string<delimiter(")content(00)delimiter(")>operator(\))
         keyword(return) pre_constant(self)operator(.)ident(escape)operator(()ident(attrs)operator(\))
 
-keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\))operator(:)
+keyword(class) class(Terminal256Formatter)operator(()ident(Formatter)operator(\))operator(:)
     string<modifier(r)delimiter(""")content(
 )content(    Format tokens with ANSI color sequences, for output in a 256-color)content(
 )content(    terminal or console. Like in `TerminalFormatter` color sequences)content(
@@ -4445,7 +4445,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(terminal256)delimiter(')>operator(,) string<delimiter(')content(console256)delimiter(')>operator(,) string<delimiter(')content(256)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Formatter)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
         pre_constant(self)operator(.)ident(xterm_colors) operator(=) operator([)operator(])
@@ -4458,7 +4458,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
         pre_constant(self)operator(.)ident(_build_color_table)operator(()operator(\)) comment(# build an RGB-to-256 color conversion table)
         pre_constant(self)operator(.)ident(_setup_styles)operator(()operator(\)) comment(# convert selected style's colors to term. colors)
 
-    keyword(def) ident(_build_color_table)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_build_color_table)operator(()pre_constant(self)operator(\))operator(:)
         comment(# colors 0..15: 16 basic colors)
 
         pre_constant(self)operator(.)ident(xterm_colors)operator(.)ident(append)operator(()operator(()hex(0x00)operator(,) hex(0x00)operator(,) hex(0x00)operator(\))operator(\)) comment(# 0)
@@ -4494,7 +4494,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
             ident(v) operator(=) integer(8) operator(+) ident(i) operator(*) integer(10)
             pre_constant(self)operator(.)ident(xterm_colors)operator(.)ident(append)operator(()operator(()ident(v)operator(,) ident(v)operator(,) ident(v)operator(\))operator(\))
 
-    keyword(def) ident(_closest_color)operator(()pre_constant(self)operator(,) ident(r)operator(,) ident(g)operator(,) ident(b)operator(\))operator(:)
+    keyword(def) method(_closest_color)operator(()pre_constant(self)operator(,) ident(r)operator(,) ident(g)operator(,) ident(b)operator(\))operator(:)
         ident(distance) operator(=) integer(257)operator(*)integer(257)operator(*)integer(3) comment(# "infinity" (>distance from #000000 to #ffffff\))
         ident(match) operator(=) integer(0)
 
@@ -4511,7 +4511,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
                 ident(distance) operator(=) ident(d)
         keyword(return) ident(match)
 
-    keyword(def) ident(_color_index)operator(()pre_constant(self)operator(,) ident(color)operator(\))operator(:)
+    keyword(def) method(_color_index)operator(()pre_constant(self)operator(,) ident(color)operator(\))operator(:)
         ident(index) operator(=) pre_constant(self)operator(.)ident(best_match)operator(.)ident(get)operator(()ident(color)operator(,) pre_constant(None)operator(\))
         keyword(if) ident(index) keyword(is) pre_constant(None)operator(:)
             keyword(try)operator(:)
@@ -4526,7 +4526,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
             pre_constant(self)operator(.)ident(best_match)operator([)ident(color)operator(]) operator(=) ident(index)
         keyword(return) ident(index)
 
-    keyword(def) ident(_setup_styles)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(_setup_styles)operator(()pre_constant(self)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(ndef) keyword(in) pre_constant(self)operator(.)ident(style)operator(:)
             ident(escape) operator(=) ident(EscapeSequence)operator(()operator(\))
             keyword(if) ident(ndef)operator([)string<delimiter(')content(color)delimiter(')>operator(])operator(:)
@@ -4540,7 +4540,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
             pre_constant(self)operator(.)ident(style_string)operator([)predefined(str)operator(()ident(ttype)operator(\))operator(]) operator(=) operator(()ident(escape)operator(.)ident(color_string)operator(()operator(\))operator(,)
                                              ident(escape)operator(.)ident(reset_string)operator(()operator(\))operator(\))
 
-    keyword(def) ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         comment(# hack: if the output is a terminal and has an encoding set,)
         comment(# use that to avoid unicode encode problems)
         keyword(if) keyword(not) pre_constant(self)operator(.)ident(encoding) keyword(and) predefined(hasattr)operator(()ident(outfile)operator(,) string<delimiter(")content(encoding)delimiter(")>operator(\)) keyword(and) \
@@ -4548,7 +4548,7 @@ keyword(class) ident(Terminal256Formatter)operator(()ident(Formatter)operator(\)
             pre_constant(self)operator(.)ident(encoding) operator(=) ident(outfile)operator(.)ident(encoding)
         keyword(return) ident(Formatter)operator(.)ident(format)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))
 
-    keyword(def) ident(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
+    keyword(def) method(format_unencoded)operator(()pre_constant(self)operator(,) ident(tokensource)operator(,) ident(outfile)operator(\))operator(:)
         keyword(for) ident(ttype)operator(,) ident(value) keyword(in) ident(tokensource)operator(:)
             ident(not_found) operator(=) pre_constant(True)
             keyword(while) ident(ttype) keyword(and) ident(not_found)operator(:)
@@ -4607,19 +4607,19 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(Lexer)delimiter
 ident(_default_analyse) operator(=) predefined(staticmethod)operator(()keyword(lambda) ident(x)operator(:) float(0.0)operator(\))
 
 
-keyword(class) ident(LexerMeta)operator(()predefined(type)operator(\))operator(:)
+keyword(class) class(LexerMeta)operator(()predefined(type)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    This metaclass automagically converts ``analyse_text`` methods into)content(
 )content(    static methods which always return float values.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__new__)operator(()ident(cls)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(d)operator(\))operator(:)
+    keyword(def) method(__new__)operator(()ident(cls)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(d)operator(\))operator(:)
         keyword(if) string<delimiter(')content(analyse_text)delimiter(')> keyword(in) ident(d)operator(:)
             ident(d)operator([)string<delimiter(')content(analyse_text)delimiter(')>operator(]) operator(=) ident(make_analysator)operator(()ident(d)operator([)string<delimiter(')content(analyse_text)delimiter(')>operator(])operator(\))
         keyword(return) predefined(type)operator(.)ident(__new__)operator(()ident(cls)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(d)operator(\))
 
 
-keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(Lexer)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for a specific language.)content(
 )content(
@@ -4656,7 +4656,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
 
     ident(__metaclass__) operator(=) ident(LexerMeta)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(options) operator(=) ident(options)
         pre_constant(self)operator(.)ident(stripnl) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(stripnl)delimiter(')>operator(,) pre_constant(True)operator(\))
         pre_constant(self)operator(.)ident(stripall) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(stripall)delimiter(')>operator(,) pre_constant(False)operator(\))
@@ -4667,14 +4667,14 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
         keyword(for) ident(filter_) keyword(in) ident(get_list_opt)operator(()ident(options)operator(,) string<delimiter(')content(filters)delimiter(')>operator(,) operator(()operator(\))operator(\))operator(:)
             pre_constant(self)operator(.)ident(add_filter)operator(()ident(filter_)operator(\))
 
-    keyword(def) ident(__repr__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__repr__)operator(()pre_constant(self)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(options)operator(:)
             keyword(return) string<delimiter(')content(<pygments.lexers.%s with %r>)delimiter(')> operator(%) operator(()pre_constant(self)operator(.)ident(__class__)operator(.)ident(__name__)operator(,)
                                                      pre_constant(self)operator(.)ident(options)operator(\))
         keyword(else)operator(:)
             keyword(return) string<delimiter(')content(<pygments.lexers.%s>)delimiter(')> operator(%) pre_constant(self)operator(.)ident(__class__)operator(.)ident(__name__)
 
-    keyword(def) ident(add_filter)operator(()pre_constant(self)operator(,) ident(filter_)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(add_filter)operator(()pre_constant(self)operator(,) ident(filter_)operator(,) operator(**)ident(options)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Add a new stream filter to this lexer.)content(
 )content(        )delimiter(""")>
@@ -4682,7 +4682,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
             ident(filter_) operator(=) ident(get_filter_by_name)operator(()ident(filter_)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(filters)operator(.)ident(append)operator(()ident(filter_)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Has to return a float between ``0`` and ``1`` that indicates)content(
 )content(        if a lexer wants to highlight this text. Used by ``guess_lexer``.)content(
@@ -4696,7 +4696,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
 )content(        it's the same as if the return values was ``0.0``.)content(
 )content(        )delimiter(""")>
 
-    keyword(def) ident(get_tokens)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(unfiltered)operator(=)pre_constant(False)operator(\))operator(:)
+    keyword(def) method(get_tokens)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(unfiltered)operator(=)pre_constant(False)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Return an iterable of (tokentype, value\) pairs generated from)content(
 )content(        `text`. If `unfiltered` is set to `True`, the filtering mechanism)content(
@@ -4736,7 +4736,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
         keyword(if) keyword(not) ident(text)operator(.)ident(endswith)operator(()string<delimiter(')char(\\n)delimiter(')>operator(\))operator(:)
             ident(text) operator(+=) string<delimiter(')char(\\n)delimiter(')>
 
-        keyword(def) ident(streamer)operator(()operator(\))operator(:)
+        keyword(def) method(streamer)operator(()operator(\))operator(:)
             keyword(for) ident(i)operator(,) ident(t)operator(,) ident(v) keyword(in) pre_constant(self)operator(.)ident(get_tokens_unprocessed)operator(()ident(text)operator(\))operator(:)
                 keyword(yield) ident(t)operator(,) ident(v)
         ident(stream) operator(=) ident(streamer)operator(()operator(\))
@@ -4744,7 +4744,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
             ident(stream) operator(=) ident(apply_filters)operator(()ident(stream)operator(,) pre_constant(self)operator(.)ident(filters)operator(,) pre_constant(self)operator(\))
         keyword(return) ident(stream)
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Return an iterable of (tokentype, value\) pairs.)content(
 )content(        In subclasses, implement this method as a generator to)content(
@@ -4753,7 +4753,7 @@ keyword(class) ident(Lexer)operator(()predefined(object)operator(\))operator(:)
         keyword(raise) exception(NotImplementedError)
 
 
-keyword(class) ident(DelegatingLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(DelegatingLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    This lexer takes two lexer as arguments. A root lexer and)content(
 )content(    a language lexer. First everything is scanned using the language)content(
@@ -4763,13 +4763,13 @@ keyword(class) ident(DelegatingLexer)operator(()ident(Lexer)operator(\))operator
 )content(    The lexers from the ``template`` lexer package use this base lexer.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(_root_lexer)operator(,) ident(_language_lexer)operator(,) ident(_needle)operator(=)ident(Other)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(_root_lexer)operator(,) ident(_language_lexer)operator(,) ident(_needle)operator(=)ident(Other)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(root_lexer) operator(=) ident(_root_lexer)operator(()operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(language_lexer) operator(=) ident(_language_lexer)operator(()operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(needle) operator(=) ident(_needle)
         ident(Lexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(buffered) operator(=) string<delimiter(')delimiter(')>
         ident(insertions) operator(=) operator([)operator(])
         ident(lng_buffer) operator(=) operator([)operator(])
@@ -4792,58 +4792,58 @@ comment(# RegexLexer and ExtendedRegexLexer)
 comment(#)
 
 
-keyword(class) ident(include)operator(()predefined(str)operator(\))operator(:)
+keyword(class) class(include)operator(()predefined(str)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Indicates that a state should include rules from another state.)content(
 )content(    )delimiter(""")>
     keyword(pass)
 
 
-keyword(class) ident(combined)operator(()predefined(tuple)operator(\))operator(:)
+keyword(class) class(combined)operator(()predefined(tuple)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Indicates a state combined from multiple states.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__new__)operator(()ident(cls)operator(,) operator(*)ident(args)operator(\))operator(:)
+    keyword(def) method(__new__)operator(()ident(cls)operator(,) operator(*)ident(args)operator(\))operator(:)
         keyword(return) predefined(tuple)operator(.)ident(__new__)operator(()ident(cls)operator(,) ident(args)operator(\))
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(\))operator(:)
         comment(# tuple.__init__ doesn't do anything)
         keyword(pass)
 
 
-keyword(class) ident(_PseudoMatch)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(_PseudoMatch)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A pseudo match object constructed from a string.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(start)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(start)operator(,) ident(text)operator(\))operator(:)
         pre_constant(self)operator(.)ident(_text) operator(=) ident(text)
         pre_constant(self)operator(.)ident(_start) operator(=) ident(start)
 
-    keyword(def) ident(start)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(start)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
         keyword(return) pre_constant(self)operator(.)ident(_start)
 
-    keyword(def) ident(end)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(end)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
         keyword(return) pre_constant(self)operator(.)ident(_start) operator(+) predefined(len)operator(()pre_constant(self)operator(.)ident(_text)operator(\))
 
-    keyword(def) ident(group)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(group)operator(()pre_constant(self)operator(,) ident(arg)operator(=)pre_constant(None)operator(\))operator(:)
         keyword(if) ident(arg)operator(:)
             keyword(raise) exception(IndexError)operator(()string<delimiter(')content(No such group)delimiter(')>operator(\))
         keyword(return) pre_constant(self)operator(.)ident(_text)
 
-    keyword(def) ident(groups)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(groups)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) operator(()pre_constant(self)operator(.)ident(_text)operator(,)operator(\))
 
-    keyword(def) ident(groupdict)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(groupdict)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) operator({)operator(})
 
 
-keyword(def) ident(bygroups)operator(()operator(*)ident(args)operator(\))operator(:)
+keyword(def) method(bygroups)operator(()operator(*)ident(args)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Callback that yields multiple actions for each group in the match.)content(
 )content(    )delimiter(""")>
-    keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
         keyword(for) ident(i)operator(,) ident(action) keyword(in) predefined(enumerate)operator(()ident(args)operator(\))operator(:)
             keyword(if) ident(action) keyword(is) pre_constant(None)operator(:)
                 keyword(continue)
@@ -4863,7 +4863,7 @@ keyword(def) ident(bygroups)operator(()operator(*)ident(args)operator(\))operato
     keyword(return) ident(callback)
 
 
-keyword(class) ident(_This)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(_This)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Special singleton used for indicating the caller class.)content(
 )content(    Used by ``using``.)content(
@@ -4871,7 +4871,7 @@ keyword(class) ident(_This)operator(()predefined(object)operator(\))operator(:)
 ident(this) operator(=) ident(_This)operator(()operator(\))
 
 
-keyword(def) ident(using)operator(()ident(_other)operator(,) operator(**)ident(kwargs)operator(\))operator(:)
+keyword(def) method(using)operator(()ident(_other)operator(,) operator(**)ident(kwargs)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Callback that processes the match with a different lexer.)content(
 )content(
@@ -4893,7 +4893,7 @@ keyword(def) ident(using)operator(()ident(_other)operator(,) operator(**)ident(k
             ident(gt_kwargs)operator([)string<delimiter(')content(stack)delimiter(')>operator(]) operator(=) operator(()string<delimiter(')content(root)delimiter(')>operator(,) ident(s)operator(\))
 
     keyword(if) ident(_other) keyword(is) ident(this)operator(:)
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
             comment(# if keyword arguments are given the callback)
             comment(# function has to create a new lexer instance)
             keyword(if) ident(kwargs)operator(:)
@@ -4908,7 +4908,7 @@ keyword(def) ident(using)operator(()ident(_other)operator(,) operator(**)ident(k
             keyword(if) ident(ctx)operator(:)
                 ident(ctx)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
     keyword(else)operator(:)
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(ctx)operator(=)pre_constant(None)operator(\))operator(:)
             comment(# XXX: cache that somehow)
             ident(kwargs)operator(.)ident(update)operator(()ident(lexer)operator(.)ident(options)operator(\))
             ident(lx) operator(=) ident(_other)operator(()operator(**)ident(kwargs)operator(\))
@@ -4921,13 +4921,13 @@ keyword(def) ident(using)operator(()ident(_other)operator(,) operator(**)ident(k
     keyword(return) ident(callback)
 
 
-keyword(class) ident(RegexLexerMeta)operator(()ident(LexerMeta)operator(\))operator(:)
+keyword(class) class(RegexLexerMeta)operator(()ident(LexerMeta)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Metaclass for RegexLexer, creates the self._tokens attribute from)content(
 )content(    self.tokens on the first instantiation.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(_process_state)operator(()ident(cls)operator(,) ident(unprocessed)operator(,) ident(processed)operator(,) ident(state)operator(\))operator(:)
+    keyword(def) method(_process_state)operator(()ident(cls)operator(,) ident(unprocessed)operator(,) ident(processed)operator(,) ident(state)operator(\))operator(:)
         keyword(assert) predefined(type)operator(()ident(state)operator(\)) keyword(is) predefined(str)operator(,) string<delimiter(")content(wrong state name %r)delimiter(")> operator(%) ident(state)
         keyword(assert) ident(state)operator([)integer(0)operator(]) operator(!=) string<delimiter(')content(#)delimiter(')>operator(,) string<delimiter(")content(invalid state name %r)delimiter(")> operator(%) ident(state)
         keyword(if) ident(state) keyword(in) ident(processed)operator(:)
@@ -4991,14 +4991,14 @@ keyword(class) ident(RegexLexerMeta)operator(()ident(LexerMeta)operator(\))opera
             ident(tokens)operator(.)ident(append)operator(()operator(()ident(rex)operator(,) ident(tdef)operator([)integer(1)operator(])operator(,) ident(new_state)operator(\))operator(\))
         keyword(return) ident(tokens)
 
-    keyword(def) ident(process_tokendef)operator(()ident(cls)operator(,) ident(name)operator(,) ident(tokendefs)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(process_tokendef)operator(()ident(cls)operator(,) ident(name)operator(,) ident(tokendefs)operator(=)pre_constant(None)operator(\))operator(:)
         ident(processed) operator(=) ident(cls)operator(.)ident(_all_tokens)operator([)ident(name)operator(]) operator(=) operator({)operator(})
         ident(tokendefs) operator(=) ident(tokendefs) keyword(or) ident(cls)operator(.)ident(tokens)operator([)ident(name)operator(])
         keyword(for) ident(state) keyword(in) ident(tokendefs)operator(.)ident(keys)operator(()operator(\))operator(:)
             ident(cls)operator(.)ident(_process_state)operator(()ident(tokendefs)operator(,) ident(processed)operator(,) ident(state)operator(\))
         keyword(return) ident(processed)
 
-    keyword(def) ident(__call__)operator(()ident(cls)operator(,) operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))operator(:)
+    keyword(def) method(__call__)operator(()ident(cls)operator(,) operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))operator(:)
         keyword(if) keyword(not) predefined(hasattr)operator(()ident(cls)operator(,) string<delimiter(')content(_tokens)delimiter(')>operator(\))operator(:)
             ident(cls)operator(.)ident(_all_tokens) operator(=) operator({)operator(})
             ident(cls)operator(.)ident(_tmpname) operator(=) integer(0)
@@ -5011,7 +5011,7 @@ keyword(class) ident(RegexLexerMeta)operator(()ident(LexerMeta)operator(\))opera
         keyword(return) predefined(type)operator(.)ident(__call__)operator(()ident(cls)operator(,) operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))
 
 
-keyword(class) ident(RegexLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(RegexLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Base for simple stateful regular expression-based lexers.)content(
 )content(    Simplifies the lexing process so that you need only)content(
@@ -5042,7 +5042,7 @@ keyword(class) ident(RegexLexer)operator(()ident(Lexer)operator(\))operator(:)
     comment(#: current one.)
     ident(tokens) operator(=) operator({)operator(})
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(stack)operator(=)operator(()string<delimiter(')content(root)delimiter(')>operator(,)operator(\))operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(stack)operator(=)operator(()string<delimiter(')content(root)delimiter(')>operator(,)operator(\))operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Split ``text`` into (tokentype, text\) pairs.)content(
 )content(
@@ -5096,28 +5096,28 @@ keyword(class) ident(RegexLexer)operator(()ident(Lexer)operator(\))operator(:)
                     keyword(break)
 
 
-keyword(class) ident(LexerContext)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(LexerContext)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A helper object that holds lexer position data.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(pos)operator(,) ident(stack)operator(=)pre_constant(None)operator(,) ident(end)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(pos)operator(,) ident(stack)operator(=)pre_constant(None)operator(,) ident(end)operator(=)pre_constant(None)operator(\))operator(:)
         pre_constant(self)operator(.)ident(text) operator(=) ident(text)
         pre_constant(self)operator(.)ident(pos) operator(=) ident(pos)
         pre_constant(self)operator(.)ident(end) operator(=) ident(end) keyword(or) predefined(len)operator(()ident(text)operator(\)) comment(# end=0 not supported ;-\))
         pre_constant(self)operator(.)ident(stack) operator(=) ident(stack) keyword(or) operator([)string<delimiter(')content(root)delimiter(')>operator(])
 
-    keyword(def) ident(__repr__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__repr__)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) string<delimiter(')content(LexerContext(%r, %r, %r\))delimiter(')> operator(%) operator(()
             pre_constant(self)operator(.)ident(text)operator(,) pre_constant(self)operator(.)ident(pos)operator(,) pre_constant(self)operator(.)ident(stack)operator(\))
 
 
-keyword(class) ident(ExtendedRegexLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ExtendedRegexLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A RegexLexer that uses a context object to store its state.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(=)pre_constant(None)operator(,) ident(context)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(=)pre_constant(None)operator(,) ident(context)operator(=)pre_constant(None)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Split ``text`` into (tokentype, text\) pairs.)content(
 )content(        If ``context`` is given, use this lexer context instead.)content(
@@ -5174,7 +5174,7 @@ keyword(class) ident(ExtendedRegexLexer)operator(()ident(RegexLexer)operator(\))
                     keyword(break)
 
 
-keyword(def) ident(do_insertions)operator(()ident(insertions)operator(,) ident(tokens)operator(\))operator(:)
+keyword(def) method(do_insertions)operator(()ident(insertions)operator(,) ident(tokens)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Helper for lexers which must combine the results of several)content(
 )content(    sublexers.)content(
@@ -5261,7 +5261,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(get_lexer_by_na
 ident(_lexer_cache) operator(=) operator({)operator(})
 
 
-keyword(def) ident(_load_lexers)operator(()ident(module_name)operator(\))operator(:)
+keyword(def) method(_load_lexers)operator(()ident(module_name)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Load a lexer (and all others in the module too\).)content(
 )content(    )delimiter(""")>
@@ -5271,7 +5271,7 @@ keyword(def) ident(_load_lexers)operator(()ident(module_name)operator(\))operato
         ident(_lexer_cache)operator([)ident(cls)operator(.)ident(name)operator(]) operator(=) ident(cls)
 
 
-keyword(def) ident(get_all_lexers)operator(()operator(\))operator(:)
+keyword(def) method(get_all_lexers)operator(()operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return a generator of tuples in the form ``(name, aliases,)content(
 )content(    filenames, mimetypes\)`` of all know lexers.)content(
@@ -5282,7 +5282,7 @@ keyword(def) ident(get_all_lexers)operator(()operator(\))operator(:)
         keyword(yield) ident(lexer)operator(.)ident(name)operator(,) ident(lexer)operator(.)ident(aliases)operator(,) ident(lexer)operator(.)ident(filenames)operator(,) ident(lexer)operator(.)ident(mimetypes)
 
 
-keyword(def) ident(find_lexer_class)operator(()ident(name)operator(\))operator(:)
+keyword(def) method(find_lexer_class)operator(()ident(name)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lookup a lexer class by name. Return None if not found.)content(
 )content(    )delimiter(""")>
@@ -5299,7 +5299,7 @@ keyword(def) ident(find_lexer_class)operator(()ident(name)operator(\))operator(:
             keyword(return) ident(cls)
 
 
-keyword(def) ident(get_lexer_by_name)operator(()ident(_alias)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_lexer_by_name)operator(()ident(_alias)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Get a lexer by an alias.)content(
 )content(    )delimiter(""")>
@@ -5316,7 +5316,7 @@ keyword(def) ident(get_lexer_by_name)operator(()ident(_alias)operator(,) operato
     keyword(raise) ident(ClassNotFound)operator(()string<delimiter(')content(no lexer for alias %r found)delimiter(')> operator(%) ident(_alias)operator(\))
 
 
-keyword(def) ident(get_lexer_for_filename)operator(()ident(_fn)operator(,) ident(code)operator(=)pre_constant(None)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_lexer_for_filename)operator(()ident(_fn)operator(,) ident(code)operator(=)pre_constant(None)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Get a lexer for a filename.  If multiple lexers match the filename)content(
 )content(    pattern, use ``analyze_text(\)`` to figure out which one is more)content(
@@ -5339,7 +5339,7 @@ keyword(def) ident(get_lexer_for_filename)operator(()ident(_fn)operator(,) ident
         comment(# decode it, since all analyse_text functions expect unicode)
         ident(code) operator(=) ident(code)operator(.)ident(decode)operator(()string<delimiter(')content(latin1)delimiter(')>operator(\))
 
-    keyword(def) ident(get_rating)operator(()ident(cls)operator(\))operator(:)
+    keyword(def) method(get_rating)operator(()ident(cls)operator(\))operator(:)
         comment(# The class _always_ defines analyse_text because it's included in)
         comment(# the Lexer class.  The default implementation returns None which)
         comment(# gets turned into 0.0.  Run scripts/detect_missing_analyse_text.py)
@@ -5356,7 +5356,7 @@ keyword(def) ident(get_lexer_for_filename)operator(()ident(_fn)operator(,) ident
     keyword(raise) ident(ClassNotFound)operator(()string<delimiter(')content(no lexer for filename %r found)delimiter(')> operator(%) ident(_fn)operator(\))
 
 
-keyword(def) ident(get_lexer_for_mimetype)operator(()ident(_mime)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(get_lexer_for_mimetype)operator(()ident(_mime)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Get a lexer for a mimetype.)content(
 )content(    )delimiter(""")>
@@ -5371,7 +5371,7 @@ keyword(def) ident(get_lexer_for_mimetype)operator(()ident(_mime)operator(,) ope
     keyword(raise) ident(ClassNotFound)operator(()string<delimiter(')content(no lexer for mimetype %r found)delimiter(')> operator(%) ident(_mime)operator(\))
 
 
-keyword(def) ident(_iter_lexerclasses)operator(()operator(\))operator(:)
+keyword(def) method(_iter_lexerclasses)operator(()operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return an iterator over all lexer classes.)content(
 )content(    )delimiter(""")>
@@ -5383,7 +5383,7 @@ keyword(def) ident(_iter_lexerclasses)operator(()operator(\))operator(:)
         keyword(yield) ident(lexer)
 
 
-keyword(def) ident(guess_lexer_for_filename)operator(()ident(_fn)operator(,) ident(_text)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(guess_lexer_for_filename)operator(()ident(_fn)operator(,) ident(_text)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lookup all lexers that handle those filenames primary (``filenames``\))content(
 )content(    or secondary (``alias_filenames``\). Then run a text analysis for those)content(
@@ -5426,7 +5426,7 @@ keyword(def) ident(guess_lexer_for_filename)operator(()ident(_fn)operator(,) ide
     keyword(return) ident(result)operator([)operator(-)integer(1)operator(])operator([)integer(1)operator(])operator(()operator(**)ident(options)operator(\))
 
 
-keyword(def) ident(guess_lexer)operator(()ident(_text)operator(,) operator(**)ident(options)operator(\))operator(:)
+keyword(def) method(guess_lexer)operator(()ident(_text)operator(,) operator(**)ident(options)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Guess a lexer by strong distinctions in the text (eg, shebang\).)content(
 )content(    )delimiter(""")>
@@ -5442,10 +5442,10 @@ keyword(def) ident(guess_lexer)operator(()ident(_text)operator(,) operator(**)id
     keyword(return) ident(best_lexer)operator([)integer(1)operator(])operator(()operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(_automodule)operator(()ident(types)operator(.)ident(ModuleType)operator(\))operator(:)
+keyword(class) class(_automodule)operator(()ident(types)operator(.)ident(ModuleType)operator(\))operator(:)
     string<delimiter(""")content(Automatically import lexers.)delimiter(""")>
 
-    keyword(def) ident(__getattr__)operator(()pre_constant(self)operator(,) ident(name)operator(\))operator(:)
+    keyword(def) method(__getattr__)operator(()pre_constant(self)operator(,) ident(name)operator(\))operator(:)
         ident(info) operator(=) ident(LEXERS)operator(.)ident(get)operator(()ident(name)operator(\))
         keyword(if) ident(info)operator(:)
             ident(_load_lexers)operator(()ident(info)operator([)integer(0)operator(])operator(\))
@@ -5850,32 +5850,32 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
     comment(# you can't generally find out what module a function belongs to if you)
     comment(# have only its name. Because of this, here are some callback functions)
     comment(# that recognize if a gioven function belongs to a specific module)
-    keyword(def) ident(module_callbacks)operator(()operator(\))operator(:)
-        keyword(def) ident(is_in_coroutine_module)operator(()ident(name)operator(\))operator(:)
+    keyword(def) method(module_callbacks)operator(()operator(\))operator(:)
+        keyword(def) method(is_in_coroutine_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(coroutine.)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_modules_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_modules_module)operator(()ident(name)operator(\))operator(:)
             keyword(if) ident(name) keyword(in) operator([)string<delimiter(')content(require)delimiter(')>operator(,) string<delimiter(')content(module)delimiter(')>operator(]) keyword(or) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(package)delimiter(')>operator(\))operator(:)
                 keyword(return) pre_constant(True)
             keyword(else)operator(:)
                 keyword(return) pre_constant(False)
 
-        keyword(def) ident(is_in_string_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_string_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(string.)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_table_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_table_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(table.)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_math_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_math_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(math)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_io_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_io_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(io.)delimiter(')>operator(\)) keyword(or) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(file:)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_os_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_os_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(os.)delimiter(')>operator(\))
 
-        keyword(def) ident(is_in_debug_module)operator(()ident(name)operator(\))operator(:)
+        keyword(def) method(is_in_debug_module)operator(()ident(name)operator(\))operator(:)
             keyword(return) ident(name)operator(.)ident(startswith)operator(()string<delimiter(')content(debug.)delimiter(')>operator(\))
 
         keyword(return) operator({)string<delimiter(')content(coroutine)delimiter(')>operator(:) ident(is_in_coroutine_module)operator(,)
@@ -5889,7 +5889,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
 
 
 
-    keyword(def) ident(get_newest_version)operator(()operator(\))operator(:)
+    keyword(def) method(get_newest_version)operator(()operator(\))operator(:)
         ident(f) operator(=) ident(urllib)operator(.)ident(urlopen)operator(()string<delimiter(')content(http://www.lua.org/manual/)delimiter(')>operator(\))
         ident(r) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(^<A HREF="()content(\\d)content(\\.)content(\\d)content(\)/">Lua )content(\\1)content(</A>)delimiter(')>operator(\))
         keyword(for) ident(line) keyword(in) ident(f)operator(:)
@@ -5897,7 +5897,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
             keyword(if) ident(m) keyword(is) keyword(not) pre_constant(None)operator(:)
                 keyword(return) ident(m)operator(.)ident(groups)operator(()operator(\))operator([)integer(0)operator(])
 
-    keyword(def) ident(get_lua_functions)operator(()ident(version)operator(\))operator(:)
+    keyword(def) method(get_lua_functions)operator(()ident(version)operator(\))operator(:)
         ident(f) operator(=) ident(urllib)operator(.)ident(urlopen)operator(()string<delimiter(')content(http://www.lua.org/manual/%s/)delimiter(')> operator(%) ident(version)operator(\))
         ident(r) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(^<A HREF="manual.html#pdf-(.+\)">)content(\\1)content(</A>)delimiter(')>operator(\))
         ident(functions) operator(=) operator([)operator(])
@@ -5907,7 +5907,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
                 ident(functions)operator(.)ident(append)operator(()ident(m)operator(.)ident(groups)operator(()operator(\))operator([)integer(0)operator(])operator(\))
         keyword(return) ident(functions)
 
-    keyword(def) ident(get_function_module)operator(()ident(name)operator(\))operator(:)
+    keyword(def) method(get_function_module)operator(()ident(name)operator(\))operator(:)
         keyword(for) ident(mod)operator(,) ident(cb) keyword(in) ident(module_callbacks)operator(()operator(\))operator(.)ident(iteritems)operator(()operator(\))operator(:)
             keyword(if) ident(cb)operator(()ident(name)operator(\))operator(:)
                 keyword(return) ident(mod)
@@ -5916,7 +5916,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
         keyword(else)operator(:)
             keyword(return) string<delimiter(')content(basic)delimiter(')>
 
-    keyword(def) ident(regenerate)operator(()ident(filename)operator(,) ident(modules)operator(\))operator(:)
+    keyword(def) method(regenerate)operator(()ident(filename)operator(,) ident(modules)operator(\))operator(:)
         ident(f) operator(=) predefined(open)operator(()ident(filename)operator(\))
         keyword(try)operator(:)
             ident(content) operator(=) ident(f)operator(.)ident(read)operator(()operator(\))
@@ -5933,7 +5933,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
         ident(f)operator(.)ident(write)operator(()ident(footer)operator(\))
         ident(f)operator(.)ident(close)operator(()operator(\))
 
-    keyword(def) ident(run)operator(()operator(\))operator(:)
+    keyword(def) method(run)operator(()operator(\))operator(:)
         ident(version) operator(=) ident(get_newest_version)operator(()operator(\))
         keyword(print) string<delimiter(')content(> Downloading function index for Lua %s)delimiter(')> operator(%) ident(version)
         ident(functions) operator(=) ident(get_lua_functions)operator(()ident(version)operator(\))
@@ -9498,7 +9498,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
     keyword(import) ident(urllib)
     ident(_function_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(<B)content(\\s)content(+CLASS="function")content(\\s)content(*>(.*?\))content(\\()content(\\\))content(</B)content(\\s)content(*>(?uism\))delimiter(')>operator(\))
 
-    keyword(def) ident(get_php_functions)operator(()operator(\))operator(:)
+    keyword(def) method(get_php_functions)operator(()operator(\))operator(:)
         ident(uf) operator(=) ident(urllib)operator(.)ident(urlopen)operator(()string<delimiter(')content(http://de.php.net/manual/en/index.functions.php)delimiter(')>operator(\))
         ident(data) operator(=) ident(uf)operator(.)ident(read)operator(()operator(\))
         ident(uf)operator(.)ident(close)operator(()operator(\))
@@ -9512,7 +9512,7 @@ keyword(if) ident(__name__) operator(==) string<delimiter(')content(__main__)del
         ident(results)operator(.)ident(sort)operator(()operator(\))
         keyword(return) ident(results)
 
-    keyword(def) ident(get_function_module)operator(()ident(func_name)operator(\))operator(:)
+    keyword(def) method(get_function_module)operator(()ident(func_name)operator(\))operator(:)
         ident(fn) operator(=) ident(func_name)operator(.)ident(replace)operator(()string<delimiter(')content(_)delimiter(')>operator(,) string<delimiter(')content(-)delimiter(')>operator(\))
         ident(uf) operator(=) ident(urllib)operator(.)ident(urlopen)operator(()string<delimiter(')content(http://de.php.net/manual/en/function.%s.php)delimiter(')> operator(%) ident(fn)operator(\))
         ident(regex) operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(<li class="header up">)delimiter(')>
@@ -9593,7 +9593,7 @@ keyword(from) ident(pygments)operator(.)ident(lexers)operator(.)ident(functional
 ident(line_re)  operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(.*?)char(\\n)delimiter(')>operator(\))
 
 
-keyword(class) ident(PythonLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PythonLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Python <http://www.python.org>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -9734,11 +9734,11 @@ keyword(class) ident(PythonLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content(pythonw?(2)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))
 
 
-keyword(class) ident(Python3Lexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(Python3Lexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Python <http://www.python.org>`_ source code (version 3.0\).)content(
 )content(
@@ -9825,11 +9825,11 @@ keyword(class) ident(Python3Lexer)operator(()ident(RegexLexer)operator(\))operat
         comment(# newlines are an error (use "nl" state\))
     operator(])
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content(pythonw?(3)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))
 
 
-keyword(class) ident(PythonConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(PythonConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Python console output or doctests, such as:)content(
 )content(
@@ -9853,11 +9853,11 @@ keyword(class) ident(PythonConsoleLexer)operator(()ident(Lexer)operator(\))opera
     ident(aliases) operator(=) operator([)string<delimiter(')content(pycon)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-python-doctest)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(python3) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(python3)delimiter(')>operator(,) pre_constant(False)operator(\))
         ident(Lexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(python3)operator(:)
             ident(pylexer) operator(=) ident(Python3Lexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
             ident(tblexer) operator(=) ident(Python3TracebackLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
@@ -9910,7 +9910,7 @@ keyword(class) ident(PythonConsoleLexer)operator(()ident(Lexer)operator(\))opera
                 keyword(yield) ident(item)
 
 
-keyword(class) ident(PythonTracebackLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PythonTracebackLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Python tracebacks.)content(
 )content(
@@ -9945,7 +9945,7 @@ keyword(class) ident(PythonTracebackLexer)operator(()ident(RegexLexer)operator(\
     operator(})
 
 
-keyword(class) ident(Python3TracebackLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(Python3TracebackLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Python 3.0 tracebacks, with support for chained exceptions.)content(
 )content(
@@ -9981,7 +9981,7 @@ keyword(class) ident(Python3TracebackLexer)operator(()ident(RegexLexer)operator(
     operator(})
 
 
-keyword(class) ident(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))operator(:)
+keyword(class) class(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Ruby <http://www.ruby-lang.org>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -9993,7 +9993,7 @@ keyword(class) ident(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
 
     ident(flags) operator(=) ident(re)operator(.)ident(DOTALL) operator(|) ident(re)operator(.)ident(MULTILINE)
 
-    keyword(def) ident(heredoc_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
+    keyword(def) method(heredoc_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
         comment(# okay, this is the hardest part of parsing Ruby...)
         comment(# match: 1 = <<-?, 2 = quote? 3 = name 4 = quote? 5 = rest of line)
 
@@ -10039,8 +10039,8 @@ keyword(class) ident(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             keyword(del) ident(heredocstack)operator([)operator(:)operator(])
 
 
-    keyword(def) ident(gen_rubystrings_rules)operator(()operator(\))operator(:)
-        keyword(def) ident(intp_regex_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
+    keyword(def) method(gen_rubystrings_rules)operator(()operator(\))operator(:)
+        keyword(def) method(intp_regex_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
             keyword(yield) ident(match)operator(.)ident(start)operator(()integer(1)operator(\))operator(,) ident(String)operator(.)ident(Regex)operator(,) ident(match)operator(.)ident(group)operator(()integer(1)operator(\))    comment(# begin)
             ident(nctx) operator(=) ident(LexerContext)operator(()ident(match)operator(.)ident(group)operator(()integer(3)operator(\))operator(,) integer(0)operator(,) operator([)string<delimiter(')content(interpolated-regex)delimiter(')>operator(])operator(\))
             keyword(for) ident(i)operator(,) ident(t)operator(,) ident(v) keyword(in) pre_constant(self)operator(.)ident(get_tokens_unprocessed)operator(()ident(context)operator(=)ident(nctx)operator(\))operator(:)
@@ -10048,7 +10048,7 @@ keyword(class) ident(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             keyword(yield) ident(match)operator(.)ident(start)operator(()integer(4)operator(\))operator(,) ident(String)operator(.)ident(Regex)operator(,) ident(match)operator(.)ident(group)operator(()integer(4)operator(\))    comment(# end[mixounse]*)
             ident(ctx)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
 
-        keyword(def) ident(intp_string_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
+        keyword(def) method(intp_string_callback)operator(()pre_constant(self)operator(,) ident(match)operator(,) ident(ctx)operator(\))operator(:)
             keyword(yield) ident(match)operator(.)ident(start)operator(()integer(1)operator(\))operator(,) ident(String)operator(.)ident(Other)operator(,) ident(match)operator(.)ident(group)operator(()integer(1)operator(\))
             ident(nctx) operator(=) ident(LexerContext)operator(()ident(match)operator(.)ident(group)operator(()integer(3)operator(\))operator(,) integer(0)operator(,) operator([)string<delimiter(')content(interpolated-string)delimiter(')>operator(])operator(\))
             keyword(for) ident(i)operator(,) ident(t)operator(,) ident(v) keyword(in) pre_constant(self)operator(.)ident(get_tokens_unprocessed)operator(()ident(context)operator(=)ident(nctx)operator(\))operator(:)
@@ -10315,11 +10315,11 @@ keyword(class) ident(RubyLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
     operator(})
     ident(tokens)operator(.)ident(update)operator(()ident(gen_rubystrings_rules)operator(()operator(\))operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content(ruby(1)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))
 
 
-keyword(class) ident(RubyConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(RubyConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Ruby interactive console (**irb**\) output like:)content(
 )content(
@@ -10338,7 +10338,7 @@ keyword(class) ident(RubyConsoleLexer)operator(()ident(Lexer)operator(\))operato
     ident(_prompt_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(irb)content(\\()content([a-zA-Z_][a-zA-Z0-9_]*)content(\\\))content(:)content(\\d)content({3}:)content(\\d)content(+[>*")char(\\')content(] )delimiter(')>
                             string<delimiter(')content(|>> |)content(\\?)content(> )delimiter(')>operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(rblexer) operator(=) ident(RubyLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(curcode) operator(=) string<delimiter(')delimiter(')>
@@ -10365,7 +10365,7 @@ keyword(class) ident(RubyConsoleLexer)operator(()ident(Lexer)operator(\))operato
                 keyword(yield) ident(item)
 
 
-keyword(class) ident(PerlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PerlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Perl <http://www.perl.org>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -10531,7 +10531,7 @@ keyword(class) ident(PerlLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content(perl()content(\\d)content(\\.)content(\\d)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))operator(:)
             keyword(return) pre_constant(True)
         keyword(if) string<delimiter(')content(my $)delimiter(')> keyword(in) ident(text)operator(:)
@@ -10539,7 +10539,7 @@ keyword(class) ident(PerlLexer)operator(()ident(RegexLexer)operator(\))operator(
         keyword(return) float(0.1) comment(# who knows, might still be perl!)
 
 
-keyword(class) ident(LuaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(LuaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Lua <http://www.lua.org>`_ source code.)content(
 )content(
@@ -10632,7 +10632,7 @@ keyword(class) ident(LuaLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])
     operator(})
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(func_name_highlighting) operator(=) ident(get_bool_opt)operator(()
             ident(options)operator(,) string<delimiter(')content(func_name_highlighting)delimiter(')>operator(,) pre_constant(True)operator(\))
         pre_constant(self)operator(.)ident(disabled_modules) operator(=) ident(get_list_opt)operator(()ident(options)operator(,) string<delimiter(')content(disabled_modules)delimiter(')>operator(,) operator([)operator(])operator(\))
@@ -10645,7 +10645,7 @@ keyword(class) ident(LuaLexer)operator(()ident(RegexLexer)operator(\))operator(:
                     pre_constant(self)operator(.)ident(_functions)operator(.)ident(update)operator(()ident(func)operator(\))
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(for) ident(index)operator(,) ident(token)operator(,) ident(value) keyword(in) \
             ident(RegexLexer)operator(.)ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
             keyword(if) ident(token) keyword(is) ident(Name)operator(:)
@@ -10661,7 +10661,7 @@ keyword(class) ident(LuaLexer)operator(()ident(RegexLexer)operator(\))operator(:
             keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
 
-keyword(class) ident(MiniDLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MiniDLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `MiniD <http://www.dsource.org/projects/minid>`_ (a D-like scripting)content(
 )content(    language\) source.)content(
@@ -10726,7 +10726,7 @@ keyword(class) ident(MiniDLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(IoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(IoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Io <http://iolanguage.com/>`_ (a small, prototype-based)content(
 )content(    programming language\) source.)content(
@@ -10773,7 +10773,7 @@ keyword(class) ident(IoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     operator(})
 
 
-keyword(class) ident(TclLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(TclLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Tcl source code.)content(
 )content(
@@ -10804,7 +10804,7 @@ keyword(class) ident(TclLexer)operator(()ident(RegexLexer)operator(\))operator(:
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.tcl)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-tcl)delimiter(')>operator(,) string<delimiter(')content(text/x-script.tcl)delimiter(')>operator(,) string<delimiter(')content(application/x-tcl)delimiter(')>operator(])
 
-    keyword(def) ident(_gen_command_rules)operator(()ident(keyword_cmds_re)operator(,) ident(builtin_cmds_re)operator(,) ident(context)operator(=)string<delimiter(")delimiter(")>operator(\))operator(:)
+    keyword(def) method(_gen_command_rules)operator(()ident(keyword_cmds_re)operator(,) ident(builtin_cmds_re)operator(,) ident(context)operator(=)string<delimiter(")delimiter(")>operator(\))operator(:)
         keyword(return) operator([)
             operator(()ident(keyword_cmds_re)operator(,) ident(Keyword)operator(,) string<delimiter(')content(params)delimiter(')> operator(+) ident(context)operator(\))operator(,)
             operator(()ident(builtin_cmds_re)operator(,) ident(Name)operator(.)ident(Builtin)operator(,) string<delimiter(')content(params)delimiter(')> operator(+) ident(context)operator(\))operator(,)
@@ -10898,11 +10898,11 @@ keyword(class) ident(TclLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content((tcl\))delimiter(')>operator(\))
 
 
-keyword(class) ident(ClojureLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ClojureLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for `Clojure <http://clojure.org/>`_ source code.)content(
 )content(
@@ -11060,7 +11060,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(GasLexer)delimi
            string<delimiter(')content(CObjdumpLexer)delimiter(')>operator(,) string<delimiter(')content(LlvmLexer)delimiter(')>operator(,) string<delimiter(')content(NasmLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(GasLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GasLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Gas (AT&T\) assembly code.)content(
 )content(    )delimiter(""")>
@@ -11128,10 +11128,10 @@ keyword(class) ident(GasLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\.)content(\\w)content(+)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
-keyword(class) ident(ObjdumpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ObjdumpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the output of 'objdump -dr')content(
 )content(    )delimiter(""")>
@@ -11140,7 +11140,7 @@ keyword(class) ident(ObjdumpLexer)operator(()ident(RegexLexer)operator(\))operat
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.objdump)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-objdump)delimiter(')>operator(])
 
-    predefined(hex) operator(=) string<modifier(r)delimiter(')content([0-9A-Za-z])delimiter(')>
+    ident(hex) operator(=) string<modifier(r)delimiter(')content([0-9A-Za-z])delimiter(')>
 
     ident(tokens) operator(=) operator({)
         string<delimiter(')content(root)delimiter(')>operator(:) operator([)
@@ -11186,7 +11186,7 @@ keyword(class) ident(ObjdumpLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(DObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(DObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the output of 'objdump -Sr on compiled D files')content(
 )content(    )delimiter(""")>
@@ -11195,11 +11195,11 @@ keyword(class) ident(DObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.d-objdump)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-d-objdump)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(DObjdumpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(DLexer)operator(,) ident(ObjdumpLexer)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(CppObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CppObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the output of 'objdump -Sr on compiled C++ files')content(
 )content(    )delimiter(""")>
@@ -11208,11 +11208,11 @@ keyword(class) ident(CppObjdumpLexer)operator(()ident(DelegatingLexer)operator(\
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.cpp-objdump)delimiter(')>operator(,) string<delimiter(')content(*.c++-objdump)delimiter(')>operator(,) string<delimiter(')content(*.cxx-objdump)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-cpp-objdump)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CppObjdumpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CppLexer)operator(,) ident(ObjdumpLexer)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(CObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the output of 'objdump -Sr on compiled C files')content(
 )content(    )delimiter(""")>
@@ -11221,11 +11221,11 @@ keyword(class) ident(CObjdumpLexer)operator(()ident(DelegatingLexer)operator(\))
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.c-objdump)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-c-objdump)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CObjdumpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CLexer)operator(,) ident(ObjdumpLexer)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(LlvmLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(LlvmLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For LLVM assembly code.)content(
 )content(    )delimiter(""")>
@@ -11299,7 +11299,7 @@ keyword(class) ident(LlvmLexer)operator(()ident(RegexLexer)operator(\))operator(
     operator(})
 
 
-keyword(class) ident(NasmLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(NasmLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Nasm (Intel\) assembly code.)content(
 )content(    )delimiter(""")>
@@ -11319,7 +11319,7 @@ keyword(class) ident(NasmLexer)operator(()ident(RegexLexer)operator(\))operator(
     ident(register) operator(=) operator(()string<modifier(r)delimiter(')content([a-d][lh]|e?[a-d]x|e?[sb]p|e?[sd]i|[c-gs]s|st[0-7]|)delimiter(')>
                 string<modifier(r)delimiter(')content(mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7])delimiter(')>operator(\))
     ident(wordop) operator(=) string<modifier(r)delimiter(')content(seg|wrt|strict)delimiter(')>
-    predefined(type) operator(=) string<modifier(r)delimiter(')content(byte|[dq]?word)delimiter(')>
+    ident(type) operator(=) string<modifier(r)delimiter(')content(byte|[dq]?word)delimiter(')>
     ident(directives) operator(=) operator(()string<modifier(r)delimiter(')content(BITS|USE16|USE32|SECTION|SEGMENT|ABSOLUTE|EXTERN|GLOBAL|)delimiter(')>
                   string<modifier(r)delimiter(')content(COMMON|CPU|GROUP|UPPERCASE|IMPORT|EXPORT|LIBRARY|MODULE)delimiter(')>operator(\))
 
@@ -11401,7 +11401,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(CLexer)delimite
            string<delimiter(')content(GLShaderLexer)delimiter(')>operator(,) string<delimiter(')content(PrologLexer)delimiter(')>operator(,) string<delimiter(')content(CythonLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(CLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For C source code with preprocessor directives.)content(
 )content(    )delimiter(""")>
@@ -11513,14 +11513,14 @@ keyword(class) ident(CLexer)operator(()ident(RegexLexer)operator(\))operator(:)
             string<delimiter(')content(int_fast64_t)delimiter(')>operator(,) string<delimiter(')content(uint_fast8_t)delimiter(')>operator(,) string<delimiter(')content(uint_fast16_t)delimiter(')>operator(,) string<delimiter(')content(uint_fast32_t)delimiter(')>operator(,)
             string<delimiter(')content(uint_fast64_t)delimiter(')>operator(,) string<delimiter(')content(intptr_t)delimiter(')>operator(,) string<delimiter(')content(uintptr_t)delimiter(')>operator(,) string<delimiter(')content(intmax_t)delimiter(')>operator(,) string<delimiter(')content(uintmax_t)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(stdlibhighlighting) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,)
                 string<delimiter(')content(stdlibhighlighting)delimiter(')>operator(,) pre_constant(True)operator(\))
         pre_constant(self)operator(.)ident(c99highlighting) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,)
                 string<delimiter(')content(c99highlighting)delimiter(')>operator(,) pre_constant(True)operator(\))
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(for) ident(index)operator(,) ident(token)operator(,) ident(value) keyword(in) \
             ident(RegexLexer)operator(.)ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
             keyword(if) ident(token) keyword(is) ident(Name)operator(:)
@@ -11530,7 +11530,7 @@ keyword(class) ident(CLexer)operator(()ident(RegexLexer)operator(\))operator(:)
                     ident(token) operator(=) ident(Keyword)operator(.)ident(Type)
             keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
-keyword(class) ident(CppLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CppLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For C++ source code with preprocessor directives.)content(
 )content(    )delimiter(""")>
@@ -11607,7 +11607,7 @@ keyword(class) ident(CppLexer)operator(()ident(RegexLexer)operator(\))operator(:
     operator(})
 
 
-keyword(class) ident(DLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For D source.)content(
 )content(    )delimiter(""")>
@@ -11755,7 +11755,7 @@ keyword(class) ident(DLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     operator(})
 
 
-keyword(class) ident(DelphiLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(DelphiLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Delphi <http://www.borland.com/delphi/>`_ (Borland Object Pascal\),)content(
 )content(    Turbo Pascal and Free Pascal source code.)content(
@@ -12029,7 +12029,7 @@ keyword(class) ident(DelphiLexer)operator(()ident(Lexer)operator(\))operator(:)
         string<delimiter(')content(xlatb)delimiter(')>operator(,) string<delimiter(')content(xor)delimiter(')>
     operator(])operator(\))
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(Lexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
         pre_constant(self)operator(.)ident(keywords) operator(=) predefined(set)operator(()operator(\))
         keyword(if) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(turbopascal)delimiter(')>operator(,) pre_constant(True)operator(\))operator(:)
@@ -12042,7 +12042,7 @@ keyword(class) ident(DelphiLexer)operator(()ident(Lexer)operator(\))operator(:)
         keyword(for) ident(unit) keyword(in) ident(get_list_opt)operator(()ident(options)operator(,) string<delimiter(')content(units)delimiter(')>operator(,) pre_constant(self)operator(.)ident(BUILTIN_UNITS)operator(.)ident(keys)operator(()operator(\))operator(\))operator(:)
             pre_constant(self)operator(.)ident(builtins)operator(.)ident(update)operator(()pre_constant(self)operator(.)ident(BUILTIN_UNITS)operator([)ident(unit)operator(])operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(scanner) operator(=) ident(Scanner)operator(()ident(text)operator(,) ident(re)operator(.)ident(DOTALL) operator(|) ident(re)operator(.)ident(MULTILINE) operator(|) ident(re)operator(.)ident(IGNORECASE)operator(\))
         ident(stack) operator(=) operator([)string<delimiter(')content(initial)delimiter(')>operator(])
         ident(in_function_block) operator(=) pre_constant(False)
@@ -12239,7 +12239,7 @@ keyword(class) ident(DelphiLexer)operator(()ident(Lexer)operator(\))operator(:)
             ident(yield) ident(scanner)operator(.)ident(start_pos)operator(,) ident(token)operator(,) ident(scanner)operator(.)ident(match) keyword(or) string<delimiter(')delimiter(')>
 
 
-keyword(class) ident(JavaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(JavaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Java <http://www.sun.com/java/>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -12296,7 +12296,7 @@ keyword(class) ident(JavaLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(ScalaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ScalaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Scala <http://www.scala-lang.org>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -12396,7 +12396,7 @@ comment(#             Name.Attribute\)\),)
     operator(})
 
 
-keyword(class) ident(DylanLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DylanLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the `Dylan <http://www.opendylan.org/>`_ language.)content(
 )content(
@@ -12441,7 +12441,7 @@ keyword(class) ident(DylanLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(ObjectiveCLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ObjectiveCLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Objective-C source code with preprocessor directives.)content(
 )content(    )delimiter(""")>
@@ -12567,14 +12567,14 @@ keyword(class) ident(ObjectiveCLexer)operator(()ident(RegexLexer)operator(\))ope
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) string<delimiter(')content(@")delimiter(')> keyword(in) ident(text)operator(:) comment(# strings)
             keyword(return) pre_constant(True)
         keyword(if) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(\\[)content([a-zA-Z0-9.]:)delimiter(')>operator(,) ident(text)operator(\))operator(:) comment(# message)
             keyword(return) pre_constant(True)
         keyword(return) pre_constant(False)
 
-keyword(class) ident(FortranLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(FortranLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(''')content(
 )content(    Lexer for FORTRAN 90 code.)content(
 )content(
@@ -12675,7 +12675,7 @@ keyword(class) ident(FortranLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(GLShaderLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GLShaderLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    GLSL (OpenGL Shader\) lexer.)content(
 )content(
@@ -12719,7 +12719,7 @@ keyword(class) ident(GLShaderLexer)operator(()ident(RegexLexer)operator(\))opera
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(PrologLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PrologLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for Prolog files.)content(
 )content(    )delimiter(""")>
@@ -12773,11 +12773,11 @@ keyword(class) ident(PrologLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(:-)delimiter(')> keyword(in) ident(text)
 
 
-keyword(class) ident(CythonLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CythonLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Pyrex and `Cython <http://cython.org>`_ source code.)content(
 )content(
@@ -12965,11 +12965,11 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(CSharpLexer)del
            string<delimiter(')content(VbNetAspxLexer)delimiter(')>operator(])
 
 
-keyword(def) ident(_escape)operator(()ident(st)operator(\))operator(:)
+keyword(def) method(_escape)operator(()ident(st)operator(\))operator(:)
     keyword(return) ident(st)operator(.)ident(replace)operator(()string<modifier(u)delimiter(')char(\\\\)delimiter(')>operator(,) string<modifier(ur)delimiter(')content(\\\\)delimiter(')>operator(\))operator(.)ident(replace)operator(()string<modifier(u)delimiter(')content(-)delimiter(')>operator(,) string<modifier(ur)delimiter(')content(\\-)delimiter(')>operator(\))operator(.)\
            ident(replace)operator(()string<modifier(u)delimiter(')content([)delimiter(')>operator(,) string<modifier(ur)delimiter(')content(\\[)delimiter(')>operator(\))operator(.)ident(replace)operator(()string<modifier(u)delimiter(')content(])delimiter(')>operator(,) string<modifier(ur)delimiter(')content(\\])delimiter(')>operator(\))
 
-keyword(class) ident(CSharpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CSharpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `C# <http://msdn2.microsoft.com/en-us/vcsharp/default.aspx>`_)content(
 )content(    source code.)content(
@@ -13070,7 +13070,7 @@ keyword(class) ident(CSharpLexer)operator(()ident(RegexLexer)operator(\))operato
             operator(])
         operator(})
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         ident(level) operator(=) ident(get_choice_opt)operator(()ident(options)operator(,) string<delimiter(')content(unicodelevel)delimiter(')>operator(,) pre_constant(self)operator(.)ident(tokens)operator(.)ident(keys)operator(()operator(\))operator(,) string<delimiter(')content(basic)delimiter(')>operator(\))
         keyword(if) ident(level) keyword(not) keyword(in) pre_constant(self)operator(.)ident(_all_tokens)operator(:)
             comment(# compile the regexes now)
@@ -13081,7 +13081,7 @@ keyword(class) ident(CSharpLexer)operator(()ident(RegexLexer)operator(\))operato
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(BooLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BooLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Boo <http://boo.codehaus.org/>`_ source code.)content(
 )content(    )delimiter(""")>
@@ -13148,7 +13148,7 @@ keyword(class) ident(BooLexer)operator(()ident(RegexLexer)operator(\))operator(:
     operator(})
 
 
-keyword(class) ident(VbNetLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(VbNetLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For)content(
 )content(    `Visual Basic.NET <http://msdn2.microsoft.com/en-us/vbasic/default.aspx>`_)content(
@@ -13233,7 +13233,7 @@ keyword(class) ident(VbNetLexer)operator(()ident(RegexLexer)operator(\))operator
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(GenericAspxLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GenericAspxLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for ASP.NET pages.)content(
 )content(    )delimiter(""")>
@@ -13256,7 +13256,7 @@ keyword(class) ident(GenericAspxLexer)operator(()ident(RegexLexer)operator(\))op
     operator(})
 
 comment(#TODO support multiple languages within the same source file)
-keyword(class) ident(CSharpAspxLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CSharpAspxLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for highligting C# within ASP.NET pages.)content(
 )content(    )delimiter(""")>
@@ -13266,18 +13266,18 @@ keyword(class) ident(CSharpAspxLexer)operator(()ident(DelegatingLexer)operator(\
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.aspx)delimiter(')>operator(,) string<delimiter(')content(*.asax)delimiter(')>operator(,) string<delimiter(')content(*.ascx)delimiter(')>operator(,) string<delimiter(')content(*.ashx)delimiter(')>operator(,) string<delimiter(')content(*.asmx)delimiter(')>operator(,) string<delimiter(')content(*.axd)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CSharpAspxLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CSharpLexer)operator(,)ident(GenericAspxLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(Page)content(\\s)content(*Language="C#")delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(I)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             keyword(return) float(0.2)
         keyword(elif) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(script[^>]+language=[")content(\\')content(]C#)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(I)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             keyword(return) float(0.15)
         keyword(return) float(0.001) comment(# TODO really only for when filename matched...)
 
-keyword(class) ident(VbNetAspxLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(VbNetAspxLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for highligting Visual Basic.net within ASP.NET pages.)content(
 )content(    )delimiter(""")>
@@ -13287,11 +13287,11 @@ keyword(class) ident(VbNetAspxLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.aspx)delimiter(')>operator(,) string<delimiter(')content(*.asax)delimiter(')>operator(,) string<delimiter(')content(*.ascx)delimiter(')>operator(,) string<delimiter(')content(*.ashx)delimiter(')>operator(,) string<delimiter(')content(*.asmx)delimiter(')>operator(,) string<delimiter(')content(*.axd)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(VbNetAspxLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(VbNetLexer)operator(,)ident(GenericAspxLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(Page)content(\\s)content(*Language="Vb")delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(I)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             keyword(return) float(0.2)
         keyword(elif) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(script[^>]+language=[")content(\\')content(]vb)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(I)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
@@ -13322,7 +13322,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(SchemeLexer)del
            string<delimiter(')content(OcamlLexer)delimiter(')>operator(,) string<delimiter(')content(ErlangLexer)delimiter(')>operator(,) string<delimiter(')content(ErlangShellLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(SchemeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SchemeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A Scheme lexer, parsing a stream and outputting the tokens)content(
 )content(    needed to highlight scheme code.)content(
@@ -13450,7 +13450,7 @@ keyword(class) ident(SchemeLexer)operator(()ident(RegexLexer)operator(\))operato
     operator(})
 
 
-keyword(class) ident(CommonLispLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CommonLispLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A Common Lisp lexer.)content(
 )content(
@@ -13474,7 +13474,7 @@ keyword(class) ident(CommonLispLexer)operator(()ident(RegexLexer)operator(\))ope
     comment(# Take a deep breath...)
     ident(symbol) operator(=) string<modifier(r)delimiter(')content(()content(\\|)content([^|]+)content(\\|)content(|(?:%s\)(?:%s\)*\))delimiter(')> operator(%) operator(()ident(nonmacro)operator(,) ident(constituent)operator(\))
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(lexers)operator(.)ident(_clbuiltins) keyword(import) ident(BUILTIN_FUNCTIONS)operator(,) \
             ident(SPECIAL_FORMS)operator(,) ident(MACROS)operator(,) ident(LAMBDA_LIST_KEYWORDS)operator(,) ident(DECLARATIONS)operator(,) \
             ident(BUILTIN_TYPES)operator(,) ident(BUILTIN_CLASSES)
@@ -13487,7 +13487,7 @@ keyword(class) ident(CommonLispLexer)operator(()ident(RegexLexer)operator(\))ope
         pre_constant(self)operator(.)ident(builtin_classes) operator(=) ident(BUILTIN_CLASSES)
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(stack) operator(=) operator([)string<delimiter(')content(root)delimiter(')>operator(])
         keyword(for) ident(index)operator(,) ident(token)operator(,) ident(value) keyword(in) ident(RegexLexer)operator(.)ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(stack)operator(\))operator(:)
             keyword(if) ident(token) keyword(is) ident(Name)operator(.)ident(Variable)operator(:)
@@ -13626,7 +13626,7 @@ keyword(class) ident(CommonLispLexer)operator(()ident(RegexLexer)operator(\))ope
     operator(})
 
 
-keyword(class) ident(HaskellLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(HaskellLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A Haskell lexer based on the lexemes defined in the Haskell 98 Report.)content(
 )content(
@@ -13749,7 +13749,7 @@ keyword(class) ident(HaskellLexer)operator(()ident(RegexLexer)operator(\))operat
 ident(line_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(.*?)char(\\n)delimiter(')>operator(\))
 ident(bird_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content((>[ )content(\\t)content(]*\)(.*)content(\\n)content(\))delimiter(')>operator(\))
 
-keyword(class) ident(LiterateHaskellLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(LiterateHaskellLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Literate Haskell (Bird-style or LaTeX\) source.)content(
 )content(
@@ -13767,7 +13767,7 @@ keyword(class) ident(LiterateHaskellLexer)operator(()ident(Lexer)operator(\))ope
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.lhs)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-literate-haskell)delimiter(')>operator(])
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(hslexer) operator(=) ident(HaskellLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(style) operator(=) pre_constant(self)operator(.)ident(options)operator(.)ident(get)operator(()string<delimiter(')content(litstyle)delimiter(')>operator(\))
@@ -13815,7 +13815,7 @@ keyword(class) ident(LiterateHaskellLexer)operator(()ident(Lexer)operator(\))ope
             keyword(yield) ident(item)
 
 
-keyword(class) ident(OcamlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(OcamlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the OCaml language.)content(
 )content(
@@ -13907,7 +13907,7 @@ keyword(class) ident(OcamlLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(ErlangLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ErlangLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For the Erlang functional programming language.)content(
 )content(
@@ -14013,7 +14013,7 @@ keyword(class) ident(ErlangLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(})
 
 
-keyword(class) ident(ErlangShellLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(ErlangShellLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Shell sessions in erl (for Erlang code\).)content(
 )content(
@@ -14026,7 +14026,7 @@ keyword(class) ident(ErlangShellLexer)operator(()ident(Lexer)operator(\))operato
 
     ident(_prompt_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(\\d)content(+>(?=)content(\\s)content(|)content(\\Z)content(\))delimiter(')>operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(erlexer) operator(=) ident(ErlangLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(curcode) operator(=) string<delimiter(')delimiter(')>
@@ -14082,7 +14082,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(MuPADLexer)deli
            string<delimiter(')content(SLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(MuPADLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MuPADLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A `MuPAD <http://www.mupad.com>`_ lexer.)content(
 )content(    Contributed by Christopher Creutzig <christopher@creutzig.de>.)content(
@@ -14153,7 +14153,7 @@ keyword(class) ident(MuPADLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(MatlabLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MatlabLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Matlab (or GNU Octave\) source code.)content(
 )content(    Contributed by Ken Schutte <kschutte@csail.mit.edu>.)content(
@@ -14249,7 +14249,7 @@ keyword(class) ident(MatlabLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(re)operator(.)ident(match)operator(()string<delimiter(')content(^)content(\\s)content(*%)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))operator(:) comment(# comment)
             keyword(return) float(0.9)
         keyword(elif) ident(re)operator(.)ident(match)operator(()string<delimiter(')content(^!)content(\\w)content(+)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))operator(:) comment(# system cmd)
@@ -14258,7 +14258,7 @@ keyword(class) ident(MatlabLexer)operator(()ident(RegexLexer)operator(\))operato
 
 ident(line_re)  operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(.*?)char(\\n)delimiter(')>operator(\))
 
-keyword(class) ident(MatlabSessionLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(MatlabSessionLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For Matlab (or GNU Octave\) sessions.  Modeled after PythonConsoleLexer.)content(
 )content(    Contributed by Ken Schutte <kschutte@csail.mit.edu>.)content(
@@ -14268,7 +14268,7 @@ keyword(class) ident(MatlabSessionLexer)operator(()ident(Lexer)operator(\))opera
     ident(name) operator(=) string<delimiter(')content(Matlab session)delimiter(')>
     ident(aliases) operator(=) operator([)string<delimiter(')content(matlabsession)delimiter(')>operator(])
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(mlexer) operator(=) ident(MatlabLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(curcode) operator(=) string<delimiter(')delimiter(')>
@@ -14307,7 +14307,7 @@ keyword(class) ident(MatlabSessionLexer)operator(()ident(Lexer)operator(\))opera
                 keyword(yield) ident(item)
 
 
-keyword(class) ident(NumPyLexer)operator(()ident(PythonLexer)operator(\))operator(:)
+keyword(class) class(NumPyLexer)operator(()ident(PythonLexer)operator(\))operator(:)
     string<delimiter(''')content(
 )content(    A Python lexer recognizing Numerical Python builtins.)content(
 )content(
@@ -14388,7 +14388,7 @@ keyword(class) ident(NumPyLexer)operator(()ident(PythonLexer)operator(\))operato
         string<delimiter(')content(vsplit)delimiter(')>operator(,) string<delimiter(')content(vstack)delimiter(')>operator(,) string<delimiter(')content(weibull)delimiter(')>operator(,) string<delimiter(')content(where)delimiter(')>operator(,) string<delimiter(')content(who)delimiter(')>operator(,) string<delimiter(')content(zeros)delimiter(')>operator(,) string<delimiter(')content(zeros_like)delimiter(')>
     operator(])operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(for) ident(index)operator(,) ident(token)operator(,) ident(value) keyword(in) \
                 ident(PythonLexer)operator(.)ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
             keyword(if) ident(token) keyword(is) ident(Name) keyword(and) ident(value) keyword(in) pre_constant(self)operator(.)ident(EXTRA_KEYWORDS)operator(:)
@@ -14397,7 +14397,7 @@ keyword(class) ident(NumPyLexer)operator(()ident(PythonLexer)operator(\))operato
                 keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
 
-keyword(class) ident(SLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For S, S-plus, and R source code.)content(
 )content(
@@ -14466,7 +14466,7 @@ keyword(class) ident(SLexer)operator(()ident(RegexLexer)operator(\))operator(:)
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(<-)delimiter(')> keyword(in) ident(text)
 comment(# -*- coding: utf-8 -*-)
 string<delimiter(""")content(
@@ -14498,7 +14498,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(SqlLexer)delimi
 ident(line_re)  operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content(.*?)char(\\n)delimiter(')>operator(\))
 
 
-keyword(class) ident(SqlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SqlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for Structured Query Language. Currently, this lexer does)content(
 )content(    not recognize any special syntax except ANSI SQL.)content(
@@ -14611,7 +14611,7 @@ keyword(class) ident(SqlLexer)operator(()ident(RegexLexer)operator(\))operator(:
     operator(})
 
 
-keyword(class) ident(MySqlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MySqlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Special lexer for MySQL.)content(
 )content(    )delimiter(""")>
@@ -14685,7 +14685,7 @@ keyword(class) ident(MySqlLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(SqliteConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(SqliteConsoleLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for example sessions using sqlite3.)content(
 )content(
@@ -14697,7 +14697,7 @@ keyword(class) ident(SqliteConsoleLexer)operator(()ident(Lexer)operator(\))opera
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.sqlite3-console)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-sqlite3-console)delimiter(')>operator(])
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(data)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(data)operator(\))operator(:)
         ident(sql) operator(=) ident(SqlLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(curcode) operator(=) string<delimiter(')delimiter(')>
@@ -14725,7 +14725,7 @@ keyword(class) ident(SqliteConsoleLexer)operator(()ident(Lexer)operator(\))opera
                 keyword(yield) ident(item)
 
 
-keyword(class) ident(BrainfuckLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BrainfuckLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for the esoteric `BrainFuck <http://www.muppetlabs.com/~breadbox/bf/>`_)content(
 )content(    language.)content(
@@ -14757,7 +14757,7 @@ keyword(class) ident(BrainfuckLexer)operator(()ident(RegexLexer)operator(\))oper
     operator(})
 
 
-keyword(class) ident(BefungeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BefungeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for the esoteric `Befunge <http://en.wikipedia.org/wiki/Befunge>`_)content(
 )content(    language.)content(
@@ -14788,7 +14788,7 @@ keyword(class) ident(BefungeLexer)operator(()ident(RegexLexer)operator(\))operat
 
 
 
-keyword(class) ident(BashLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BashLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for (ba\)sh shell scripts.)content(
 )content(
@@ -14861,11 +14861,11 @@ keyword(class) ident(BashLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(shebang_matches)operator(()ident(text)operator(,) string<modifier(r)delimiter(')content((ba|z|\)sh)delimiter(')>operator(\))
 
 
-keyword(class) ident(BashSessionLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(BashSessionLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for simplistic shell sessions.)content(
 )content(
@@ -14877,7 +14877,7 @@ keyword(class) ident(BashSessionLexer)operator(()ident(Lexer)operator(\))operato
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.sh-session)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/x-shell-session)delimiter(')>operator(])
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(bashlexer) operator(=) ident(BashLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
 
         ident(pos) operator(=) integer(0)
@@ -14916,7 +14916,7 @@ keyword(class) ident(BashSessionLexer)operator(()ident(Lexer)operator(\))operato
                 keyword(yield) ident(pos)operator(+)ident(i)operator(,) ident(t)operator(,) ident(v)
 
 
-keyword(class) ident(BatchLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BatchLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for the DOS/Windows Batch file format.)content(
 )content(
@@ -14972,7 +14972,7 @@ keyword(class) ident(BatchLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(RedcodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(RedcodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A simple Redcode lexer based on ICWS'94.)content(
 )content(    Contributed by Adam Blinkinsop <blinks@acm.org>.)content(
@@ -15008,7 +15008,7 @@ keyword(class) ident(RedcodeLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(MOOCodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MOOCodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `MOOCode <http://www.moo.mud.org/>`_ (the MOO scripting)content(
 )content(    language\).)content(
@@ -15051,7 +15051,7 @@ keyword(class) ident(MOOCodeLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(SmalltalkLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SmalltalkLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Smalltalk <http://www.smalltalk.org/>`_ syntax.)content(
 )content(    Contributed by Stefan Matthias Aust.)content(
@@ -15173,7 +15173,7 @@ keyword(class) ident(SmalltalkLexer)operator(()ident(RegexLexer)operator(\))oper
     operator(})
 
 
-keyword(class) ident(TcshLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(TcshLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for tcsh scripts.)content(
 )content(
@@ -15240,7 +15240,7 @@ keyword(class) ident(TcshLexer)operator(()ident(RegexLexer)operator(\))operator(
     operator(})
 
 
-keyword(class) ident(LogtalkLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(LogtalkLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Logtalk <http://logtalk.org/>`_ source code.)content(
 )content(
@@ -15439,14 +15439,14 @@ keyword(class) ident(LogtalkLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(def) ident(_shortened)operator(()ident(word)operator(\))operator(:)
+keyword(def) method(_shortened)operator(()ident(word)operator(\))operator(:)
     ident(dpos) operator(=) ident(word)operator(.)ident(find)operator(()string<delimiter(')content($)delimiter(')>operator(\))
     keyword(return) string<delimiter(')content(|)delimiter(')>operator(.)ident(join)operator(()operator([)ident(word)operator([)operator(:)ident(dpos)operator(]) operator(+) ident(word)operator([)ident(dpos)operator(+)integer(1)operator(:)ident(i)operator(]) operator(+) string<modifier(r)delimiter(')content(\\b)delimiter(')>
                      keyword(for) ident(i) keyword(in) predefined(range)operator(()predefined(len)operator(()ident(word)operator(\))operator(,) ident(dpos)operator(,) operator(-)integer(1)operator(\))operator(])operator(\))
-keyword(def) ident(_shortened_many)operator(()operator(*)ident(words)operator(\))operator(:)
+keyword(def) method(_shortened_many)operator(()operator(*)ident(words)operator(\))operator(:)
     keyword(return) string<delimiter(')content(|)delimiter(')>operator(.)ident(join)operator(()predefined(map)operator(()ident(_shortened)operator(,) ident(words)operator(\))operator(\))
 
-keyword(class) ident(GnuplotLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GnuplotLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Gnuplot <http://gnuplot.info/>`_ plotting scripts.)content(
 )content(
@@ -15605,7 +15605,7 @@ keyword(class) ident(GnuplotLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(PovrayLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PovrayLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Persistence of Vision Raytracer <http://www.povray.org/>`_ files.)content(
 )content(
@@ -15691,7 +15691,7 @@ keyword(class) ident(PovrayLexer)operator(()ident(RegexLexer)operator(\))operato
     operator(})
 
 
-keyword(class) ident(AppleScriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(AppleScriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `AppleScript source code)content(
 )content(    <http://developer.apple.com/documentation/AppleScript/)content(
@@ -16011,7 +16011,7 @@ keyword(class) ident(AppleScriptLexer)operator(()ident(RegexLexer)operator(\))op
     operator(})
 
 
-keyword(class) ident(ModelicaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ModelicaLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `Modelica <http://www.modelica.org/>`_ source code.)content(
 )content(
@@ -16090,7 +16090,7 @@ keyword(class) ident(ModelicaLexer)operator(()ident(RegexLexer)operator(\))opera
     operator(})
 
 
-keyword(class) ident(RebolLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(RebolLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A `REBOL <http://www.rebol.com/>`_ lexer.)content(
 )content(
@@ -16107,7 +16107,7 @@ keyword(class) ident(RebolLexer)operator(()ident(RegexLexer)operator(\))operator
 
     ident(escape_re) operator(=) string<modifier(r)delimiter(')content((?:)content(\\^)content(\\()content([0-9a-fA-F]{1,4})content(\\\))content(*\))delimiter(')>
 
-    keyword(def) ident(word_callback)operator(()ident(lexer)operator(,) ident(match)operator(\))operator(:)
+    keyword(def) method(word_callback)operator(()ident(lexer)operator(,) ident(match)operator(\))operator(:)
         ident(word) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
 
         keyword(if) ident(re)operator(.)ident(match)operator(()string<delimiter(")content(.*:$)delimiter(")>operator(,) ident(word)operator(\))operator(:)
@@ -16303,7 +16303,7 @@ keyword(class) ident(RebolLexer)operator(()ident(RegexLexer)operator(\))operator
     operator(})
 
 
-keyword(class) ident(ABAPLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ABAPLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for ABAP, SAP's integrated language.)content(
 )content(
@@ -16525,7 +16525,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(RagelLexer)deli
            string<delimiter(')content(AntlrCSharpLexer)delimiter(')>operator(,) string<delimiter(')content(AntlrObjectiveCLexer)delimiter(')>operator(,)
            string<delimiter(')content(AntlrJavaLexer)delimiter(')>operator(,) string<delimiter(")content(AntlrActionScriptLexer)delimiter(")>operator(])
 
-keyword(class) ident(RagelLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(RagelLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A pure `Ragel <http://www.complang.org/ragel/>`_ lexer.  Use this for)content(
 )content(    fragments of Ragel.  For ``.rl`` files, use RagelEmbeddedLexer instead)content(
@@ -16617,7 +16617,7 @@ keyword(class) ident(RagelLexer)operator(()ident(RegexLexer)operator(\))operator
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(RagelEmbeddedLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(RagelEmbeddedLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ embedded in a host language file.)content(
 )content(
@@ -16696,10 +16696,10 @@ keyword(class) ident(RagelEmbeddedLexer)operator(()ident(RegexLexer)operator(\))
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: indep)delimiter(')> keyword(in) ident(text) keyword(or) float(0.1)
 
-keyword(class) ident(RagelRubyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelRubyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in a Ruby host file.)content(
 )content(
@@ -16710,14 +16710,14 @@ keyword(class) ident(RagelRubyLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-ruby)delimiter(')>operator(,) string<delimiter(')content(ragel-rb)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelRubyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(RubyLexer)operator(,) ident(RagelEmbeddedLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: ruby)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(RagelCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in a C host file.)content(
 )content(
@@ -16728,14 +16728,14 @@ keyword(class) ident(RagelCLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-c)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelCLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CLexer)operator(,) ident(RagelEmbeddedLexer)operator(,)
                                           operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: c)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(RagelDLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelDLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in a D host file.)content(
 )content(
@@ -16746,13 +16746,13 @@ keyword(class) ident(RagelDLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-d)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelDLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(DLexer)operator(,) ident(RagelEmbeddedLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: d)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(RagelCppLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelCppLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in a CPP host file.)content(
 )content(
@@ -16763,13 +16763,13 @@ keyword(class) ident(RagelCppLexer)operator(()ident(DelegatingLexer)operator(\))
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-cpp)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelCppLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CppLexer)operator(,) ident(RagelEmbeddedLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: c++)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(RagelObjectiveCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelObjectiveCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in an Objective C host file.)content(
 )content(
@@ -16780,15 +16780,15 @@ keyword(class) ident(RagelObjectiveCLexer)operator(()ident(DelegatingLexer)opera
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-objc)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelObjectiveCLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(ObjectiveCLexer)operator(,)
                                                    ident(RagelEmbeddedLexer)operator(,)
                                                    operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: objc)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(RagelJavaLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RagelJavaLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer for `Ragel`_ in a Java host file.)content(
 )content(
@@ -16799,14 +16799,14 @@ keyword(class) ident(RagelJavaLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(ragel-java)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.rl)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RagelJavaLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavaLexer)operator(,) ident(RagelEmbeddedLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) string<delimiter(')content(@LANG: java)delimiter(')> keyword(in) ident(text)
 
-keyword(class) ident(AntlrLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(AntlrLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `ANTLR`_ Lexer.)content(
 )content(    Should not be called directly, instead)content(
@@ -17018,7 +17018,7 @@ comment(#)
 comment(#    def analyse_text(text\):)
 comment(#        return re.match(r'^\\s*language\\s*=\\s*C\\s*;', text\))
 
-keyword(class) ident(AntlrCppLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrCppLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with CPP Target)content(
 )content(
@@ -17029,13 +17029,13 @@ keyword(class) ident(AntlrCppLexer)operator(()ident(DelegatingLexer)operator(\))
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-cpp)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrCppLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CppLexer)operator(,) ident(AntlrLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*C)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
-keyword(class) ident(AntlrObjectiveCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrObjectiveCLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with Objective-C Target)content(
 )content(
@@ -17046,14 +17046,14 @@ keyword(class) ident(AntlrObjectiveCLexer)operator(()ident(DelegatingLexer)opera
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-objc)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrObjectiveCLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(ObjectiveCLexer)operator(,)
                                                    ident(AntlrLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*ObjC)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(\))
 
-keyword(class) ident(AntlrCSharpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrCSharpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with C# Target)content(
 )content(
@@ -17064,14 +17064,14 @@ keyword(class) ident(AntlrCSharpLexer)operator(()ident(DelegatingLexer)operator(
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-csharp)delimiter(')>operator(,) string<delimiter(')content(antlr-c#)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrCSharpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CSharpLexer)operator(,) ident(AntlrLexer)operator(,)
                                                operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*CSharp2)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
-keyword(class) ident(AntlrPythonLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrPythonLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with Python Target)content(
 )content(
@@ -17082,15 +17082,15 @@ keyword(class) ident(AntlrPythonLexer)operator(()ident(DelegatingLexer)operator(
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-python)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrPythonLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(PythonLexer)operator(,) ident(AntlrLexer)operator(,)
                                                operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*Python)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
 
-keyword(class) ident(AntlrJavaLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrJavaLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with Java Target)content(
 )content(
@@ -17101,15 +17101,15 @@ keyword(class) ident(AntlrJavaLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-java)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrJavaLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavaLexer)operator(,) ident(AntlrLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) float(0.5) comment(# Antlr is Java if not specified)
 
 
-keyword(class) ident(AntlrRubyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrRubyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with Ruby Target)content(
 )content(
@@ -17120,14 +17120,14 @@ keyword(class) ident(AntlrRubyLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-ruby)delimiter(')>operator(,) string<delimiter(')content(antlr-rb)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrRubyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(RubyLexer)operator(,) ident(AntlrLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*Ruby)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
-keyword(class) ident(AntlrPerlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrPerlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with Perl Target)content(
 )content(
@@ -17138,14 +17138,14 @@ keyword(class) ident(AntlrPerlLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-perl)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrPerlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(PerlLexer)operator(,) ident(AntlrLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*Perl5)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 
-keyword(class) ident(AntlrActionScriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(AntlrActionScriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    `ANTLR`_ with ActionScript Target)content(
 )content(
@@ -17156,11 +17156,11 @@ keyword(class) ident(AntlrActionScriptLexer)operator(()ident(DelegatingLexer)ope
     ident(aliases) operator(=) operator([)string<delimiter(')content(antlr-as)delimiter(')>operator(,) string<delimiter(')content(antlr-actionscript)delimiter(')>operator(])
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.G)delimiter(')>operator(,) string<delimiter(')content(*.g)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(AntlrActionScriptLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(ActionScriptLexer)operator(,)
                                                      ident(AntlrLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*language)content(\\s)content(*=)content(\\s)content(*ActionScript)content(\\s)content(*;)delimiter(')>operator(,) ident(text)operator(,) ident(re)operator(.)ident(M)operator(\))
 comment(# -*- coding: utf-8 -*-)
 string<delimiter(""")content(
@@ -17184,7 +17184,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(get_ch
 ident(__all__) operator(=) operator([)string<delimiter(')content(TextLexer)delimiter(')>operator(,) string<delimiter(')content(RawTokenLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(TextLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(TextLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    "Null" lexer, doesn't highlight anything.)content(
 )content(    )delimiter(""")>
@@ -17193,7 +17193,7 @@ keyword(class) ident(TextLexer)operator(()ident(Lexer)operator(\))operator(:)
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.txt)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/plain)delimiter(')>operator(])
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(yield) integer(0)operator(,) ident(Text)operator(,) ident(text)
 
 
@@ -17201,7 +17201,7 @@ ident(_ttype_cache) operator(=) operator({)operator(})
 
 ident(line_re) operator(=) ident(re)operator(.)ident(compile)operator(()ident(b)operator(()string<delimiter(')content(.*?)char(\\n)delimiter(')>operator(\))operator(\))
 
-keyword(class) ident(RawTokenLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(RawTokenLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Recreate a token stream formatted with the `RawTokenFormatter`.  This)content(
 )content(    lexer raises exceptions during parsing if the token stream in the)content(
@@ -17218,12 +17218,12 @@ keyword(class) ident(RawTokenLexer)operator(()ident(Lexer)operator(\))operator(:
     ident(filenames) operator(=) operator([)operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/x-pygments-tokens)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(compress) operator(=) ident(get_choice_opt)operator(()ident(options)operator(,) string<delimiter(')content(compress)delimiter(')>operator(,)
                                        operator([)string<delimiter(')delimiter(')>operator(,) string<delimiter(')content(none)delimiter(')>operator(,) string<delimiter(')content(gz)delimiter(')>operator(,) string<delimiter(')content(bz2)delimiter(')>operator(])operator(,) string<delimiter(')delimiter(')>operator(\))
         ident(Lexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(if) predefined(isinstance)operator(()ident(text)operator(,) predefined(unicode)operator(\))operator(:)
             comment(# raw token stream never has any non-ASCII characters)
             ident(text) operator(=) ident(text)operator(.)ident(encode)operator(()string<delimiter(')content(ascii)delimiter(')>operator(\))
@@ -17241,7 +17241,7 @@ keyword(class) ident(RawTokenLexer)operator(()ident(Lexer)operator(\))operator(:
         keyword(for) ident(i)operator(,) ident(t)operator(,) ident(v) keyword(in) pre_constant(self)operator(.)ident(get_tokens_unprocessed)operator(()ident(text)operator(\))operator(:)
             keyword(yield) ident(t)operator(,) ident(v)
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(length) operator(=) integer(0)
         keyword(for) ident(match) keyword(in) ident(line_re)operator(.)ident(finditer)operator(()ident(text)operator(\))operator(:)
             keyword(try)operator(:)
@@ -17305,7 +17305,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(HtmlPhpLexer)de
            string<delimiter(')content(EvoqueLexer)delimiter(')>operator(,) string<delimiter(')content(EvoqueHtmlLexer)delimiter(')>operator(,) string<delimiter(')content(EvoqueXmlLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(ErbLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(ErbLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `ERB <http://ruby-doc.org/core/classes/ERB.html>`_ (Ruby Templating\))content(
 )content(    lexer.)content(
@@ -17322,12 +17322,12 @@ keyword(class) ident(ErbLexer)operator(()ident(Lexer)operator(\))operator(:)
 
     ident(_block_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content((<%%|%%>|<%=|<%#|<%-|<%|-%>|%>|^%[^%].*?$\))delimiter(')>operator(,) ident(re)operator(.)ident(M)operator(\))
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(lexers)operator(.)ident(agile) keyword(import) ident(RubyLexer)
         pre_constant(self)operator(.)ident(ruby_lexer) operator(=) ident(RubyLexer)operator(()operator(**)ident(options)operator(\))
         ident(Lexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Since ERB doesn't allow "<%" and other tags inside of ruby)content(
 )content(        blocks we have to use a split approach here that fails for)content(
@@ -17395,12 +17395,12 @@ keyword(class) ident(ErbLexer)operator(()ident(Lexer)operator(\))operator(:)
         keyword(except) exception(IndexError)operator(:)
             keyword(return)
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) string<delimiter(')content(<%)delimiter(')> keyword(in) ident(text) keyword(and) string<delimiter(')content(%>)delimiter(')> keyword(in) ident(text)operator(:)
             keyword(return) float(0.4)
 
 
-keyword(class) ident(SmartyLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SmartyLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `Smarty <http://smarty.php.net/>`_ template lexer.)content(
 )content(
@@ -17442,7 +17442,7 @@ keyword(class) ident(SmartyLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) float(0.0)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<delimiter(')content(\\{)content(if)content(\\s)content(+.*?)content(\\})content(.*?)content(\\{)content(/if)content(\\})delimiter(')>operator(,) ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.15)
@@ -17455,7 +17455,7 @@ keyword(class) ident(SmartyLexer)operator(()ident(RegexLexer)operator(\))operato
         keyword(return) ident(rv)
 
 
-keyword(class) ident(DjangoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DjangoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `django <http://www.djangoproject.com/documentation/templates/>`_)content(
 )content(    and `jinja <http://wsgiarea.pocoo.org/jinja/>`_ template lexer.)content(
@@ -17526,7 +17526,7 @@ keyword(class) ident(DjangoLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) float(0.0)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(\\{)content(%)content(\\s)content(*(block|extends\))delimiter(')>operator(,) ident(text)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             ident(rv) operator(+=) float(0.4)
@@ -17537,7 +17537,7 @@ keyword(class) ident(DjangoLexer)operator(()ident(RegexLexer)operator(\))operato
         keyword(return) ident(rv)
 
 
-keyword(class) ident(MyghtyLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MyghtyLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `myghty templates`_ lexer. Code that isn't Myghty)content(
 )content(    markup is yielded as `Token.Other`.)content(
@@ -17585,7 +17585,7 @@ keyword(class) ident(MyghtyLexer)operator(()ident(RegexLexer)operator(\))operato
     operator(})
 
 
-keyword(class) ident(MyghtyHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MyghtyHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MyghtyLexer` that highlights unlexer data)content(
 )content(    with the `HtmlLexer`.)content(
@@ -17597,12 +17597,12 @@ keyword(class) ident(MyghtyHtmlLexer)operator(()ident(DelegatingLexer)operator(\
     ident(aliases) operator(=) operator([)string<delimiter(')content(html+myghty)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+myghty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MyghtyHtmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(MyghtyLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(MyghtyXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MyghtyXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MyghtyLexer` that highlights unlexer data)content(
 )content(    with the `XmlLexer`.)content(
@@ -17614,12 +17614,12 @@ keyword(class) ident(MyghtyXmlLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(xml+myghty)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+myghty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MyghtyXmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(MyghtyLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(MyghtyJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MyghtyJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MyghtyLexer` that highlights unlexer data)content(
 )content(    with the `JavascriptLexer`.)content(
@@ -17633,12 +17633,12 @@ keyword(class) ident(MyghtyJavascriptLexer)operator(()ident(DelegatingLexer)oper
                  string<delimiter(')content(text/x-javascript+myghty)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+mygthy)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MyghtyJavascriptLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,)
                                                     ident(MyghtyLexer)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(MyghtyCssLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MyghtyCssLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MyghtyLexer` that highlights unlexer data)content(
 )content(    with the `CssLexer`.)content(
@@ -17650,12 +17650,12 @@ keyword(class) ident(MyghtyCssLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(aliases) operator(=) operator([)string<delimiter(')content(css+myghty)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+myghty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MyghtyCssLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(MyghtyLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(MakoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MakoLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `mako templates`_ lexer. Code that isn't Mako)content(
 )content(    markup is yielded as `Token.Other`.)content(
@@ -17731,7 +17731,7 @@ keyword(class) ident(MakoLexer)operator(()ident(RegexLexer)operator(\))operator(
     operator(})
 
 
-keyword(class) ident(MakoHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MakoHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MakoLexer` that highlights unlexed data)content(
 )content(    with the `HtmlLexer`.)content(
@@ -17743,11 +17743,11 @@ keyword(class) ident(MakoHtmlLexer)operator(()ident(DelegatingLexer)operator(\))
     ident(aliases) operator(=) operator([)string<delimiter(')content(html+mako)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+mako)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MakoHtmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(MakoLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-keyword(class) ident(MakoXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MakoXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MakoLexer` that highlights unlexer data)content(
 )content(    with the `XmlLexer`.)content(
@@ -17759,11 +17759,11 @@ keyword(class) ident(MakoXmlLexer)operator(()ident(DelegatingLexer)operator(\))o
     ident(aliases) operator(=) operator([)string<delimiter(')content(xml+mako)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+mako)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MakoXmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(MakoLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-keyword(class) ident(MakoJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MakoJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MakoLexer` that highlights unlexer data)content(
 )content(    with the `JavascriptLexer`.)content(
@@ -17777,11 +17777,11 @@ keyword(class) ident(MakoJavascriptLexer)operator(()ident(DelegatingLexer)operat
                  string<delimiter(')content(text/x-javascript+mako)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+mako)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MakoJavascriptLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,)
                                                     ident(MakoLexer)operator(,) operator(**)ident(options)operator(\))
 
-keyword(class) ident(MakoCssLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(MakoCssLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `MakoLexer` that highlights unlexer data)content(
 )content(    with the `CssLexer`.)content(
@@ -17793,19 +17793,19 @@ keyword(class) ident(MakoCssLexer)operator(()ident(DelegatingLexer)operator(\))o
     ident(aliases) operator(=) operator([)string<delimiter(')content(css+mako)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+mako)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(MakoCssLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(MakoLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
 
 comment(# Genshi and Cheetah lexers courtesy of Matt Good.)
 
-keyword(class) ident(CheetahPythonLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(CheetahPythonLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for handling Cheetah's special $ tokens in Python syntax.)content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(pylexer) operator(=) ident(PythonLexer)operator(()operator(**)pre_constant(self)operator(.)ident(options)operator(\))
         keyword(for) ident(pos)operator(,) ident(type_)operator(,) ident(value) keyword(in) ident(pylexer)operator(.)ident(get_tokens_unprocessed)operator(()ident(text)operator(\))operator(:)
             keyword(if) ident(type_) operator(==) ident(Token)operator(.)ident(Error) keyword(and) ident(value) operator(==) string<delimiter(')content($)delimiter(')>operator(:)
@@ -17813,7 +17813,7 @@ keyword(class) ident(CheetahPythonLexer)operator(()ident(Lexer)operator(\))opera
             keyword(yield) ident(pos)operator(,) ident(type_)operator(,) ident(value)
 
 
-keyword(class) ident(CheetahLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CheetahLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic `cheetah templates`_ lexer. Code that isn't Cheetah)content(
 )content(    markup is yielded as `Token.Other`.  This also works for)content(
@@ -17857,7 +17857,7 @@ keyword(class) ident(CheetahLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(CheetahHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CheetahHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `CheetahLexer` that highlights unlexer data)content(
 )content(    with the `HtmlLexer`.)content(
@@ -17867,12 +17867,12 @@ keyword(class) ident(CheetahHtmlLexer)operator(()ident(DelegatingLexer)operator(
     ident(aliases) operator(=) operator([)string<delimiter(')content(html+cheetah)delimiter(')>operator(,) string<delimiter(')content(html+spitfire)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+cheetah)delimiter(')>operator(,) string<delimiter(')content(text/html+spitfire)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CheetahHtmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(CheetahLexer)operator(,)
                                                operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(CheetahXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CheetahXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `CheetahLexer` that highlights unlexer data)content(
 )content(    with the `XmlLexer`.)content(
@@ -17882,12 +17882,12 @@ keyword(class) ident(CheetahXmlLexer)operator(()ident(DelegatingLexer)operator(\
     ident(aliases) operator(=) operator([)string<delimiter(')content(xml+cheetah)delimiter(')>operator(,) string<delimiter(')content(xml+spitfire)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+cheetah)delimiter(')>operator(,) string<delimiter(')content(application/xml+spitfire)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CheetahXmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(CheetahLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(CheetahJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CheetahJavascriptLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `CheetahLexer` that highlights unlexer data)content(
 )content(    with the `JavascriptLexer`.)content(
@@ -17903,12 +17903,12 @@ keyword(class) ident(CheetahJavascriptLexer)operator(()ident(DelegatingLexer)ope
                  string<delimiter(')content(text/x-javascript+spitfire)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+spitfire)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CheetahJavascriptLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,)
                                                      ident(CheetahLexer)operator(,) operator(**)ident(options)operator(\))
 
 
-keyword(class) ident(GenshiTextLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GenshiTextLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ text)content(
 )content(    templates.)content(
@@ -17943,7 +17943,7 @@ keyword(class) ident(GenshiTextLexer)operator(()ident(RegexLexer)operator(\))ope
     operator(})
 
 
-keyword(class) ident(GenshiMarkupLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GenshiMarkupLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Base lexer for Genshi markup, used by `HtmlGenshiLexer` and)content(
 )content(    `GenshiLexer`.)content(
@@ -18007,7 +18007,7 @@ keyword(class) ident(GenshiMarkupLexer)operator(()ident(RegexLexer)operator(\))o
     operator(})
 
 
-keyword(class) ident(HtmlGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(HtmlGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and)content(
 )content(    `kid <http://kid-templating.org/>`_ kid HTML templates.)content(
@@ -18018,11 +18018,11 @@ keyword(class) ident(HtmlGenshiLexer)operator(()ident(DelegatingLexer)operator(\
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(,) string<delimiter(')content(*.htm)delimiter(')>operator(,) string<delimiter(')content(*.xhtml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+genshi)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(HtmlGenshiLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(GenshiMarkupLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) float(0.0)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<delimiter(')content(\\$)content(\\{)content(.*?)content(\\})delimiter(')>operator(,) ident(text)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             ident(rv) operator(+=) float(0.2)
@@ -18031,7 +18031,7 @@ keyword(class) ident(HtmlGenshiLexer)operator(()ident(DelegatingLexer)operator(\
         keyword(return) ident(rv) operator(+) ident(HtmlLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
 
 
-keyword(class) ident(GenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(GenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights `genshi <http://genshi.edgewall.org/>`_ and)content(
 )content(    `kid <http://kid-templating.org/>`_ kid XML templates.)content(
@@ -18043,11 +18043,11 @@ keyword(class) ident(GenshiLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/x-genshi)delimiter(')>operator(,) string<delimiter(')content(application/x-kid)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(GenshiLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(GenshiMarkupLexer)operator(,)
                                           operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) float(0.0)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<delimiter(')content(\\$)content(\\{)content(.*?)content(\\})delimiter(')>operator(,) ident(text)operator(\)) keyword(is) keyword(not) pre_constant(None)operator(:)
             ident(rv) operator(+=) float(0.2)
@@ -18056,7 +18056,7 @@ keyword(class) ident(GenshiLexer)operator(()ident(DelegatingLexer)operator(\))op
         keyword(return) ident(rv) operator(+) ident(XmlLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
 
 
-keyword(class) ident(JavascriptGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JavascriptGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights javascript code in genshi text templates.)content(
 )content(    )delimiter(""")>
@@ -18069,16 +18069,16 @@ keyword(class) ident(JavascriptGenshiLexer)operator(()ident(DelegatingLexer)oper
                  string<delimiter(')content(text/x-javascript+genshi)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+genshi)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JavascriptGenshiLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,)
                                                     ident(GenshiTextLexer)operator(,)
                                                     operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(GenshiLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(CssGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CssGenshiLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights CSS definitions in genshi text templates.)content(
 )content(    )delimiter(""")>
@@ -18088,15 +18088,15 @@ keyword(class) ident(CssGenshiLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.css)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+genshi)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CssGenshiLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(GenshiTextLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(GenshiLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(RhtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(RhtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the ERB lexer that highlights the unlexed data with the)content(
 )content(    html lexer.)content(
@@ -18110,10 +18110,10 @@ keyword(class) ident(RhtmlLexer)operator(()ident(DelegatingLexer)operator(\))ope
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(,) string<delimiter(')content(*.htm)delimiter(')>operator(,) string<delimiter(')content(*.xhtml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+ruby)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(RhtmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(ErbLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(ErbLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
             comment(# one more than the XmlErbLexer returns)
@@ -18121,7 +18121,7 @@ keyword(class) ident(RhtmlLexer)operator(()ident(DelegatingLexer)operator(\))ope
         keyword(return) ident(rv)
 
 
-keyword(class) ident(XmlErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(XmlErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `ErbLexer` which highlights data outside preprocessor)content(
 )content(    directives with the `XmlLexer`.)content(
@@ -18132,17 +18132,17 @@ keyword(class) ident(XmlErbLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+ruby)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(XmlErbLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(ErbLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(ErbLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.4)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(CssErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CssErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `ErbLexer` which highlights unlexed data with the `CssLexer`.)content(
 )content(    )delimiter(""")>
@@ -18152,14 +18152,14 @@ keyword(class) ident(CssErbLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.css)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+ruby)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CssErbLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(ErbLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(ErbLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(JavascriptErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JavascriptErbLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `ErbLexer` which highlights unlexed data with the)content(
 )content(    `JavascriptLexer`.)content(
@@ -18172,15 +18172,15 @@ keyword(class) ident(JavascriptErbLexer)operator(()ident(DelegatingLexer)operato
                  string<delimiter(')content(text/x-javascript+ruby)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+ruby)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JavascriptErbLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,) ident(ErbLexer)operator(,)
                                                  operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(ErbLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(HtmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(HtmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `PhpLexer` that highlights unhandled data with the `HtmlLexer`.)content(
 )content(
@@ -18196,17 +18196,17 @@ keyword(class) ident(HtmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))o
                  string<delimiter(')content(application/x-httpd-php)delimiter(')>operator(,) string<delimiter(')content(application/x-httpd-php3)delimiter(')>operator(,)
                  string<delimiter(')content(application/x-httpd-php4)delimiter(')>operator(,) string<delimiter(')content(application/x-httpd-php5)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(HtmlPhpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(PhpLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(PhpLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.5)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(XmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(XmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `PhpLexer` that higlights unhandled data with the `XmlLexer`.)content(
 )content(    )delimiter(""")>
@@ -18216,17 +18216,17 @@ keyword(class) ident(XmlPhpLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(,) string<delimiter(')content(*.php)delimiter(')>operator(,) string<delimiter(')content(*.php[345])delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+php)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(XmlPhpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(PhpLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(PhpLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.4)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(CssPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CssPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `PhpLexer` which highlights unmatched data with the `CssLexer`.)content(
 )content(    )delimiter(""")>
@@ -18236,14 +18236,14 @@ keyword(class) ident(CssPhpLexer)operator(()ident(DelegatingLexer)operator(\))op
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.css)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+php)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CssPhpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(PhpLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(PhpLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(JavascriptPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JavascriptPhpLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of `PhpLexer` which highlights unmatched data with the)content(
 )content(    `JavascriptLexer`.)content(
@@ -18256,15 +18256,15 @@ keyword(class) ident(JavascriptPhpLexer)operator(()ident(DelegatingLexer)operato
                  string<delimiter(')content(text/x-javascript+php)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+php)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JavascriptPhpLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,) ident(PhpLexer)operator(,)
                                                  operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(PhpLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\))
 
 
-keyword(class) ident(HtmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(HtmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `SmartyLexer` that highighlights unlexed data with the)content(
 )content(    `HtmlLexer`.)content(
@@ -18277,17 +18277,17 @@ keyword(class) ident(HtmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(,) string<delimiter(')content(*.htm)delimiter(')>operator(,) string<delimiter(')content(*.xhtml)delimiter(')>operator(,) string<delimiter(')content(*.tpl)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+smarty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(HtmlSmartyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(SmartyLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(SmartyLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.5)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(XmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(XmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `SmartyLexer` that highlights unlexed data with the)content(
 )content(    `XmlLexer`.)content(
@@ -18298,17 +18298,17 @@ keyword(class) ident(XmlSmartyLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(,) string<delimiter(')content(*.tpl)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+smarty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(XmlSmartyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(SmartyLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(SmartyLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.4)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(CssSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CssSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `SmartyLexer` that highlights unlexed data with the)content(
 )content(    `CssLexer`.)content(
@@ -18319,14 +18319,14 @@ keyword(class) ident(CssSmartyLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.css)delimiter(')>operator(,) string<delimiter(')content(*.tpl)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+smarty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CssSmartyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(SmartyLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(SmartyLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(JavascriptSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JavascriptSmartyLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `SmartyLexer` that highlights unlexed data with the)content(
 )content(    `JavascriptLexer`.)content(
@@ -18339,15 +18339,15 @@ keyword(class) ident(JavascriptSmartyLexer)operator(()ident(DelegatingLexer)oper
                  string<delimiter(')content(text/x-javascript+smarty)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+smarty)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JavascriptSmartyLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,) ident(SmartyLexer)operator(,)
                                                     operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(SmartyLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(HtmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(HtmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `DjangoLexer` that highighlights unlexed data with the)content(
 )content(    `HtmlLexer`.)content(
@@ -18360,17 +18360,17 @@ keyword(class) ident(HtmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(,) string<delimiter(')content(*.htm)delimiter(')>operator(,) string<delimiter(')content(*.xhtml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+django)delimiter(')>operator(,) string<delimiter(')content(text/html+jinja)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(HtmlDjangoLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(DjangoLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(DjangoLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.5)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(XmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(XmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `DjangoLexer` that highlights unlexed data with the)content(
 )content(    `XmlLexer`.)content(
@@ -18381,17 +18381,17 @@ keyword(class) ident(XmlDjangoLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+django)delimiter(')>operator(,) string<delimiter(')content(application/xml+jinja)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(XmlDjangoLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(DjangoLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(DjangoLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.4)
         keyword(return) ident(rv)
 
 
-keyword(class) ident(CssDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(CssDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `DjangoLexer` that highlights unlexed data with the)content(
 )content(    `CssLexer`.)content(
@@ -18402,14 +18402,14 @@ keyword(class) ident(CssDjangoLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(alias_filenames) operator(=) operator([)string<delimiter(')content(*.css)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/css+django)delimiter(')>operator(,) string<delimiter(')content(text/css+jinja)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(CssDjangoLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(CssLexer)operator(,) ident(DjangoLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(DjangoLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(JavascriptDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JavascriptDjangoLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `DjangoLexer` that highlights unlexed data with the)content(
 )content(    `JavascriptLexer`.)content(
@@ -18426,15 +18426,15 @@ keyword(class) ident(JavascriptDjangoLexer)operator(()ident(DelegatingLexer)oper
                  string<delimiter(')content(text/javascript+django)delimiter(')>operator(,)
                  string<delimiter(')content(text/javascript+jinja)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JavascriptDjangoLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(JavascriptLexer)operator(,) ident(DjangoLexer)operator(,)
                                                     operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) ident(DjangoLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.05)
 
 
-keyword(class) ident(JspRootLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(JspRootLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Base for the `JspLexer`. Yields `Token.Other` for area outside of)content(
 )content(    JSP tags.)content(
@@ -18459,7 +18459,7 @@ keyword(class) ident(JspRootLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(JspLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(JspLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for Java Server Pages.)content(
 )content(
@@ -18470,10 +18470,10 @@ keyword(class) ident(JspLexer)operator(()ident(DelegatingLexer)operator(\))opera
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.jsp)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/x-jsp)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(JspLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(JspRootLexer)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(JavaLexer)operator(.)ident(analyse_text)operator(()ident(text)operator(\)) operator(-) float(0.01)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.4)
@@ -18482,7 +18482,7 @@ keyword(class) ident(JspLexer)operator(()ident(DelegatingLexer)operator(\))opera
         keyword(return) ident(rv)
 
 
-keyword(class) ident(EvoqueLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(EvoqueLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For files using the Evoque templating system.)content(
 )content(
@@ -18534,7 +18534,7 @@ keyword(class) ident(EvoqueLexer)operator(()ident(RegexLexer)operator(\))operato
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(EvoqueHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(EvoqueHtmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `EvoqueLexer` that highlights unlexed data with the)content(
 )content(    `HtmlLexer`.)content(
@@ -18546,11 +18546,11 @@ keyword(class) ident(EvoqueHtmlLexer)operator(()ident(DelegatingLexer)operator(\
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.html)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/html+evoque)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(EvoqueHtmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(HtmlLexer)operator(,) ident(EvoqueLexer)operator(,)
                                               operator(**)ident(options)operator(\))
 
-keyword(class) ident(EvoqueXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
+keyword(class) class(EvoqueXmlLexer)operator(()ident(DelegatingLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Subclass of the `EvoqueLexer` that highlights unlexed data with the)content(
 )content(    `XmlLexer`.)content(
@@ -18562,7 +18562,7 @@ keyword(class) ident(EvoqueXmlLexer)operator(()ident(DelegatingLexer)operator(\)
     ident(filenames) operator(=) operator([)string<delimiter(')content(*.xml)delimiter(')>operator(])
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(application/xml+evoque)delimiter(')>operator(])
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         predefined(super)operator(()ident(EvoqueXmlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()ident(XmlLexer)operator(,) ident(EvoqueLexer)operator(,)
                                              operator(**)ident(options)operator(\))
 comment(# -*- coding: utf-8 -*-)
@@ -18598,7 +18598,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(IniLexer)delimi
            string<delimiter(')content(LighttpdConfLexer)delimiter(')>operator(,) string<delimiter(')content(NginxConfLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(IniLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(IniLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for configuration files in INI style.)content(
 )content(    )delimiter(""")>
@@ -18618,14 +18618,14 @@ keyword(class) ident(IniLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(npos) operator(=) ident(text)operator(.)ident(find)operator(()string<delimiter(')char(\\n)delimiter(')>operator(\))
         keyword(if) ident(npos) operator(<) integer(3)operator(:)
             keyword(return) pre_constant(False)
         keyword(return) ident(text)operator([)integer(0)operator(]) operator(==) string<delimiter(')content([)delimiter(')> keyword(and) ident(text)operator([)ident(npos)operator(-)integer(1)operator(]) operator(==) string<delimiter(')content(])delimiter(')>
 
 
-keyword(class) ident(SourcesListLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SourcesListLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer that highlights debian sources.list files.)content(
 )content(
@@ -18666,7 +18666,7 @@ keyword(class) ident(SourcesListLexer)operator(()ident(RegexLexer)operator(\))op
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(for) ident(line) keyword(in) ident(text)operator(.)ident(split)operator(()string<delimiter(')char(\\n)delimiter(')>operator(\))operator(:)
             ident(line) operator(=) ident(line)operator(.)ident(strip)operator(()operator(\))
             keyword(if) keyword(not) operator(()ident(line)operator(.)ident(startswith)operator(()string<delimiter(')content(#)delimiter(')>operator(\)) keyword(or) ident(line)operator(.)ident(startswith)operator(()string<delimiter(')content(deb )delimiter(')>operator(\)) keyword(or)
@@ -18675,7 +18675,7 @@ keyword(class) ident(SourcesListLexer)operator(()ident(RegexLexer)operator(\))op
         keyword(return) pre_constant(True)
 
 
-keyword(class) ident(MakefileLexer)operator(()ident(Lexer)operator(\))operator(:)
+keyword(class) class(MakefileLexer)operator(()ident(Lexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for BSD and GNU make extensions (lenient enough to handle both in)content(
 )content(    the same file even\).)content(
@@ -18695,7 +18695,7 @@ keyword(class) ident(MakefileLexer)operator(()ident(Lexer)operator(\))operator(:
         string<modifier(r)delimiter(')content(\\s)content(*(ifeq|ifneq|ifdef|ifndef|else|endif|-?include|define|endef|:\)\)(?=)content(\\s)content(\))delimiter(')>operator(\))
     ident(r_comment) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(^)content(\\s)content(*@?#)delimiter(')>operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(ins) operator(=) operator([)operator(])
         ident(lines) operator(=) ident(text)operator(.)ident(splitlines)operator(()pre_constant(True)operator(\))
         ident(done) operator(=) string<delimiter(')delimiter(')>
@@ -18713,7 +18713,7 @@ keyword(class) ident(MakefileLexer)operator(()ident(Lexer)operator(\))operator(:
             keyword(yield) ident(item)
 
 
-keyword(class) ident(BaseMakefileLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BaseMakefileLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for simple Makefiles (no preprocessing\).)content(
 )content(
@@ -18761,7 +18761,7 @@ keyword(class) ident(BaseMakefileLexer)operator(()ident(RegexLexer)operator(\))o
     operator(})
 
 
-keyword(class) ident(DiffLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DiffLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for unified or context-style diffs or patches.)content(
 )content(    )delimiter(""")>
@@ -18784,7 +18784,7 @@ keyword(class) ident(DiffLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(text)operator([)operator(:)integer(7)operator(]) operator(==) string<delimiter(')content(Index: )delimiter(')>operator(:)
             keyword(return) pre_constant(True)
         keyword(if) ident(text)operator([)operator(:)integer(5)operator(]) operator(==) string<delimiter(')content(diff )delimiter(')>operator(:)
@@ -18796,7 +18796,7 @@ keyword(class) ident(DiffLexer)operator(()ident(RegexLexer)operator(\))operator(
 ident(DPATCH_KEYWORDS) operator(=) operator([)string<delimiter(')content(hunk)delimiter(')>operator(,) string<delimiter(')content(addfile)delimiter(')>operator(,) string<delimiter(')content(adddir)delimiter(')>operator(,) string<delimiter(')content(rmfile)delimiter(')>operator(,) string<delimiter(')content(rmdir)delimiter(')>operator(,) string<delimiter(')content(move)delimiter(')>operator(,)
     string<delimiter(')content(replace)delimiter(')>operator(])
 
-keyword(class) ident(DarcsPatchLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DarcsPatchLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    DarcsPatchLexer is a lexer for the various versions of the darcs patch)content(
 )content(    format.  Examples of this format are derived by commands such as)content(
@@ -18850,7 +18850,7 @@ keyword(class) ident(DarcsPatchLexer)operator(()ident(RegexLexer)operator(\))ope
     operator(})
 
 
-keyword(class) ident(IrcLogsLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(IrcLogsLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for IRC logs in *irssi*, *xchat* or *weechat* style.)content(
 )content(    )delimiter(""")>
@@ -18911,7 +18911,7 @@ keyword(class) ident(IrcLogsLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(BBCodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(BBCodeLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A lexer that highlights BBCode(-like\) syntax.)content(
 )content(
@@ -18933,7 +18933,7 @@ keyword(class) ident(BBCodeLexer)operator(()ident(RegexLexer)operator(\))operato
     operator(})
 
 
-keyword(class) ident(TexLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(TexLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for the TeX and LaTeX typesetting languages.)content(
 )content(    )delimiter(""")>
@@ -18983,14 +18983,14 @@ keyword(class) ident(TexLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(for) ident(start) keyword(in) operator(()string<delimiter(")char(\\\\)content(documentclass)delimiter(")>operator(,) string<delimiter(")char(\\\\)content(input)delimiter(")>operator(,) string<delimiter(")char(\\\\)content(documentstyle)delimiter(")>operator(,)
                       string<delimiter(")char(\\\\)content(relax)delimiter(")>operator(\))operator(:)
             keyword(if) ident(text)operator([)operator(:)predefined(len)operator(()ident(start)operator(\))operator(]) operator(==) ident(start)operator(:)
                 keyword(return) pre_constant(True)
 
 
-keyword(class) ident(GroffLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GroffLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for the (g\)roff typesetting language, supporting groff)content(
 )content(    extensions. Mainly useful for highlighting manpage sources.)content(
@@ -19034,7 +19034,7 @@ keyword(class) ident(GroffLexer)operator(()ident(RegexLexer)operator(\))operator
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(text)operator([)operator(:)integer(1)operator(]) operator(!=) string<delimiter(')content(.)delimiter(')>operator(:)
             keyword(return) pre_constant(False)
         keyword(if) ident(text)operator([)operator(:)integer(3)operator(]) operator(==) string<delimiter(')content(.)char(\\\\)content(")delimiter(')>operator(:)
@@ -19045,7 +19045,7 @@ keyword(class) ident(GroffLexer)operator(()ident(RegexLexer)operator(\))operator
             keyword(return) float(0.9)
 
 
-keyword(class) ident(ApacheConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ApacheConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for configuration files following the Apache config file)content(
 )content(    format.)content(
@@ -19085,7 +19085,7 @@ keyword(class) ident(ApacheConfLexer)operator(()ident(RegexLexer)operator(\))ope
     operator(})
 
 
-keyword(class) ident(MoinWikiLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MoinWikiLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For MoinMoin (and Trac\) Wiki markup.)content(
 )content(
@@ -19130,7 +19130,7 @@ keyword(class) ident(MoinWikiLexer)operator(()ident(RegexLexer)operator(\))opera
     operator(})
 
 
-keyword(class) ident(RstLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(RstLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `reStructuredText <http://docutils.sf.net/rst.html>`_ markup.)content(
 )content(
@@ -19149,7 +19149,7 @@ keyword(class) ident(RstLexer)operator(()ident(RegexLexer)operator(\))operator(:
     ident(mimetypes) operator(=) operator([)string<delimiter(")content(text/x-rst)delimiter(")>operator(,) string<delimiter(")content(text/prs.fallenstein.rst)delimiter(")>operator(])
     ident(flags) operator(=) ident(re)operator(.)ident(MULTILINE)
 
-    keyword(def) ident(_handle_sourcecode)operator(()pre_constant(self)operator(,) ident(match)operator(\))operator(:)
+    keyword(def) method(_handle_sourcecode)operator(()pre_constant(self)operator(,) ident(match)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(get_lexer_by_name)
         keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(ClassNotFound)
 
@@ -19264,11 +19264,11 @@ keyword(class) ident(RstLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])
     operator(})
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(handlecodeblocks) operator(=) ident(get_bool_opt)operator(()ident(options)operator(,) string<delimiter(')content(handlecodeblocks)delimiter(')>operator(,) pre_constant(True)operator(\))
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(text)operator([)operator(:)integer(2)operator(]) operator(==) string<delimiter(')content(..)delimiter(')> keyword(and) ident(text)operator([)integer(2)operator(:)integer(3)operator(]) operator(!=) string<delimiter(')content(.)delimiter(')>operator(:)
             keyword(return) float(0.3)
         ident(p1) operator(=) ident(text)operator(.)ident(find)operator(()string<delimiter(")char(\\n)delimiter(")>operator(\))
@@ -19280,7 +19280,7 @@ keyword(class) ident(RstLexer)operator(()ident(RegexLexer)operator(\))operator(:
             keyword(return) float(0.5)
 
 
-keyword(class) ident(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for VimL script files.)content(
 )content(
@@ -19314,7 +19314,7 @@ keyword(class) ident(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:
             operator(()string<modifier(r)delimiter(')content(.)delimiter(')>operator(,) ident(Text)operator(\))operator(,)
         operator(])operator(,)
     operator(})
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(lexers)operator(.)ident(_vimbuiltins) keyword(import) ident(command)operator(,) ident(option)operator(,) ident(auto)
         pre_constant(self)operator(.)ident(_cmd) operator(=) ident(command)
         pre_constant(self)operator(.)ident(_opt) operator(=) ident(option)
@@ -19322,7 +19322,7 @@ keyword(class) ident(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:
 
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(is_in)operator(()pre_constant(self)operator(,) ident(w)operator(,) ident(mapping)operator(\))operator(:)
+    keyword(def) method(is_in)operator(()pre_constant(self)operator(,) ident(w)operator(,) ident(mapping)operator(\))operator(:)
         string<modifier(r)delimiter(""")content(
 )content(        It's kind of difficult to decide if something might be a keyword)content(
 )content(        in VimL because it allows you to abbreviate them.  In fact,)content(
@@ -19344,7 +19344,7 @@ keyword(class) ident(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:
                    ident(mapping)operator([)ident(p)operator(])operator([)integer(1)operator(])operator([)operator(:)predefined(len)operator(()ident(w)operator(\))operator(]) operator(==) ident(w)
         keyword(return) pre_constant(False)
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         comment(# TODO: builtins are only subsequent tokens on lines)
         comment(#       and 'keywords' only happen at the beginning except)
         comment(#       for :au ones)
@@ -19362,7 +19362,7 @@ keyword(class) ident(VimLexer)operator(()ident(RegexLexer)operator(\))operator(:
                 keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
 
-keyword(class) ident(GettextLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(GettextLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for Gettext catalog files.)content(
 )content(
@@ -19390,7 +19390,7 @@ keyword(class) ident(GettextLexer)operator(()ident(RegexLexer)operator(\))operat
     operator(})
 
 
-keyword(class) ident(SquidConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(SquidConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for `squid <http://www.squid-cache.org/>`_ configuration files.)content(
 )content(
@@ -19497,7 +19497,7 @@ keyword(class) ident(SquidConfLexer)operator(()ident(RegexLexer)operator(\))oper
 
     ident(ip_re) operator(=) string<modifier(r)delimiter(')content(\\b)content((?:)content(\\d)content({1,3})content(\\.)content(\){3})content(\\d)content({1,3})content(\\b)delimiter(')>
 
-    keyword(def) ident(makelistre)operator(()predefined(list)operator(\))operator(:)
+    keyword(def) method(makelistre)operator(()predefined(list)operator(\))operator(:)
         keyword(return) string<modifier(r)delimiter(')content(\\b)content((?:)delimiter(')>operator(+)string<delimiter(')content(|)delimiter(')>operator(.)ident(join)operator(()predefined(list)operator(\))operator(+)string<modifier(r)delimiter(')content(\))content(\\b)delimiter(')>
 
     ident(tokens) operator(=) operator({)
@@ -19522,7 +19522,7 @@ keyword(class) ident(SquidConfLexer)operator(()ident(RegexLexer)operator(\))oper
     operator(})
 
 
-keyword(class) ident(DebianControlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(DebianControlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for Debian ``control`` files and ``apt-cache show <pkg>`` outputs.)content(
 )content(
@@ -19578,10 +19578,10 @@ keyword(class) ident(DebianControlLexer)operator(()ident(RegexLexer)operator(\))
     operator(})
 
 
-keyword(class) ident(YamlLexerContext)operator(()ident(LexerContext)operator(\))operator(:)
+keyword(class) class(YamlLexerContext)operator(()ident(LexerContext)operator(\))operator(:)
     string<delimiter(""")content(Indentation context for the YAML lexer.)delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))operator(:)
         predefined(super)operator(()ident(YamlLexerContext)operator(,) pre_constant(self)operator(\))operator(.)ident(__init__)operator(()operator(*)ident(args)operator(,) operator(**)ident(kwds)operator(\))
         pre_constant(self)operator(.)ident(indent_stack) operator(=) operator([)operator(])
         pre_constant(self)operator(.)ident(indent) operator(=) operator(-)integer(1)
@@ -19589,7 +19589,7 @@ keyword(class) ident(YamlLexerContext)operator(()ident(LexerContext)operator(\))
         pre_constant(self)operator(.)ident(block_scalar_indent) operator(=) pre_constant(None)
 
 
-keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))operator(:)
+keyword(class) class(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for `YAML <http://yaml.org/>`_, a human-friendly data serialization)content(
 )content(    language.)content(
@@ -19603,9 +19603,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
     ident(mimetypes) operator(=) operator([)string<delimiter(')content(text/x-yaml)delimiter(')>operator(])
 
 
-    keyword(def) ident(something)operator(()ident(token_class)operator(\))operator(:)
+    keyword(def) method(something)operator(()ident(token_class)operator(\))operator(:)
         string<delimiter(""")content(Do not produce empty tokens.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             keyword(if) keyword(not) ident(text)operator(:)
                 keyword(return)
@@ -19613,9 +19613,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(reset_indent)operator(()ident(token_class)operator(\))operator(:)
+    keyword(def) method(reset_indent)operator(()ident(token_class)operator(\))operator(:)
         string<delimiter(""")content(Reset the indentation levels.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             ident(context)operator(.)ident(indent_stack) operator(=) operator([)operator(])
             ident(context)operator(.)ident(indent) operator(=) operator(-)integer(1)
@@ -19625,9 +19625,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(save_indent)operator(()ident(token_class)operator(,) ident(start)operator(=)pre_constant(False)operator(\))operator(:)
+    keyword(def) method(save_indent)operator(()ident(token_class)operator(,) ident(start)operator(=)pre_constant(False)operator(\))operator(:)
         string<delimiter(""")content(Save a possible indentation level.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             ident(extra) operator(=) string<delimiter(')delimiter(')>
             keyword(if) ident(start)operator(:)
@@ -19647,9 +19647,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(set_indent)operator(()ident(token_class)operator(,) ident(implicit)operator(=)pre_constant(False)operator(\))operator(:)
+    keyword(def) method(set_indent)operator(()ident(token_class)operator(,) ident(implicit)operator(=)pre_constant(False)operator(\))operator(:)
         string<delimiter(""")content(Set the previously saved indentation level.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             keyword(if) ident(context)operator(.)ident(indent) operator(<) ident(context)operator(.)ident(next_indent)operator(:)
                 ident(context)operator(.)ident(indent_stack)operator(.)ident(append)operator(()ident(context)operator(.)ident(indent)operator(\))
@@ -19660,9 +19660,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(set_block_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
+    keyword(def) method(set_block_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
         string<delimiter(""")content(Set an explicit indentation level for a block scalar.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             ident(context)operator(.)ident(block_scalar_indent) operator(=) pre_constant(None)
             keyword(if) keyword(not) ident(text)operator(:)
@@ -19677,9 +19677,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
                 ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(parse_block_scalar_empty_line)operator(()ident(indent_token_class)operator(,) ident(content_token_class)operator(\))operator(:)
+    keyword(def) method(parse_block_scalar_empty_line)operator(()ident(indent_token_class)operator(,) ident(content_token_class)operator(\))operator(:)
         string<delimiter(""")content(Process an empty line in a block scalar.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             keyword(if) operator(()ident(context)operator(.)ident(block_scalar_indent) keyword(is) pre_constant(None) keyword(or)
                     predefined(len)operator(()ident(text)operator(\)) operator(<=) ident(context)operator(.)ident(block_scalar_indent)operator(\))operator(:)
@@ -19694,9 +19694,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
             ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(parse_block_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
+    keyword(def) method(parse_block_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
         string<delimiter(""")content(Process indentation spaces in a block scalar.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             keyword(if) ident(context)operator(.)ident(block_scalar_indent) keyword(is) pre_constant(None)operator(:)
                 keyword(if) predefined(len)operator(()ident(text)operator(\)) operator(<=) predefined(max)operator(()ident(context)operator(.)ident(indent)operator(,) integer(0)operator(\))operator(:)
@@ -19714,9 +19714,9 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
                 ident(context)operator(.)ident(pos) operator(=) ident(match)operator(.)ident(end)operator(()operator(\))
         keyword(return) ident(callback)
 
-    keyword(def) ident(parse_plain_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
+    keyword(def) method(parse_plain_scalar_indent)operator(()ident(token_class)operator(\))operator(:)
         string<delimiter(""")content(Process indentation spaces in a plain scalar.)delimiter(""")>
-        keyword(def) ident(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
+        keyword(def) method(callback)operator(()ident(lexer)operator(,) ident(match)operator(,) ident(context)operator(\))operator(:)
             ident(text) operator(=) ident(match)operator(.)ident(group)operator(()operator(\))
             keyword(if) predefined(len)operator(()ident(text)operator(\)) operator(<=) ident(context)operator(.)ident(indent)operator(:)
                 ident(context)operator(.)ident(stack)operator(.)ident(pop)operator(()operator(\))
@@ -19984,13 +19984,13 @@ keyword(class) ident(YamlLexer)operator(()ident(ExtendedRegexLexer)operator(\))o
 
     operator(})
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(=)pre_constant(None)operator(,) ident(context)operator(=)pre_constant(None)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(=)pre_constant(None)operator(,) ident(context)operator(=)pre_constant(None)operator(\))operator(:)
         keyword(if) ident(context) keyword(is) pre_constant(None)operator(:)
             ident(context) operator(=) ident(YamlLexerContext)operator(()ident(text)operator(,) integer(0)operator(\))
         keyword(return) predefined(super)operator(()ident(YamlLexer)operator(,) pre_constant(self)operator(\))operator(.)ident(get_tokens_unprocessed)operator(()ident(text)operator(,) ident(context)operator(\))
 
 
-keyword(class) ident(LighttpdConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(LighttpdConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for `Lighttpd <http://lighttpd.net/>`_ configuration files.)content(
 )content(
@@ -20018,7 +20018,7 @@ keyword(class) ident(LighttpdConfLexer)operator(()ident(RegexLexer)operator(\))o
     operator(})
 
 
-keyword(class) ident(NginxConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(NginxConfLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Lexer for `Nginx <http://nginx.net/>`_ configuration files.)content(
 )content(
@@ -20090,7 +20090,7 @@ ident(__all__) operator(=) operator([)string<delimiter(')content(HtmlLexer)delim
            string<delimiter(')content(MxmlLexer)delimiter(')>operator(])
 
 
-keyword(class) ident(JavascriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(JavascriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For JavaScript source code.)content(
 )content(    )delimiter(""")>
@@ -20131,7 +20131,7 @@ keyword(class) ident(JavascriptLexer)operator(()ident(RegexLexer)operator(\))ope
     operator(})
 
 
-keyword(class) ident(ActionScriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ActionScriptLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For ActionScript source code.)content(
 )content(
@@ -20214,11 +20214,11 @@ keyword(class) ident(ActionScriptLexer)operator(()ident(RegexLexer)operator(\))o
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(return) float(0.05)
 
 
-keyword(class) ident(ActionScript3Lexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(ActionScript3Lexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For ActionScript 3 source code.)content(
 )content(
@@ -20292,12 +20292,12 @@ keyword(class) ident(ActionScript3Lexer)operator(()ident(RegexLexer)operator(\))
         operator(])
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(re)operator(.)ident(match)operator(()string<modifier(r)delimiter(')content(\\w)content(+)content(\\s)content(*:)content(\\s)content(*)content(\\w)delimiter(')>operator(,) ident(text)operator(\))operator(:) keyword(return) float(0.3)
         keyword(return) float(0.1)
 
 
-keyword(class) ident(CssLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(CssLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For CSS (Cascading Style Sheets\).)content(
 )content(    )delimiter(""")>
@@ -20434,7 +20434,7 @@ keyword(class) ident(CssLexer)operator(()ident(RegexLexer)operator(\))operator(:
     operator(})
 
 
-keyword(class) ident(HtmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(HtmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For HTML 4 and XHTML 1 markup. Nested JavaScript and CSS is highlighted)content(
 )content(    by the appropriate lexer.)content(
@@ -20485,12 +20485,12 @@ keyword(class) ident(HtmlLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
             keyword(return) float(0.5)
 
 
-keyword(class) ident(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For `PHP <http://www.php.net/>`_ source code.)content(
 )content(    For PHP embedded in HTML, use the `HtmlPhpLexer`.)content(
@@ -20598,7 +20598,7 @@ keyword(class) ident(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))operator(:)
         pre_constant(self)operator(.)ident(funcnamehighlighting) operator(=) ident(get_bool_opt)operator(()
             ident(options)operator(,) string<delimiter(')content(funcnamehighlighting)delimiter(')>operator(,) pre_constant(True)operator(\))
         pre_constant(self)operator(.)ident(disabledmodules) operator(=) ident(get_list_opt)operator(()
@@ -20618,7 +20618,7 @@ keyword(class) ident(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:
                     pre_constant(self)operator(.)ident(_functions)operator(.)ident(update)operator(()ident(value)operator(\))
         ident(RegexLexer)operator(.)ident(__init__)operator(()pre_constant(self)operator(,) operator(**)ident(options)operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         ident(stack) operator(=) operator([)string<delimiter(')content(root)delimiter(')>operator(])
         keyword(if) pre_constant(self)operator(.)ident(startinline)operator(:)
             ident(stack)operator(.)ident(append)operator(()string<delimiter(')content(php)delimiter(')>operator(\))
@@ -20630,7 +20630,7 @@ keyword(class) ident(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:
                     keyword(continue)
             keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) float(0.0)
         keyword(if) ident(re)operator(.)ident(search)operator(()string<modifier(r)delimiter(')content(<)content(\\?)content((?!xml\))delimiter(')>operator(,) ident(text)operator(\))operator(:)
             ident(rv) operator(+=) float(0.3)
@@ -20639,7 +20639,7 @@ keyword(class) ident(PhpLexer)operator(()ident(RegexLexer)operator(\))operator(:
         keyword(return) ident(rv)
 
 
-keyword(class) ident(XmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(XmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Generic lexer for XML (eXtensible Markup Language\).)content(
 )content(    )delimiter(""")>
@@ -20682,12 +20682,12 @@ keyword(class) ident(XmlLexer)operator(()ident(RegexLexer)operator(\))operator(:
         operator(])operator(,)
     operator(})
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
             keyword(return) float(0.5)
 
 
-keyword(class) ident(XsltLexer)operator(()ident(XmlLexer)operator(\))operator(:)
+keyword(class) class(XsltLexer)operator(()ident(XmlLexer)operator(\))operator(:)
     string<delimiter(''')content(
 )content(    A lexer for XSLT.)content(
 )content(
@@ -20709,7 +20709,7 @@ keyword(class) ident(XsltLexer)operator(()ident(XmlLexer)operator(\))operator(:)
         string<delimiter(')content(value-of)delimiter(')>operator(,) string<delimiter(')content(variable)delimiter(')>operator(,) string<delimiter(')content(when)delimiter(')>operator(,) string<delimiter(')content(with-param)delimiter(')>
     operator(])operator(\))
 
-    keyword(def) ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
+    keyword(def) method(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
         keyword(for) ident(index)operator(,) ident(token)operator(,) ident(value) keyword(in) ident(XmlLexer)operator(.)ident(get_tokens_unprocessed)operator(()pre_constant(self)operator(,) ident(text)operator(\))operator(:)
             ident(m) operator(=) ident(re)operator(.)ident(match)operator(()string<delimiter(')content(</?xsl:([^>]*\)/?>?)delimiter(')>operator(,) ident(value)operator(\))
 
@@ -20718,13 +20718,13 @@ keyword(class) ident(XsltLexer)operator(()ident(XmlLexer)operator(\))operator(:)
             keyword(else)operator(:)
                 keyword(yield) ident(index)operator(,) ident(token)operator(,) ident(value)
 
-    keyword(def) ident(analyse_text)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(analyse_text)operator(()ident(text)operator(\))operator(:)
         keyword(if) ident(looks_like_xml)operator(()ident(text)operator(\)) keyword(and) string<delimiter(')content(<xsl)delimiter(')> keyword(in) ident(text)operator(:)
             keyword(return) float(0.8)
 
 
 
-keyword(class) ident(MxmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(MxmlLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    For MXML markup.)content(
 )content(    Nested AS3 in <script> tags is highlighted by the appropriate lexer.)content(
@@ -20812,28 +20812,28 @@ ident(STYLE_ENTRY_POINT) operator(=) string<delimiter(')content(pygments.styles)
 ident(FILTER_ENTRY_POINT) operator(=) string<delimiter(')content(pygments.filters)delimiter(')>
 
 
-keyword(def) ident(find_plugin_lexers)operator(()operator(\))operator(:)
+keyword(def) method(find_plugin_lexers)operator(()operator(\))operator(:)
     keyword(if) ident(pkg_resources) keyword(is) pre_constant(None)operator(:)
         keyword(return)
     keyword(for) ident(entrypoint) keyword(in) ident(pkg_resources)operator(.)ident(iter_entry_points)operator(()ident(LEXER_ENTRY_POINT)operator(\))operator(:)
         keyword(yield) ident(entrypoint)operator(.)ident(load)operator(()operator(\))
 
 
-keyword(def) ident(find_plugin_formatters)operator(()operator(\))operator(:)
+keyword(def) method(find_plugin_formatters)operator(()operator(\))operator(:)
     keyword(if) ident(pkg_resources) keyword(is) pre_constant(None)operator(:)
         keyword(return)
     keyword(for) ident(entrypoint) keyword(in) ident(pkg_resources)operator(.)ident(iter_entry_points)operator(()ident(FORMATTER_ENTRY_POINT)operator(\))operator(:)
         keyword(yield) ident(entrypoint)operator(.)ident(name)operator(,) ident(entrypoint)operator(.)ident(load)operator(()operator(\))
 
 
-keyword(def) ident(find_plugin_styles)operator(()operator(\))operator(:)
+keyword(def) method(find_plugin_styles)operator(()operator(\))operator(:)
     keyword(if) ident(pkg_resources) keyword(is) pre_constant(None)operator(:)
         keyword(return)
     keyword(for) ident(entrypoint) keyword(in) ident(pkg_resources)operator(.)ident(iter_entry_points)operator(()ident(STYLE_ENTRY_POINT)operator(\))operator(:)
         keyword(yield) ident(entrypoint)operator(.)ident(name)operator(,) ident(entrypoint)operator(.)ident(load)operator(()operator(\))
 
 
-keyword(def) ident(find_plugin_filters)operator(()operator(\))operator(:)
+keyword(def) method(find_plugin_filters)operator(()operator(\))operator(:)
     keyword(if) ident(pkg_resources) keyword(is) pre_constant(None)operator(:)
         keyword(return)
     keyword(for) ident(entrypoint) keyword(in) ident(pkg_resources)operator(.)ident(iter_entry_points)operator(()ident(FILTER_ENTRY_POINT)operator(\))operator(:)
@@ -20858,14 +20858,14 @@ string<delimiter(""")content(
 keyword(import) ident(re)
 
 
-keyword(class) ident(EndOfText)operator(()exception(RuntimeError)operator(\))operator(:)
+keyword(class) class(EndOfText)operator(()exception(RuntimeError)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Raise if end of text is reached and the user)content(
 )content(    tried to call a match function.)content(
 )content(    )delimiter(""")>
 
 
-keyword(class) ident(Scanner)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(Scanner)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Simple scanner)content(
 )content(
@@ -20873,7 +20873,7 @@ keyword(class) ident(Scanner)operator(()predefined(object)operator(\))operator(:
 )content(    compiled expressions!\))content(
 )content(    )delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(flags)operator(=)integer(0)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(text)operator(,) ident(flags)operator(=)integer(0)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        :param text:    The text which should be scanned)content(
 )content(        :param flags:   default regular expression flags)content(
@@ -20887,12 +20887,12 @@ keyword(class) ident(Scanner)operator(()predefined(object)operator(\))operator(:
         pre_constant(self)operator(.)ident(match) operator(=) pre_constant(None)
         pre_constant(self)operator(.)ident(_re_cache) operator(=) operator({)operator(})
 
-    keyword(def) ident(eos)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(eos)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(`True` if the scanner reached the end of text.)delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(pos) operator(>=) pre_constant(self)operator(.)ident(data_length)
     ident(eos) operator(=) predefined(property)operator(()ident(eos)operator(,) ident(eos)operator(.)ident(__doc__)operator(\))
 
-    keyword(def) ident(check)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
+    keyword(def) method(check)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Apply `pattern` on the current position and return)content(
 )content(        the match object. (Doesn't touch pos\). Use this for)content(
@@ -20904,12 +20904,12 @@ keyword(class) ident(Scanner)operator(()predefined(object)operator(\))operator(:
             pre_constant(self)operator(.)ident(_re_cache)operator([)ident(pattern)operator(]) operator(=) ident(re)operator(.)ident(compile)operator(()ident(pattern)operator(,) pre_constant(self)operator(.)ident(flags)operator(\))
         keyword(return) pre_constant(self)operator(.)ident(_re_cache)operator([)ident(pattern)operator(])operator(.)ident(match)operator(()pre_constant(self)operator(.)ident(data)operator(,) pre_constant(self)operator(.)ident(pos)operator(\))
 
-    keyword(def) ident(test)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
+    keyword(def) method(test)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
         string<delimiter(""")content(Apply a pattern on the current position and check)content(
 )content(        if it patches. Doesn't touch pos.)delimiter(""")>
         keyword(return) pre_constant(self)operator(.)ident(check)operator(()ident(pattern)operator(\)) keyword(is) keyword(not) pre_constant(None)
 
-    keyword(def) ident(scan)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
+    keyword(def) method(scan)operator(()pre_constant(self)operator(,) ident(pattern)operator(\))operator(:)
         string<delimiter(""")content(
 )content(        Scan the text for the given pattern and update pos/match)content(
 )content(        and related fields. The return value is a boolen that)content(
@@ -20932,11 +20932,11 @@ keyword(class) ident(Scanner)operator(()predefined(object)operator(\))operator(:
         pre_constant(self)operator(.)ident(match) operator(=) ident(m)operator(.)ident(group)operator(()operator(\))
         keyword(return) pre_constant(True)
 
-    keyword(def) ident(get_char)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(get_char)operator(()pre_constant(self)operator(\))operator(:)
         string<delimiter(""")content(Scan exactly one char.)delimiter(""")>
         pre_constant(self)operator(.)ident(scan)operator(()string<delimiter(')content(.)delimiter(')>operator(\))
 
-    keyword(def) ident(__repr__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__repr__)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) string<delimiter(')content(<%s %d/%d>)delimiter(')> operator(%) operator(()
             pre_constant(self)operator(.)ident(__class__)operator(.)ident(__name__)operator(,)
             pre_constant(self)operator(.)ident(pos)operator(,)
@@ -20956,15 +20956,15 @@ string<delimiter(""")content(
 keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Token)operator(,) ident(STANDARD_TYPES)
 
 
-keyword(class) ident(StyleMeta)operator(()predefined(type)operator(\))operator(:)
+keyword(class) class(StyleMeta)operator(()predefined(type)operator(\))operator(:)
 
-    keyword(def) ident(__new__)operator(()ident(mcs)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(dct)operator(\))operator(:)
+    keyword(def) method(__new__)operator(()ident(mcs)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(dct)operator(\))operator(:)
         ident(obj) operator(=) predefined(type)operator(.)ident(__new__)operator(()ident(mcs)operator(,) ident(name)operator(,) ident(bases)operator(,) ident(dct)operator(\))
         keyword(for) ident(token) keyword(in) ident(STANDARD_TYPES)operator(:)
             keyword(if) ident(token) keyword(not) keyword(in) ident(obj)operator(.)ident(styles)operator(:)
                 ident(obj)operator(.)ident(styles)operator([)ident(token)operator(]) operator(=) string<delimiter(')delimiter(')>
 
-        keyword(def) ident(colorformat)operator(()ident(text)operator(\))operator(:)
+        keyword(def) method(colorformat)operator(()ident(text)operator(\))operator(:)
             keyword(if) ident(text)operator([)integer(0)operator(:)integer(1)operator(]) operator(==) string<delimiter(')content(#)delimiter(')>operator(:)
                 ident(col) operator(=) ident(text)operator([)integer(1)operator(:)operator(])
                 keyword(if) predefined(len)operator(()ident(col)operator(\)) operator(==) integer(6)operator(:)
@@ -21020,7 +21020,7 @@ keyword(class) ident(StyleMeta)operator(()predefined(type)operator(\))operator(:
 
         keyword(return) ident(obj)
 
-    keyword(def) ident(style_for_token)operator(()ident(cls)operator(,) ident(token)operator(\))operator(:)
+    keyword(def) method(style_for_token)operator(()ident(cls)operator(,) ident(token)operator(\))operator(:)
         ident(t) operator(=) ident(cls)operator(.)ident(_styles)operator([)ident(token)operator(])
         keyword(return) operator({)
             string<delimiter(')content(color)delimiter(')>operator(:)        ident(t)operator([)integer(0)operator(]) keyword(or) pre_constant(None)operator(,)
@@ -21034,21 +21034,21 @@ keyword(class) ident(StyleMeta)operator(()predefined(type)operator(\))operator(:
             string<delimiter(')content(mono)delimiter(')>operator(:)         predefined(bool)operator(()ident(t)operator([)integer(8)operator(])operator(\)) keyword(or) pre_constant(None)operator(,)
         operator(})
 
-    keyword(def) ident(list_styles)operator(()ident(cls)operator(\))operator(:)
+    keyword(def) method(list_styles)operator(()ident(cls)operator(\))operator(:)
         keyword(return) predefined(list)operator(()ident(cls)operator(\))
 
-    keyword(def) ident(styles_token)operator(()ident(cls)operator(,) ident(ttype)operator(\))operator(:)
+    keyword(def) method(styles_token)operator(()ident(cls)operator(,) ident(ttype)operator(\))operator(:)
         keyword(return) ident(ttype) keyword(in) ident(cls)operator(.)ident(_styles)
 
-    keyword(def) ident(__iter__)operator(()ident(cls)operator(\))operator(:)
+    keyword(def) method(__iter__)operator(()ident(cls)operator(\))operator(:)
         keyword(for) ident(token) keyword(in) ident(cls)operator(.)ident(_styles)operator(:)
             keyword(yield) ident(token)operator(,) ident(cls)operator(.)ident(style_for_token)operator(()ident(token)operator(\))
 
-    keyword(def) ident(__len__)operator(()ident(cls)operator(\))operator(:)
+    keyword(def) method(__len__)operator(()ident(cls)operator(\))operator(:)
         keyword(return) predefined(len)operator(()ident(cls)operator(.)ident(_styles)operator(\))
 
 
-keyword(class) ident(Style)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(Style)operator(()predefined(object)operator(\))operator(:)
     ident(__metaclass__) operator(=) ident(StyleMeta)
 
     comment(#: overall background color (``None`` means transparent\))
@@ -21095,7 +21095,7 @@ ident(STYLE_MAP) operator(=) operator({)
 operator(})
 
 
-keyword(def) ident(get_style_by_name)operator(()ident(name)operator(\))operator(:)
+keyword(def) method(get_style_by_name)operator(()ident(name)operator(\))operator(:)
     keyword(if) ident(name) keyword(in) ident(STYLE_MAP)operator(:)
         ident(mod)operator(,) ident(cls) operator(=) ident(STYLE_MAP)operator([)ident(name)operator(])operator(.)ident(split)operator(()string<delimiter(')content(::)delimiter(')>operator(\))
         ident(builtin) operator(=) string<delimiter(")content(yes)delimiter(")>
@@ -21119,7 +21119,7 @@ keyword(def) ident(get_style_by_name)operator(()ident(name)operator(\))operator(
         keyword(raise) ident(ClassNotFound)operator(()string<delimiter(")content(Could not find style class %r in style module.)delimiter(")> operator(%) ident(cls)operator(\))
 
 
-keyword(def) ident(get_all_styles)operator(()operator(\))operator(:)
+keyword(def) method(get_all_styles)operator(()operator(\))operator(:)
     string<delimiter(""")content(Return an generator for all styles by name,)content(
 )content(    both builtin and plugin.)delimiter(""")>
     keyword(for) ident(name) keyword(in) ident(STYLE_MAP)operator(:)
@@ -21142,7 +21142,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(AutumnStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(AutumnStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A colorful style, inspired by the terminal highlighting style.)content(
 )content(    )delimiter(""")>
@@ -21207,7 +21207,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(BorlandStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(BorlandStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Style similar to the style used in the borland IDEs.)content(
 )content(    )delimiter(""")>
@@ -21258,7 +21258,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Operator)operator(,) ident(Generic)
 
 
-keyword(class) ident(BlackWhiteStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(BlackWhiteStyle)operator(()ident(Style)operator(\))operator(:)
 
     ident(background_color) operator(=) string<delimiter(")content(#ffffff)delimiter(")>
     ident(default_style) operator(=) string<delimiter(")delimiter(")>
@@ -21307,7 +21307,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(ColorfulStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(ColorfulStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A colorful style, inspired by CodeRay.)content(
 )content(    )delimiter(""")>
@@ -21388,7 +21388,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(DefaultStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(DefaultStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    The default style (inspired by Emacs 22\).)content(
 )content(    )delimiter(""")>
@@ -21461,7 +21461,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(EmacsStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(EmacsStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    The default style (inspired by Emacs 22\).)content(
 )content(    )delimiter(""")>
@@ -21533,7 +21533,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(FriendlyStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(FriendlyStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A modern style based on the VIM pyte theme.)content(
 )content(    )delimiter(""")>
@@ -21604,7 +21604,7 @@ keyword(from) ident(pygments)operator(.)ident(style) keyword(import) ident(Style
 keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Token)operator(,) ident(Comment)operator(,) ident(Name)operator(,) ident(Keyword)operator(,) \
     ident(Generic)operator(,) ident(Number)operator(,) ident(String)operator(,) ident(Whitespace)
 
-keyword(class) ident(FruityStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(FruityStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Pygments version of the "native" vim theme.)content(
 )content(    )delimiter(""")>
@@ -21651,7 +21651,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(ManniStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(ManniStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    A colorful style, inspired by the terminal highlighting style.)content(
 )content(    )delimiter(""")>
@@ -21723,7 +21723,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(MurphyStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(MurphyStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Murphy's style from CodeRay.)content(
 )content(    )delimiter(""")>
@@ -21803,7 +21803,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Token)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(NativeStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(NativeStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Pygments version of the "native" vim theme.)content(
 )content(    )delimiter(""")>
@@ -21870,7 +21870,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(PastieStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(PastieStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Style similar to the pastie default style.)content(
 )content(    )delimiter(""")>
@@ -21945,7 +21945,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(PerldocStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(PerldocStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Style similar to the style used in the perldoc code blocks.)content(
 )content(    )delimiter(""")>
@@ -22040,7 +22040,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)operator(,) ident(Punctuation)operator(,) ident(Other)operator(,) ident(Literal)
 
 
-keyword(class) ident(TangoStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(TangoStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    The Crunchy default Style inspired from the color palette from)content(
 )content(    the Tango Icon Theme Guidelines.)content(
@@ -22153,7 +22153,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)
 
 
-keyword(class) ident(TracStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(TracStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Port of the default trac highlighter design.)content(
 )content(    )delimiter(""")>
@@ -22216,7 +22216,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Number)operator(,) ident(Operator)operator(,) ident(Generic)operator(,) ident(Whitespace)operator(,) ident(Token)
 
 
-keyword(class) ident(VimStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(VimStyle)operator(()ident(Style)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Styles somewhat like vim 7.0)content(
 )content(    )delimiter(""")>
@@ -22279,7 +22279,7 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Keywo
      ident(Operator)operator(,) ident(Generic)
 
 
-keyword(class) ident(VisualStudioStyle)operator(()ident(Style)operator(\))operator(:)
+keyword(class) class(VisualStudioStyle)operator(()ident(Style)operator(\))operator(:)
 
     ident(background_color) operator(=) string<delimiter(")content(#ffffff)delimiter(")>
     ident(default_style) operator(=) string<delimiter(")delimiter(")>
@@ -22317,10 +22317,10 @@ keyword(except) exception(NameError)operator(:)
     keyword(from) ident(sets) keyword(import) ident(Set) keyword(as) predefined(set)
 
 
-keyword(class) ident(_TokenType)operator(()predefined(tuple)operator(\))operator(:)
+keyword(class) class(_TokenType)operator(()predefined(tuple)operator(\))operator(:)
     ident(parent) operator(=) pre_constant(None)
 
-    keyword(def) ident(split)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(split)operator(()pre_constant(self)operator(\))operator(:)
         ident(buf) operator(=) operator([)operator(])
         ident(node) operator(=) pre_constant(self)
         keyword(while) ident(node) keyword(is) keyword(not) pre_constant(None)operator(:)
@@ -22329,17 +22329,17 @@ keyword(class) ident(_TokenType)operator(()predefined(tuple)operator(\))operator
         ident(buf)operator(.)ident(reverse)operator(()operator(\))
         keyword(return) ident(buf)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) operator(*)ident(args)operator(\))operator(:)
         comment(# no need to call super.__init__)
         pre_constant(self)operator(.)ident(subtypes) operator(=) predefined(set)operator(()operator(\))
 
-    keyword(def) ident(__contains__)operator(()pre_constant(self)operator(,) ident(val)operator(\))operator(:)
+    keyword(def) method(__contains__)operator(()pre_constant(self)operator(,) ident(val)operator(\))operator(:)
         keyword(return) pre_constant(self) keyword(is) ident(val) keyword(or) operator(()
             predefined(type)operator(()ident(val)operator(\)) keyword(is) pre_constant(self)operator(.)ident(__class__) keyword(and)
             ident(val)operator([)operator(:)predefined(len)operator(()pre_constant(self)operator(\))operator(]) operator(==) pre_constant(self)
         operator(\))
 
-    keyword(def) ident(__getattr__)operator(()pre_constant(self)operator(,) ident(val)operator(\))operator(:)
+    keyword(def) method(__getattr__)operator(()pre_constant(self)operator(,) ident(val)operator(\))operator(:)
         keyword(if) keyword(not) ident(val) keyword(or) keyword(not) ident(val)operator([)integer(0)operator(])operator(.)ident(isupper)operator(()operator(\))operator(:)
             keyword(return) predefined(tuple)operator(.)ident(__getattribute__)operator(()pre_constant(self)operator(,) ident(val)operator(\))
         ident(new) operator(=) ident(_TokenType)operator(()pre_constant(self) operator(+) operator(()ident(val)operator(,)operator(\))operator(\))
@@ -22348,10 +22348,10 @@ keyword(class) ident(_TokenType)operator(()predefined(tuple)operator(\))operator
         ident(new)operator(.)ident(parent) operator(=) pre_constant(self)
         keyword(return) ident(new)
 
-    keyword(def) ident(__hash__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__hash__)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) predefined(hash)operator(()predefined(tuple)operator(()pre_constant(self)operator(\))operator(\))
 
-    keyword(def) ident(__repr__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__repr__)operator(()pre_constant(self)operator(\))operator(:)
         keyword(return) string<delimiter(')content(Token)delimiter(')> operator(+) operator(()pre_constant(self) keyword(and) string<delimiter(')content(.)delimiter(')> ident(or) string<delimiter(')delimiter(')>operator(\)) operator(+) string<delimiter(')content(.)delimiter(')>operator(.)ident(join)operator(()pre_constant(self)operator(\))
 
 
@@ -22384,7 +22384,7 @@ ident(Token)operator(.)ident(String) operator(=) ident(String)
 ident(Token)operator(.)ident(Number) operator(=) ident(Number)
 
 
-keyword(def) ident(is_token_subtype)operator(()ident(ttype)operator(,) ident(other)operator(\))operator(:)
+keyword(def) method(is_token_subtype)operator(()ident(ttype)operator(,) ident(other)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return True if ``ttype`` is a subtype of ``other``.)content(
 )content(
@@ -22393,7 +22393,7 @@ keyword(def) ident(is_token_subtype)operator(()ident(ttype)operator(,) ident(oth
     keyword(return) ident(ttype) keyword(in) ident(other)
 
 
-keyword(def) ident(string_to_tokentype)operator(()ident(s)operator(\))operator(:)
+keyword(def) method(string_to_tokentype)operator(()ident(s)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Convert a string into a token type::)content(
 )content(
@@ -22530,17 +22530,17 @@ ident(doctype_lookup_re) operator(=) ident(re)operator(.)ident(compile)operator(
 ident(tag_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(')content(<(.+?\)()content(\\s)content(.*?\)?>.*?</.+?>(?uism\))delimiter(')>operator(\))
 
 
-keyword(class) ident(ClassNotFound)operator(()exception(ValueError)operator(\))operator(:)
+keyword(class) class(ClassNotFound)operator(()exception(ValueError)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    If one of the get_*_by_* functions didn't find a matching class.)content(
 )content(    )delimiter(""")>
 
 
-keyword(class) ident(OptionError)operator(()exception(Exception)operator(\))operator(:)
+keyword(class) class(OptionError)operator(()exception(Exception)operator(\))operator(:)
     keyword(pass)
 
 
-keyword(def) ident(get_choice_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(allowed)operator(,) ident(default)operator(=)pre_constant(None)operator(,) ident(normcase)operator(=)pre_constant(False)operator(\))operator(:)
+keyword(def) method(get_choice_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(allowed)operator(,) ident(default)operator(=)pre_constant(None)operator(,) ident(normcase)operator(=)pre_constant(False)operator(\))operator(:)
     ident(string) operator(=) ident(options)operator(.)ident(get)operator(()ident(optname)operator(,) ident(default)operator(\))
     keyword(if) ident(normcase)operator(:)
         ident(string) operator(=) ident(string)operator(.)ident(lower)operator(()operator(\))
@@ -22550,7 +22550,7 @@ keyword(def) ident(get_choice_opt)operator(()ident(options)operator(,) ident(opt
     keyword(return) ident(string)
 
 
-keyword(def) ident(get_bool_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(get_bool_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
     ident(string) operator(=) ident(options)operator(.)ident(get)operator(()ident(optname)operator(,) ident(default)operator(\))
     keyword(if) predefined(isinstance)operator(()ident(string)operator(,) predefined(bool)operator(\))operator(:)
         keyword(return) ident(string)
@@ -22570,7 +22570,7 @@ keyword(def) ident(get_bool_opt)operator(()ident(options)operator(,) ident(optna
                           ident(string)operator(,) ident(optname)operator(\))operator(\))
 
 
-keyword(def) ident(get_int_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(get_int_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
     ident(string) operator(=) ident(options)operator(.)ident(get)operator(()ident(optname)operator(,) ident(default)operator(\))
     keyword(try)operator(:)
         keyword(return) predefined(int)operator(()ident(string)operator(\))
@@ -22584,7 +22584,7 @@ keyword(def) ident(get_int_opt)operator(()ident(options)operator(,) ident(optnam
                           ident(string)operator(,) ident(optname)operator(\))operator(\))
 
 
-keyword(def) ident(get_list_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(get_list_opt)operator(()ident(options)operator(,) ident(optname)operator(,) ident(default)operator(=)pre_constant(None)operator(\))operator(:)
     ident(val) operator(=) ident(options)operator(.)ident(get)operator(()ident(optname)operator(,) ident(default)operator(\))
     keyword(if) predefined(isinstance)operator(()ident(val)operator(,) predefined(basestring)operator(\))operator(:)
         keyword(return) ident(val)operator(.)ident(split)operator(()operator(\))
@@ -22596,7 +22596,7 @@ keyword(def) ident(get_list_opt)operator(()ident(options)operator(,) ident(optna
                           ident(val)operator(,) ident(optname)operator(\))operator(\))
 
 
-keyword(def) ident(docstring_headline)operator(()ident(obj)operator(\))operator(:)
+keyword(def) method(docstring_headline)operator(()ident(obj)operator(\))operator(:)
     keyword(if) keyword(not) ident(obj)operator(.)ident(__doc__)operator(:)
         keyword(return) string<delimiter(')delimiter(')>
     ident(res) operator(=) operator([)operator(])
@@ -22608,12 +22608,12 @@ keyword(def) ident(docstring_headline)operator(()ident(obj)operator(\))operator(
     keyword(return) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(res)operator(\))operator(.)ident(lstrip)operator(()operator(\))
 
 
-keyword(def) ident(make_analysator)operator(()ident(f)operator(\))operator(:)
+keyword(def) method(make_analysator)operator(()ident(f)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return a static text analysation function that)content(
 )content(    returns float values.)content(
 )content(    )delimiter(""")>
-    keyword(def) ident(text_analyse)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(text_analyse)operator(()ident(text)operator(\))operator(:)
         ident(rv) operator(=) ident(f)operator(()ident(text)operator(\))
         keyword(if) keyword(not) ident(rv)operator(:)
             keyword(return) float(0.0)
@@ -22622,7 +22622,7 @@ keyword(def) ident(make_analysator)operator(()ident(f)operator(\))operator(:)
     keyword(return) predefined(staticmethod)operator(()ident(text_analyse)operator(\))
 
 
-keyword(def) ident(shebang_matches)operator(()ident(text)operator(,) ident(regex)operator(\))operator(:)
+keyword(def) method(shebang_matches)operator(()ident(text)operator(,) ident(regex)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Check if the given regular expression matches the last part of the)content(
 )content(    shebang if one exists.)content(
@@ -22668,7 +22668,7 @@ keyword(def) ident(shebang_matches)operator(()ident(text)operator(,) ident(regex
     keyword(return) pre_constant(False)
 
 
-keyword(def) ident(doctype_matches)operator(()ident(text)operator(,) ident(regex)operator(\))operator(:)
+keyword(def) method(doctype_matches)operator(()ident(text)operator(,) ident(regex)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Check if the doctype matches a regular expression (if present\).)content(
 )content(    Note that this method only checks the first part of a DOCTYPE.)content(
@@ -22681,7 +22681,7 @@ keyword(def) ident(doctype_matches)operator(()ident(text)operator(,) ident(regex
     keyword(return) ident(re)operator(.)ident(compile)operator(()ident(regex)operator(\))operator(.)ident(match)operator(()ident(doctype)operator(.)ident(strip)operator(()operator(\))operator(\)) keyword(is) keyword(not) pre_constant(None)
 
 
-keyword(def) ident(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
+keyword(def) method(html_doctype_matches)operator(()ident(text)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Check if the file looks like it has a html doctype.)content(
 )content(    )delimiter(""")>
@@ -22689,7 +22689,7 @@ keyword(def) ident(html_doctype_matches)operator(()ident(text)operator(\))operat
 
 
 ident(_looks_like_xml_cache) operator(=) operator({)operator(})
-keyword(def) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
+keyword(def) method(looks_like_xml)operator(()ident(text)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Check if a doctype exists or if we have some tags.)content(
 )content(    )delimiter(""")>
@@ -22707,16 +22707,16 @@ keyword(def) ident(looks_like_xml)operator(()ident(text)operator(\))operator(:)
 comment(# Python 2/3 compatibility)
 
 keyword(if) ident(sys)operator(.)ident(version_info) operator(<) operator(()integer(3)operator(,)integer(0)operator(\))operator(:)
-    ident(b) operator(=) predefined(bytes) operator(=) predefined(str)
+    ident(b) operator(=) ident(bytes) operator(=) predefined(str)
     ident(u_prefix) operator(=) string<delimiter(')content(u)delimiter(')>
     keyword(import) ident(StringIO)operator(,) ident(cStringIO)
     ident(BytesIO) operator(=) ident(cStringIO)operator(.)ident(StringIO)
     ident(StringIO) operator(=) ident(StringIO)operator(.)ident(StringIO)
 keyword(else)operator(:)
     keyword(import) ident(builtins)
-    predefined(bytes) operator(=) ident(builtins)operator(.)ident(bytes)
+    ident(bytes) operator(=) ident(builtins)operator(.)ident(bytes)
     ident(u_prefix) operator(=) string<delimiter(')delimiter(')>
-    keyword(def) ident(b)operator(()ident(s)operator(\))operator(:)
+    keyword(def) method(b)operator(()ident(s)operator(\))operator(:)
         keyword(if) predefined(isinstance)operator(()ident(s)operator(,) predefined(str)operator(\))operator(:)
             keyword(return) predefined(bytes)operator(()predefined(map)operator(()predefined(ord)operator(,) ident(s)operator(\))operator(\))
         keyword(elif) predefined(isinstance)operator(()ident(s)operator(,) predefined(bytes)operator(\))operator(:)
@@ -22747,9 +22747,9 @@ keyword(from) ident(os)operator(.)ident(path) keyword(import) ident(join)operato
 
 ident(checkers) operator(=) operator({)operator(})
 
-keyword(def) ident(checker)operator(()operator(*)ident(suffixes)operator(,) operator(**)ident(kwds)operator(\))operator(:)
+keyword(def) method(checker)operator(()operator(*)ident(suffixes)operator(,) operator(**)ident(kwds)operator(\))operator(:)
     ident(only_pkg) operator(=) ident(kwds)operator(.)ident(pop)operator(()string<delimiter(')content(only_pkg)delimiter(')>operator(,) pre_constant(False)operator(\))
-    keyword(def) ident(deco)operator(()ident(func)operator(\))operator(:)
+    keyword(def) method(deco)operator(()ident(func)operator(\))operator(:)
         keyword(for) ident(suffix) keyword(in) ident(suffixes)operator(:)
             ident(checkers)operator(.)ident(setdefault)operator(()ident(suffix)operator(,) operator([)operator(])operator(\))operator(.)ident(append)operator(()ident(func)operator(\))
         ident(func)operator(.)ident(only_pkg) operator(=) ident(only_pkg)
@@ -22771,7 +22771,7 @@ ident(misspellings) operator(=) operator([)string<delimiter(")content(developeme
 
 
 decorator(@checker)operator(()string<delimiter(')content(.py)delimiter(')>operator(\))
-keyword(def) ident(check_syntax)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
+keyword(def) method(check_syntax)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
     keyword(try)operator(:)
         predefined(compile)operator(()string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(lines)operator(\))operator(,) ident(fn)operator(,) string<delimiter(")content(exec)delimiter(")>operator(\))
     keyword(except) exception(SyntaxError)operator(,) ident(err)operator(:)
@@ -22779,7 +22779,7 @@ keyword(def) ident(check_syntax)operator(()ident(fn)operator(,) ident(lines)oper
 
 
 decorator(@checker)operator(()string<delimiter(')content(.py)delimiter(')>operator(\))
-keyword(def) ident(check_style_and_encoding)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
+keyword(def) method(check_style_and_encoding)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
     ident(encoding) operator(=) string<delimiter(')content(ascii)delimiter(')>
     keyword(for) ident(lno)operator(,) ident(line) keyword(in) predefined(enumerate)operator(()ident(lines)operator(\))operator(:)
         keyword(if) predefined(len)operator(()ident(line)operator(\)) operator(>) integer(90)operator(:)
@@ -22803,7 +22803,7 @@ keyword(def) ident(check_style_and_encoding)operator(()ident(fn)operator(,) iden
 
 
 decorator(@checker)operator(()string<delimiter(')content(.py)delimiter(')>operator(,) ident(only_pkg)operator(=)pre_constant(True)operator(\))
-keyword(def) ident(check_fileheader)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
+keyword(def) method(check_fileheader)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
     comment(# line number correction)
     ident(c) operator(=) integer(1)
     keyword(if) ident(lines)operator([)integer(0)operator(:)integer(1)operator(]) operator(==) operator([)string<delimiter(')content(#!/usr/bin/env python)char(\\n)delimiter(')>operator(])operator(:)
@@ -22867,7 +22867,7 @@ keyword(def) ident(check_fileheader)operator(()ident(fn)operator(,) ident(lines)
 
 
 decorator(@checker)operator(()string<delimiter(')content(.py)delimiter(')>operator(,) string<delimiter(')content(.html)delimiter(')>operator(,) string<delimiter(')content(.js)delimiter(')>operator(\))
-keyword(def) ident(check_whitespace_and_spelling)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
+keyword(def) method(check_whitespace_and_spelling)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
     keyword(for) ident(lno)operator(,) ident(line) keyword(in) predefined(enumerate)operator(()ident(lines)operator(\))operator(:)
         keyword(if) string<delimiter(")char(\\t)delimiter(")> keyword(in) ident(line)operator(:)
             keyword(yield) ident(lno)operator(+)integer(1)operator(,) string<delimiter(")content(OMG TABS!!!1 )delimiter(")>
@@ -22882,14 +22882,14 @@ ident(bad_tags) operator(=) operator(()string<delimiter(')content(<b>)delimiter(
             string<delimiter(')content(<center>)delimiter(')>operator(,) string<delimiter(')content(<big>)delimiter(')>operator(,) string<delimiter(')content(<small>)delimiter(')>operator(,) string<delimiter(')content(<font)delimiter(')>operator(\))
 
 decorator(@checker)operator(()string<delimiter(')content(.html)delimiter(')>operator(\))
-keyword(def) ident(check_xhtml)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
+keyword(def) method(check_xhtml)operator(()ident(fn)operator(,) ident(lines)operator(\))operator(:)
     keyword(for) ident(lno)operator(,) ident(line) keyword(in) predefined(enumerate)operator(()ident(lines)operator(\))operator(:)
         keyword(for) ident(bad_tag) keyword(in) ident(bad_tags)operator(:)
             keyword(if) ident(bad_tag) keyword(in) ident(line)operator(:)
                 keyword(yield) ident(lno)operator(+)integer(1)operator(,) string<delimiter(")content(used )delimiter(")> operator(+) ident(bad_tag)
 
 
-keyword(def) ident(main)operator(()ident(argv)operator(\))operator(:)
+keyword(def) method(main)operator(()ident(argv)operator(\))operator(:)
     keyword(try)operator(:)
         ident(gopts)operator(,) ident(args) operator(=) ident(getopt)operator(.)ident(getopt)operator(()ident(argv)operator([)integer(1)operator(:)operator(])operator(,) string<delimiter(")content(vi:)delimiter(")>operator(\))
     keyword(except) ident(getopt)operator(.)ident(GetoptError)operator(:)
@@ -22973,7 +22973,7 @@ keyword(import) ident(sys)
 keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(get_all_lexers)operator(,) ident(find_lexer_class)
 keyword(from) ident(pygments)operator(.)ident(lexer) keyword(import) ident(Lexer)
 
-keyword(def) ident(main)operator(()operator(\))operator(:)
+keyword(def) method(main)operator(()operator(\))operator(:)
     ident(uses) operator(=) operator({)operator(})
 
     keyword(for) ident(name)operator(,) ident(aliases)operator(,) ident(filenames)operator(,) ident(mimetypes) keyword(in) ident(get_all_lexers)operator(()operator(\))operator(:)
@@ -23027,13 +23027,13 @@ ident(tag_re) operator(=) ident(re)operator(.)ident(compile)operator(()
 ident(binary_re) operator(=) ident(re)operator(.)ident(compile)operator(()string<delimiter(')content([)char(\\x00)content(-)char(\\x06)char(\\x0E)content(-)char(\\x1F)content(])delimiter(')>operator(\))
 
 
-keyword(def) ident(escape_html)operator(()ident(text)operator(\))operator(:)
+keyword(def) method(escape_html)operator(()ident(text)operator(\))operator(:)
     keyword(return) ident(text)operator(.)ident(replace)operator(()string<delimiter(')content(&)delimiter(')>operator(,) string<delimiter(')content(&amp;)delimiter(')>operator(\))operator(.) \
                 ident(replace)operator(()string<delimiter(')content(<)delimiter(')>operator(,) string<delimiter(')content(&lt;)delimiter(')>operator(\))operator(.)  \
                 ident(replace)operator(()string<delimiter(')content(>)delimiter(')>operator(,) string<delimiter(')content(&gt;)delimiter(')>operator(\))operator(.)  \
                 ident(replace)operator(()string<delimiter(')content(")delimiter(')>operator(,) string<delimiter(')content(&quot;)delimiter(')>operator(\))
 
-keyword(def) ident(process_file)operator(()ident(store)operator(,) ident(filename)operator(\))operator(:)
+keyword(def) method(process_file)operator(()ident(store)operator(,) ident(filename)operator(\))operator(:)
     keyword(try)operator(:)
         ident(f) operator(=) predefined(open)operator(()ident(filename)operator(,) string<delimiter(')content(r)delimiter(')>operator(\))
     keyword(except) operator(()exception(IOError)operator(,) exception(OSError)operator(\))operator(:)
@@ -23069,7 +23069,7 @@ keyword(def) ident(process_file)operator(()ident(store)operator(,) ident(filenam
         ident(f)operator(.)ident(close)operator(()operator(\))
 
 
-keyword(def) ident(main)operator(()operator(\))operator(:)
+keyword(def) method(main)operator(()operator(\))operator(:)
     keyword(try)operator(:)
         ident(gopts)operator(,) ident(args) operator(=) ident(getopt)operator(.)ident(getopt)operator(()ident(sys)operator(.)ident(argv)operator([)integer(1)operator(:)operator(])operator(,) string<delimiter(")content(vo:i:)delimiter(")>operator(\))
     keyword(except) ident(getopt)operator(.)ident(GetoptError)operator(:)
@@ -23229,7 +23229,7 @@ keyword(from) ident(pygments) keyword(import) ident(highlight)
 keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(get_lexer_for_filename)operator(,) ident(get_lexer_by_name)
 keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Error)
 
-keyword(def) ident(main)operator(()ident(fn)operator(\))operator(:)
+keyword(def) method(main)operator(()ident(fn)operator(\))operator(:)
     keyword(try)operator(:)
         ident(lx) operator(=) ident(get_lexer_for_filename)operator(()ident(fn)operator(\))
     keyword(except) exception(ValueError)operator(:)
@@ -23243,10 +23243,10 @@ keyword(def) ident(main)operator(()ident(fn)operator(\))operator(:)
     ident(text) operator(=) ident(text)operator(.)ident(decode)operator(()string<delimiter(')content(latin1)delimiter(')>operator(\))
     ident(ntext) operator(=) operator([)operator(])
     keyword(for) predefined(type)operator(,) ident(val) keyword(in) ident(lx)operator(.)ident(get_tokens)operator(()ident(text)operator(\))operator(:)
-        keyword(if) predefined(type) operator(==) ident(Error)operator(:)
+        keyword(if) ident(type) operator(==) ident(Error)operator(:)
             keyword(print) string<delimiter(")content(Error parsing)delimiter(")>operator(,) ident(fn)
             keyword(print) string<delimiter(")char(\\n)delimiter(")>operator(.)ident(join)operator(()operator([)string<delimiter(')content(   )delimiter(')> operator(+) predefined(repr)operator(()ident(x)operator(\)) keyword(for) ident(x) keyword(in) ident(ntext)operator([)operator(-)ident(num)operator(:)operator(])operator(])operator(\))
-            keyword(print) error(`)ident(val)error(`) operator(+) string<delimiter(")content(<<<)delimiter(")>
+            keyword(print) operator(`)ident(val)operator(`) operator(+) string<delimiter(")content(<<<)delimiter(")>
             keyword(return) integer(1)
         ident(ntext)operator(.)ident(append)operator(()operator(()predefined(type)operator(,)ident(val)operator(\))operator(\))
     keyword(return) integer(0)
@@ -23269,7 +23269,7 @@ ident(r_line) operator(=) ident(re)operator(.)ident(compile)operator(()string<mo
                     string<modifier(r)delimiter(")content(contained|syn keyword vimAutoEvent contained\))content(\\s)content(+(.*\))delimiter(")>operator(\))
 ident(r_item) operator(=) ident(re)operator(.)ident(compile)operator(()string<modifier(r)delimiter(")content(()content(\\w)content(+\)(?:)content(\\[)content(()content(\\w)content(+\))content(\\])content(\)?)delimiter(")>operator(\))
 
-keyword(def) ident(getkw)operator(()predefined(input)operator(,) ident(output)operator(\))operator(:)
+keyword(def) method(getkw)operator(()predefined(input)operator(,) ident(output)operator(\))operator(:)
     ident(out) operator(=) predefined(file)operator(()ident(output)operator(,) string<delimiter(')content(w)delimiter(')>operator(\))
 
     ident(output_info) operator(=) operator({)string<delimiter(')content(command)delimiter(')>operator(:) operator([)operator(])operator(,) string<delimiter(')content(option)delimiter(')>operator(:) operator([)operator(])operator(,) string<delimiter(')content(auto)delimiter(')>operator(:) operator([)operator(])operator(})
@@ -23292,7 +23292,7 @@ keyword(def) ident(getkw)operator(()predefined(input)operator(,) ident(output)op
     keyword(for) ident(a)operator(,) ident(b) keyword(in) ident(output_info)operator(.)ident(items)operator(()operator(\))operator(:)
         keyword(print) operator(>>)ident(out)operator(,) string<delimiter(')content(%s=%r)delimiter(')> operator(%) operator(()ident(a)operator(,) ident(b)operator(\))
 
-keyword(def) ident(is_keyword)operator(()ident(w)operator(,) ident(keywords)operator(\))operator(:)
+keyword(def) method(is_keyword)operator(()ident(w)operator(,) ident(keywords)operator(\))operator(:)
     keyword(for) ident(i) keyword(in) predefined(range)operator(()predefined(len)operator(()ident(w)operator(\))operator(,) integer(0)operator(,) operator(-)integer(1)operator(\))operator(:)
         keyword(if) ident(w)operator([)operator(:)ident(i)operator(]) keyword(in) ident(keywords)operator(:)
             keyword(return) ident(signals)operator([)ident(w)operator([)operator(:)ident(i)operator(])operator(])operator([)operator(:)predefined(len)operator(()ident(w)operator(\))operator(]) operator(==) ident(w)
@@ -23348,19 +23348,19 @@ ident(recurse) operator(=) integer(0)
 ident(dryrun)  operator(=) integer(0)
 ident(no_backup) operator(=) integer(0)
 
-keyword(def) ident(usage)operator(()ident(msg)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(usage)operator(()ident(msg)operator(=)pre_constant(None)operator(\))operator(:)
     keyword(if) ident(msg) keyword(is) keyword(not) pre_constant(None)operator(:)
         keyword(print) operator(>>) ident(sys)operator(.)ident(stderr)operator(,) ident(msg)
     keyword(print) operator(>>) ident(sys)operator(.)ident(stderr)operator(,) ident(__doc__)
 
-keyword(def) ident(errprint)operator(()operator(*)ident(args)operator(\))operator(:)
+keyword(def) method(errprint)operator(()operator(*)ident(args)operator(\))operator(:)
     ident(sep) operator(=) string<delimiter(")delimiter(")>
     keyword(for) ident(arg) keyword(in) ident(args)operator(:)
         ident(sys)operator(.)ident(stderr)operator(.)ident(write)operator(()ident(sep) operator(+) predefined(str)operator(()ident(arg)operator(\))operator(\))
         ident(sep) operator(=) string<delimiter(")content( )delimiter(")>
     ident(sys)operator(.)ident(stderr)operator(.)ident(write)operator(()string<delimiter(")char(\\n)delimiter(")>operator(\))
 
-keyword(def) ident(main)operator(()operator(\))operator(:)
+keyword(def) method(main)operator(()operator(\))operator(:)
     keyword(import) ident(getopt)
     keyword(global) ident(verbose)operator(,) ident(recurse)operator(,) ident(dryrun)operator(,) ident(no_backup)
 
@@ -23391,7 +23391,7 @@ keyword(def) ident(main)operator(()operator(\))operator(:)
     keyword(for) ident(arg) keyword(in) ident(args)operator(:)
         ident(check)operator(()ident(arg)operator(\))
 
-keyword(def) ident(check)operator(()predefined(file)operator(\))operator(:)
+keyword(def) method(check)operator(()predefined(file)operator(\))operator(:)
     keyword(if) ident(os)operator(.)ident(path)operator(.)ident(isdir)operator(()predefined(file)operator(\)) keyword(and) keyword(not) ident(os)operator(.)ident(path)operator(.)ident(islink)operator(()predefined(file)operator(\))operator(:)
         keyword(if) ident(verbose)operator(:)
             keyword(print) string<delimiter(")content(listing directory)delimiter(")>operator(,) predefined(file)
@@ -23439,9 +23439,9 @@ keyword(def) ident(check)operator(()predefined(file)operator(\))operator(:)
             keyword(print) string<delimiter(")content(unchanged.)delimiter(")>
 
 
-keyword(class) ident(Reindenter)operator(:)
+keyword(class) class(Reindenter)operator(:)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(f)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(f)operator(\))operator(:)
         pre_constant(self)operator(.)ident(find_stmt) operator(=) integer(1)  comment(# next token begins a fresh stmt?)
         pre_constant(self)operator(.)ident(level) operator(=) integer(0)      comment(# current indent level)
 
@@ -23462,7 +23462,7 @@ keyword(class) ident(Reindenter)operator(:)
         comment(# indeed, they're our headache!)
         pre_constant(self)operator(.)ident(stats) operator(=) operator([)operator(])
 
-    keyword(def) ident(run)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(run)operator(()pre_constant(self)operator(\))operator(:)
         ident(tokenize)operator(.)ident(tokenize)operator(()pre_constant(self)operator(.)ident(getline)operator(,) pre_constant(self)operator(.)ident(tokeneater)operator(\))
         comment(# Remove trailing empty lines.)
         ident(lines) operator(=) pre_constant(self)operator(.)ident(lines)
@@ -23531,11 +23531,11 @@ keyword(class) ident(Reindenter)operator(:)
                         ident(after)operator(.)ident(append)operator(()ident(line)operator([)ident(remove)operator(:)operator(])operator(\))
         keyword(return) pre_constant(self)operator(.)ident(raw) operator(!=) pre_constant(self)operator(.)ident(after)
 
-    keyword(def) ident(write)operator(()pre_constant(self)operator(,) ident(f)operator(\))operator(:)
+    keyword(def) method(write)operator(()pre_constant(self)operator(,) ident(f)operator(\))operator(:)
         ident(f)operator(.)ident(writelines)operator(()pre_constant(self)operator(.)ident(after)operator(\))
 
     comment(# Line-getter for tokenize.)
-    keyword(def) ident(getline)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(getline)operator(()pre_constant(self)operator(\))operator(:)
         keyword(if) pre_constant(self)operator(.)ident(index) operator(>=) predefined(len)operator(()pre_constant(self)operator(.)ident(lines)operator(\))operator(:)
             ident(line) operator(=) string<delimiter(")delimiter(")>
         keyword(else)operator(:)
@@ -23544,34 +23544,34 @@ keyword(class) ident(Reindenter)operator(:)
         keyword(return) ident(line)
 
     comment(# Line-eater for tokenize.)
-    keyword(def) ident(tokeneater)operator(()pre_constant(self)operator(,) predefined(type)operator(,) ident(token)operator(,) operator(()ident(sline)operator(,) ident(scol)operator(\))operator(,) ident(end)operator(,) ident(line)operator(,)
+    keyword(def) method(tokeneater)operator(()pre_constant(self)operator(,) predefined(type)operator(,) ident(token)operator(,) operator(()ident(sline)operator(,) ident(scol)operator(\))operator(,) ident(end)operator(,) ident(line)operator(,)
                    ident(INDENT)operator(=)ident(tokenize)operator(.)ident(INDENT)operator(,)
                    ident(DEDENT)operator(=)ident(tokenize)operator(.)ident(DEDENT)operator(,)
                    ident(NEWLINE)operator(=)ident(tokenize)operator(.)ident(NEWLINE)operator(,)
                    ident(COMMENT)operator(=)ident(tokenize)operator(.)ident(COMMENT)operator(,)
                    ident(NL)operator(=)ident(tokenize)operator(.)ident(NL)operator(\))operator(:)
 
-        keyword(if) predefined(type) operator(==) ident(NEWLINE)operator(:)
+        keyword(if) ident(type) operator(==) ident(NEWLINE)operator(:)
             comment(# A program statement, or ENDMARKER, will eventually follow,)
             comment(# after some (possibly empty\) run of tokens of the form)
             comment(#     (NL | COMMENT\)* (INDENT | DEDENT+\)?)
             pre_constant(self)operator(.)ident(find_stmt) operator(=) integer(1)
 
-        keyword(elif) predefined(type) operator(==) ident(INDENT)operator(:)
+        keyword(elif) ident(type) operator(==) ident(INDENT)operator(:)
             pre_constant(self)operator(.)ident(find_stmt) operator(=) integer(1)
             pre_constant(self)operator(.)ident(level) operator(+=) integer(1)
 
-        keyword(elif) predefined(type) operator(==) ident(DEDENT)operator(:)
+        keyword(elif) ident(type) operator(==) ident(DEDENT)operator(:)
             pre_constant(self)operator(.)ident(find_stmt) operator(=) integer(1)
             pre_constant(self)operator(.)ident(level) operator(-=) integer(1)
 
-        keyword(elif) predefined(type) operator(==) ident(COMMENT)operator(:)
+        keyword(elif) ident(type) operator(==) ident(COMMENT)operator(:)
             keyword(if) pre_constant(self)operator(.)ident(find_stmt)operator(:)
                 pre_constant(self)operator(.)ident(stats)operator(.)ident(append)operator(()operator(()ident(sline)operator(,) operator(-)integer(1)operator(\))operator(\))
                 comment(# but we're still looking for a new stmt, so leave)
                 comment(# find_stmt alone)
 
-        keyword(elif) predefined(type) operator(==) ident(NL)operator(:)
+        keyword(elif) ident(type) operator(==) ident(NL)operator(:)
             keyword(pass)
 
         keyword(elif) pre_constant(self)operator(.)ident(find_stmt)operator(:)
@@ -23583,7 +23583,7 @@ keyword(class) ident(Reindenter)operator(:)
                 pre_constant(self)operator(.)ident(stats)operator(.)ident(append)operator(()operator(()ident(sline)operator(,) pre_constant(self)operator(.)ident(level)operator(\))operator(\))
 
 comment(# Count number of leading blanks.)
-keyword(def) ident(getlspace)operator(()ident(line)operator(\))operator(:)
+keyword(def) method(getlspace)operator(()ident(line)operator(\))operator(:)
     ident(i)operator(,) ident(n) operator(=) integer(0)operator(,) predefined(len)operator(()ident(line)operator(\))
     keyword(while) ident(i) operator(<) ident(n) keyword(and) ident(line)operator([)ident(i)operator(]) operator(==) string<delimiter(")content( )delimiter(")>operator(:)
         ident(i) operator(+=) integer(1)
@@ -24366,7 +24366,7 @@ keyword(for) ident(token) keyword(in) ident(TOKENS)operator(.)ident(itervalues)o
             ident(TOKEN_TYPES)operator(.)ident(add)operator(()ident(token)operator(.)ident(split)operator(()string<delimiter(')content(.)delimiter(')>operator(\))operator([)integer(0)operator(])operator(\))
 
 
-keyword(def) ident(get_vim_color)operator(()ident(color)operator(\))operator(:)
+keyword(def) method(get_vim_color)operator(()ident(color)operator(\))operator(:)
     keyword(if) ident(color)operator(.)ident(startswith)operator(()string<delimiter(')content(#)delimiter(')>operator(\))operator(:)
         keyword(if) predefined(len)operator(()ident(color)operator(\)) operator(==) integer(7)operator(:)
             keyword(return) ident(color)
@@ -24375,10 +24375,10 @@ keyword(def) ident(get_vim_color)operator(()ident(color)operator(\))operator(:)
     keyword(return) ident(COLORS)operator(.)ident(get)operator(()ident(color)operator(.)ident(lower)operator(()operator(\))operator(\))
 
 
-keyword(def) ident(find_colors)operator(()ident(code)operator(\))operator(:)
+keyword(def) method(find_colors)operator(()ident(code)operator(\))operator(:)
     ident(colors) operator(=) operator({)string<delimiter(')content(Normal)delimiter(')>operator(:) operator({)operator(})operator(})
     ident(bg_color) operator(=) pre_constant(None)
-    keyword(def) predefined(set)operator(()ident(attrib)operator(,) ident(value)operator(\))operator(:)
+    keyword(def) method(set)operator(()ident(attrib)operator(,) ident(value)operator(\))operator(:)
         keyword(if) ident(token) keyword(not) keyword(in) ident(colors)operator(:)
             ident(colors)operator([)ident(token)operator(]) operator(=) operator({)operator(})
         keyword(if) ident(key)operator(.)ident(startswith)operator(()string<delimiter(')content(gui)delimiter(')>operator(\)) keyword(or) ident(attrib) keyword(not) keyword(in) ident(colors)operator([)ident(token)operator(])operator(:)
@@ -24454,13 +24454,13 @@ keyword(def) ident(find_colors)operator(()ident(code)operator(\))operator(:)
     keyword(return) ident(default_token)operator(,) ident(color_map)
 
 
-keyword(class) ident(StyleWriter)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(StyleWriter)operator(()predefined(object)operator(\))operator(:)
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(code)operator(,) ident(name)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(code)operator(,) ident(name)operator(\))operator(:)
         pre_constant(self)operator(.)ident(code) operator(=) ident(code)
         pre_constant(self)operator(.)ident(name) operator(=) ident(name)operator(.)ident(lower)operator(()operator(\))
 
-    keyword(def) ident(write_header)operator(()pre_constant(self)operator(,) ident(out)operator(\))operator(:)
+    keyword(def) method(write_header)operator(()pre_constant(self)operator(,) ident(out)operator(\))operator(:)
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(# -*- coding: utf-8 -*-)char(\\n)content(""")char(\\n)delimiter(')>operator(\))
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(    %s Colorscheme)char(\\n)delimiter(')> operator(%) pre_constant(self)operator(.)ident(name)operator(.)ident(title)operator(()operator(\))operator(\))
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(    %s)char(\\n)char(\\n)delimiter(')> operator(%) operator(()string<delimiter(')content(~)delimiter(')> operator(*) operator(()predefined(len)operator(()pre_constant(self)operator(.)ident(name)operator(\)) operator(+) integer(12)operator(\))operator(\))operator(\))
@@ -24469,7 +24469,7 @@ keyword(class) ident(StyleWriter)operator(()predefined(object)operator(\))operat
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(from pygments.token import Token, %s)char(\\n)char(\\n)delimiter(')> operator(%) string<delimiter(')content(, )delimiter(')>operator(.)ident(join)operator(()ident(TOKEN_TYPES)operator(\))operator(\))
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(class %sStyle(Style\):)char(\\n)char(\\n)delimiter(')> operator(%) pre_constant(self)operator(.)ident(name)operator(.)ident(title)operator(()operator(\))operator(\))
 
-    keyword(def) ident(write)operator(()pre_constant(self)operator(,) ident(out)operator(\))operator(:)
+    keyword(def) method(write)operator(()pre_constant(self)operator(,) ident(out)operator(\))operator(:)
         pre_constant(self)operator(.)ident(write_header)operator(()ident(out)operator(\))
         ident(default_token)operator(,) ident(tokens) operator(=) ident(find_colors)operator(()pre_constant(self)operator(.)ident(code)operator(\))
         ident(tokens) operator(=) ident(tokens)operator(.)ident(items)operator(()operator(\))
@@ -24484,13 +24484,13 @@ keyword(class) ident(StyleWriter)operator(()predefined(object)operator(\))operat
                 ident(out)operator(.)ident(write)operator(()string<delimiter(')content(        %-20s%r)char(\\n)delimiter(')> operator(%) operator(()ident(token) operator(+) string<delimiter(')content(:)delimiter(')>operator(,) ident(definition)operator(\))operator(\))
         ident(out)operator(.)ident(write)operator(()string<delimiter(')content(    })delimiter(')>operator(\))
 
-    keyword(def) ident(__repr__)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(__repr__)operator(()pre_constant(self)operator(\))operator(:)
         ident(out) operator(=) ident(StringIO)operator(()operator(\))
         pre_constant(self)operator(.)ident(write_style)operator(()ident(out)operator(\))
         keyword(return) ident(out)operator(.)ident(getvalue)operator(()operator(\))
 
 
-keyword(def) ident(convert)operator(()ident(filename)operator(,) ident(stream)operator(=)pre_constant(None)operator(\))operator(:)
+keyword(def) method(convert)operator(()ident(filename)operator(,) ident(stream)operator(=)pre_constant(None)operator(\))operator(:)
     ident(name) operator(=) ident(path)operator(.)ident(basename)operator(()ident(filename)operator(\))
     keyword(if) ident(name)operator(.)ident(endswith)operator(()string<delimiter(')content(.vim)delimiter(')>operator(\))operator(:)
         ident(name) operator(=) ident(name)operator([)operator(:)operator(-)integer(4)operator(])
@@ -24507,7 +24507,7 @@ keyword(def) ident(convert)operator(()ident(filename)operator(,) ident(stream)op
         keyword(return) ident(out)operator(.)ident(getvalue)operator(()operator(\))
 
 
-keyword(def) ident(main)operator(()operator(\))operator(:)
+keyword(def) method(main)operator(()operator(\))operator(:)
     keyword(if) predefined(len)operator(()ident(sys)operator(.)ident(argv)operator(\)) operator(!=) integer(2) keyword(or) ident(sys)operator(.)ident(argv)operator([)integer(1)operator(]) keyword(in) operator(()string<delimiter(')content(-h)delimiter(')>operator(,) string<delimiter(')content(--help)delimiter(')>operator(\))operator(:)
         keyword(print) string<delimiter(')content(Usage: %s <filename.vim>)delimiter(')> operator(%) ident(sys)operator(.)ident(argv)operator([)integer(0)operator(])
         keyword(return) integer(2)
@@ -24555,7 +24555,7 @@ keyword(try)operator(:)
     keyword(from) ident(setuptools) keyword(import) ident(setup)operator(,) ident(find_packages)
 keyword(except) exception(ImportError)operator(:)
     keyword(from) ident(distutils)operator(.)ident(core) keyword(import) ident(setup)
-    keyword(def) ident(find_packages)operator(()operator(\))operator(:)
+    keyword(def) method(find_packages)operator(()operator(\))operator(:)
         keyword(return) operator([)
             string<delimiter(')content(pygments)delimiter(')>operator(,)
             string<delimiter(')content(pygments.lexers)delimiter(')>operator(,)
@@ -24628,20 +24628,20 @@ ident(total_test_count) operator(=) integer(0)
 ident(error_test_count) operator(=) integer(0)
 
 
-keyword(def) ident(err)operator(()predefined(file)operator(,) ident(what)operator(,) ident(exc)operator(\))operator(:)
+keyword(def) method(err)operator(()predefined(file)operator(,) ident(what)operator(,) ident(exc)operator(\))operator(:)
     keyword(print) operator(>>)ident(sys)operator(.)ident(stderr)operator(,) predefined(file)operator(,) string<delimiter(')content(failed %s:)delimiter(')> operator(%) ident(what)operator(,)
     keyword(print) operator(>>)ident(sys)operator(.)ident(stderr)operator(,) ident(exc)
     ident(failed)operator(.)ident(append)operator(()predefined(file)operator([)operator(:)operator(-)integer(3)operator(])operator(\))
 
 
-keyword(class) ident(QuietTestRunner)operator(()predefined(object)operator(\))operator(:)
+keyword(class) class(QuietTestRunner)operator(()predefined(object)operator(\))operator(:)
     string<delimiter(""")content(Customized test runner for relatively quiet output)delimiter(""")>
 
-    keyword(def) ident(__init__)operator(()pre_constant(self)operator(,) ident(testname)operator(,) ident(stream)operator(=)ident(sys)operator(.)ident(stderr)operator(\))operator(:)
+    keyword(def) method(__init__)operator(()pre_constant(self)operator(,) ident(testname)operator(,) ident(stream)operator(=)ident(sys)operator(.)ident(stderr)operator(\))operator(:)
         pre_constant(self)operator(.)ident(testname) operator(=) ident(testname)
         pre_constant(self)operator(.)ident(stream) operator(=) ident(unittest)operator(.)ident(_WritelnDecorator)operator(()ident(stream)operator(\))
 
-    keyword(def) ident(run)operator(()pre_constant(self)operator(,) ident(test)operator(\))operator(:)
+    keyword(def) method(run)operator(()pre_constant(self)operator(,) ident(test)operator(\))operator(:)
         keyword(global) ident(total_test_count)
         keyword(global) ident(error_test_count)
         ident(result) operator(=) ident(unittest)operator(.)ident(_TextTestResult)operator(()pre_constant(self)operator(.)ident(stream)operator(,) pre_constant(True)operator(,) integer(1)operator(\))
@@ -24657,7 +24657,7 @@ keyword(class) ident(QuietTestRunner)operator(()predefined(object)operator(\))op
         keyword(return) ident(result)
 
 
-keyword(def) ident(run_tests)operator(()ident(with_coverage)operator(=)pre_constant(False)operator(\))operator(:)
+keyword(def) method(run_tests)operator(()ident(with_coverage)operator(=)pre_constant(False)operator(\))operator(:)
     comment(# needed to avoid confusion involving atexit handlers)
     keyword(import) ident(logging)
 
@@ -24773,7 +24773,7 @@ string<delimiter(""")content(
 keyword(import) ident(os)
 
 
-keyword(def) ident(location)operator(()ident(mod_name)operator(\))operator(:)
+keyword(def) method(location)operator(()ident(mod_name)operator(\))operator(:)
     string<delimiter(""")content(
 )content(    Return the file and directory that the code for *mod_name* is in.)content(
 )content(    )delimiter(""")>
@@ -24807,14 +24807,14 @@ ident(test_content) operator(=) operator([)predefined(chr)operator(()ident(i)ope
 ident(random)operator(.)ident(shuffle)operator(()ident(test_content)operator(\))
 ident(test_content) operator(=) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()ident(test_content)operator(\)) operator(+) string<delimiter(')char(\\n)delimiter(')>
 
-keyword(class) ident(LexersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(LexersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_import_all)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_import_all)operator(()pre_constant(self)operator(\))operator(:)
         comment(# instantiate every lexer, to see if the token type defs are correct)
         keyword(for) ident(x) keyword(in) ident(lexers)operator(.)ident(LEXERS)operator(.)ident(keys)operator(()operator(\))operator(:)
             ident(c) operator(=) predefined(getattr)operator(()ident(lexers)operator(,) ident(x)operator(\))operator(()operator(\))
 
-    keyword(def) ident(test_lexer_classes)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_lexer_classes)operator(()pre_constant(self)operator(\))operator(:)
         ident(a) operator(=) pre_constant(self)operator(.)ident(assert_)
         ident(ae) operator(=) pre_constant(self)operator(.)ident(assertEquals)
         comment(# test that every lexer class has the correct public API)
@@ -24850,7 +24850,7 @@ keyword(class) ident(LexersTest)operator(()ident(unittest)operator(.)ident(TestC
             ident(ae)operator(()ident(txt)operator(,) ident(test_content)operator(,) string<delimiter(")content(%s lexer roundtrip failed: %r != %r)delimiter(")> operator(%)
                     operator(()ident(lexer)operator(.)ident(name)operator(,) ident(test_content)operator(,) ident(txt)operator(\))operator(\))
 
-    keyword(def) ident(test_get_lexers)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_get_lexers)operator(()pre_constant(self)operator(\))operator(:)
         ident(a) operator(=) pre_constant(self)operator(.)ident(assert_)
         ident(ae) operator(=) pre_constant(self)operator(.)ident(assertEquals)
         comment(# test that the lexers functions work)
@@ -24866,9 +24866,9 @@ keyword(class) ident(LexersTest)operator(()ident(unittest)operator(.)ident(TestC
             ident(ae)operator(()ident(x)operator(.)ident(options)operator([)string<delimiter(")content(opt)delimiter(")>operator(])operator(,) string<delimiter(")content(val)delimiter(")>operator(\))
 
 
-keyword(class) ident(FiltersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(FiltersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_basic)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_basic)operator(()pre_constant(self)operator(\))operator(:)
         ident(filter_args) operator(=) operator({)
             string<delimiter(')content(whitespace)delimiter(')>operator(:) operator({)string<delimiter(')content(spaces)delimiter(')>operator(:) pre_constant(True)operator(,) string<delimiter(')content(tabs)delimiter(')>operator(:) pre_constant(True)operator(,) string<delimiter(')content(newlines)delimiter(')>operator(:) pre_constant(True)operator(})operator(,)
             string<delimiter(')content(highlight)delimiter(')>operator(:) operator({)string<delimiter(')content(names)delimiter(')>operator(:) operator([)string<delimiter(')content(isinstance)delimiter(')>operator(,) string<delimiter(')content(lexers)delimiter(')>operator(,) string<delimiter(')content(x)delimiter(')>operator(])operator(})operator(,)
@@ -24884,26 +24884,26 @@ keyword(class) ident(FiltersTest)operator(()ident(unittest)operator(.)ident(Test
                 pre_constant(self)operator(.)ident(assertEquals)operator(()ident(roundtext)operator(,) ident(text)operator(,)
                                   string<delimiter(")content(lexer roundtrip with %s filter failed)delimiter(")> operator(%) ident(x)operator(\))
 
-    keyword(def) ident(test_raiseonerror)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_raiseonerror)operator(()pre_constant(self)operator(\))operator(:)
         ident(lx) operator(=) ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))
         ident(lx)operator(.)ident(add_filter)operator(()string<delimiter(')content(raiseonerror)delimiter(')>operator(,) ident(excclass)operator(=)exception(RuntimeError)operator(\))
         pre_constant(self)operator(.)ident(assertRaises)operator(()exception(RuntimeError)operator(,) predefined(list)operator(,) ident(lx)operator(.)ident(get_tokens)operator(()string<delimiter(')content($)delimiter(')>operator(\))operator(\))
 
-    keyword(def) ident(test_whitespace)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_whitespace)operator(()pre_constant(self)operator(\))operator(:)
         ident(lx) operator(=) ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))
         ident(lx)operator(.)ident(add_filter)operator(()string<delimiter(')content(whitespace)delimiter(')>operator(,) ident(spaces)operator(=)string<delimiter(')content(%)delimiter(')>operator(\))
         ident(text) operator(=) predefined(open)operator(()ident(TESTFILE)operator(,) string<delimiter(')content(rb)delimiter(')>operator(\))operator(.)ident(read)operator(()operator(\))operator(.)ident(decode)operator(()string<delimiter(')content(utf-8)delimiter(')>operator(\))
         ident(lxtext) operator(=) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()operator([)ident(t)operator([)integer(1)operator(]) keyword(for) ident(t) keyword(in) predefined(list)operator(()ident(lx)operator(.)ident(get_tokens)operator(()ident(text)operator(\))operator(\))operator(])operator(\))
         pre_constant(self)operator(.)ident(failIf)operator(()string<delimiter(')content( )delimiter(')> keyword(in) ident(lxtext)operator(\))
 
-    keyword(def) ident(test_keywordcase)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_keywordcase)operator(()pre_constant(self)operator(\))operator(:)
         ident(lx) operator(=) ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))
         ident(lx)operator(.)ident(add_filter)operator(()string<delimiter(')content(keywordcase)delimiter(')>operator(,) ident(case)operator(=)string<delimiter(')content(capitalize)delimiter(')>operator(\))
         ident(text) operator(=) predefined(open)operator(()ident(TESTFILE)operator(,) string<delimiter(')content(rb)delimiter(')>operator(\))operator(.)ident(read)operator(()operator(\))operator(.)ident(decode)operator(()string<delimiter(')content(utf-8)delimiter(')>operator(\))
         ident(lxtext) operator(=) string<delimiter(')delimiter(')>operator(.)ident(join)operator(()operator([)ident(t)operator([)integer(1)operator(]) keyword(for) ident(t) keyword(in) predefined(list)operator(()ident(lx)operator(.)ident(get_tokens)operator(()ident(text)operator(\))operator(\))operator(])operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(')content(Def)delimiter(')> keyword(in) ident(lxtext) keyword(and) string<delimiter(')content(Class)delimiter(')> keyword(in) ident(lxtext)operator(\))
 
-    keyword(def) ident(test_codetag)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_codetag)operator(()pre_constant(self)operator(\))operator(:)
         ident(lx) operator(=) ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))
         ident(lx)operator(.)ident(add_filter)operator(()string<delimiter(')content(codetagify)delimiter(')>operator(\))
         ident(text) operator(=) string<modifier(u)delimiter(')content(# BUG: text)delimiter(')>
@@ -24911,7 +24911,7 @@ keyword(class) ident(FiltersTest)operator(()ident(unittest)operator(.)ident(Test
         pre_constant(self)operator(.)ident(assertEquals)operator(()string<delimiter(')content(# )delimiter(')>operator(,) ident(tokens)operator([)integer(0)operator(])operator([)integer(1)operator(])operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()string<delimiter(')content(BUG)delimiter(')>operator(,) ident(tokens)operator([)integer(1)operator(])operator([)integer(1)operator(])operator(\))
 
-    keyword(def) ident(test_codetag_boundary)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_codetag_boundary)operator(()pre_constant(self)operator(\))operator(:)
         comment(# http://dev.pocoo.org/projects/pygments/ticket/368)
         ident(lx) operator(=) ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))
         ident(lx)operator(.)ident(add_filter)operator(()string<delimiter(')content(codetagify)delimiter(')>operator(\))
@@ -24920,9 +24920,9 @@ keyword(class) ident(FiltersTest)operator(()ident(unittest)operator(.)ident(Test
         pre_constant(self)operator(.)ident(assertEquals)operator(()string<delimiter(')content(# DEBUG: text)delimiter(')>operator(,) ident(tokens)operator([)integer(0)operator(])operator([)integer(1)operator(])operator(\))
 
 
-keyword(class) ident(FormattersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(FormattersTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_public_api)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_public_api)operator(()pre_constant(self)operator(\))operator(:)
         ident(a) operator(=) pre_constant(self)operator(.)ident(assert_)
         ident(ae) operator(=) pre_constant(self)operator(.)ident(assertEquals)
         ident(ts) operator(=) predefined(list)operator(()ident(lexers)operator(.)ident(PythonLexer)operator(()operator(\))operator(.)ident(get_tokens)operator(()string<delimiter(")content(def f(\): pass)delimiter(")>operator(\))operator(\))
@@ -24949,7 +24949,7 @@ keyword(class) ident(FormattersTest)operator(()ident(unittest)operator(.)ident(T
                 keyword(pass)
             ident(inst)operator(.)ident(format)operator(()ident(ts)operator(,) ident(out)operator(\))
 
-    keyword(def) ident(test_encodings)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_encodings)operator(()pre_constant(self)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(formatters) keyword(import) ident(HtmlFormatter)
 
         comment(# unicode output)
@@ -24969,11 +24969,11 @@ keyword(class) ident(FormattersTest)operator(()ident(unittest)operator(.)ident(T
         ident(tokens) operator(=) operator([)operator(()ident(Text)operator(,) string<modifier(u)delimiter(")content(ä)delimiter(")>operator(\))operator(])
         pre_constant(self)operator(.)ident(assert_)operator(()string<modifier(u)delimiter(")content(ä)delimiter(")>operator(.)ident(encode)operator(()string<delimiter(")content(utf8)delimiter(")>operator(\)) keyword(in) ident(format)operator(()ident(tokens)operator(,) ident(fmt)operator(\))operator(\))
 
-    keyword(def) ident(test_styles)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_styles)operator(()pre_constant(self)operator(\))operator(:)
         keyword(from) ident(pygments)operator(.)ident(formatters) keyword(import) ident(HtmlFormatter)
         ident(fmt) operator(=) ident(HtmlFormatter)operator(()ident(style)operator(=)string<delimiter(")content(pastie)delimiter(")>operator(\))
 
-    keyword(def) ident(test_unicode_handling)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_unicode_handling)operator(()pre_constant(self)operator(\))operator(:)
         comment(# test that the formatter supports encoding and Unicode)
         ident(tokens) operator(=) predefined(list)operator(()ident(lexers)operator(.)ident(PythonLexer)operator(()ident(encoding)operator(=)string<delimiter(')content(utf-8)delimiter(')>operator(\))operator(.)
                       ident(get_tokens)operator(()string<delimiter(")content(def f(\): 'ä')delimiter(")>operator(\))operator(\))
@@ -24999,7 +24999,7 @@ keyword(class) ident(FormattersTest)operator(()ident(unittest)operator(.)ident(T
                 ident(out) operator(=) ident(format)operator(()ident(tokens)operator(,) ident(inst)operator(\))
                 pre_constant(self)operator(.)ident(assert_)operator(()predefined(type)operator(()ident(out)operator(\)) keyword(is) predefined(bytes)operator(,) string<delimiter(')content(%s: %r)delimiter(')> operator(%) operator(()ident(formatter)operator(,) ident(out)operator(\))operator(\))
 
-    keyword(def) ident(test_get_formatters)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_get_formatters)operator(()pre_constant(self)operator(\))operator(:)
         ident(a) operator(=) pre_constant(self)operator(.)ident(assert_)
         ident(ae) operator(=) pre_constant(self)operator(.)ident(assertEquals)
         comment(# test that the formatters functions work)
@@ -25026,12 +25026,12 @@ keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Text)
 keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(CLexer)
 
 
-keyword(class) ident(CLexerTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(CLexerTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(setUp)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(setUp)operator(()pre_constant(self)operator(\))operator(:)
         pre_constant(self)operator(.)ident(lexer) operator(=) ident(CLexer)operator(()operator(\))
 
-    keyword(def) ident(testNumbers)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(testNumbers)operator(()pre_constant(self)operator(\))operator(:)
         ident(code) operator(=) string<delimiter(')content(42 23.42 23. .42 023 0xdeadbeef 23e+42 42e-23)delimiter(')>
         ident(wanted) operator(=) operator([)operator(])
         keyword(for) ident(item) keyword(in) predefined(zip)operator(()operator([)ident(Number)operator(.)ident(Integer)operator(,) ident(Number)operator(.)ident(Float)operator(,) ident(Number)operator(.)ident(Float)operator(,)
@@ -25068,7 +25068,7 @@ keyword(import) ident(support)
 ident(TESTFILE)operator(,) ident(TESTDIR) operator(=) ident(support)operator(.)ident(location)operator(()ident(__file__)operator(\))
 
 
-keyword(def) ident(run_cmdline)operator(()operator(*)ident(args)operator(\))operator(:)
+keyword(def) method(run_cmdline)operator(()operator(*)ident(args)operator(\))operator(:)
     ident(saved_stdout) operator(=) ident(sys)operator(.)ident(stdout)
     ident(saved_stderr) operator(=) ident(sys)operator(.)ident(stderr)
     ident(new_stdout) operator(=) ident(sys)operator(.)ident(stdout) operator(=) ident(StringIO)operator(.)ident(StringIO)operator(()operator(\))
@@ -25081,9 +25081,9 @@ keyword(def) ident(run_cmdline)operator(()operator(*)ident(args)operator(\))oper
     keyword(return) operator(()ident(ret)operator(,) ident(new_stdout)operator(.)ident(getvalue)operator(()operator(\))operator(,) ident(new_stderr)operator(.)ident(getvalue)operator(()operator(\))operator(\))
 
 
-keyword(class) ident(CmdLineTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(CmdLineTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_L_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_L_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-L)delimiter(")>operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(")content(Lexers)delimiter(")> keyword(in) ident(o) keyword(and) string<delimiter(")content(Formatters)delimiter(")> keyword(in) ident(o) keyword(and)
@@ -25094,7 +25094,7 @@ keyword(class) ident(CmdLineTest)operator(()ident(unittest)operator(.)ident(Test
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-L)delimiter(")>operator(,) string<delimiter(")content(lexers)delimiter(")>operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
 
-    keyword(def) ident(test_O_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_O_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(filename) operator(=) ident(TESTFILE)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-Ofull=1,linenos=true,foo=bar)delimiter(")>operator(,)
                               string<delimiter(")content(-fhtml)delimiter(")>operator(,) ident(filename)operator(\))
@@ -25102,14 +25102,14 @@ keyword(class) ident(CmdLineTest)operator(()ident(unittest)operator(.)ident(Test
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(")content(<html)delimiter(")> keyword(in) ident(o)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(')content(class="linenos")delimiter(')> keyword(in) ident(o)operator(\))
 
-    keyword(def) ident(test_P_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_P_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(filename) operator(=) ident(TESTFILE)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-Pfull)delimiter(")>operator(,) string<delimiter(")content(-Ptitle=foo, bar=baz=,)delimiter(")>operator(,)
                               string<delimiter(")content(-fhtml)delimiter(")>operator(,) ident(filename)operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(")content(<title>foo, bar=baz=,</title>)delimiter(")> keyword(in) ident(o)operator(\))
 
-    keyword(def) ident(test_F_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_F_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(filename) operator(=) ident(TESTFILE)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-Fhighlight:tokentype=Name.Blubb,)delimiter(")>
                               string<delimiter(")content(names=TESTFILE filename)delimiter(")>operator(,)
@@ -25117,22 +25117,22 @@ keyword(class) ident(CmdLineTest)operator(()ident(unittest)operator(.)ident(Test
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(')content(<span class="n-Blubb)delimiter(')> keyword(in) ident(o)operator(\))
 
-    keyword(def) ident(test_H_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_H_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-H)delimiter(")>operator(,) string<delimiter(")content(formatter)delimiter(")>operator(,) string<delimiter(")content(html)delimiter(")>operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(')content(HTML)delimiter(')> keyword(in) ident(o)operator(\))
 
-    keyword(def) ident(test_S_opt)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_S_opt)operator(()pre_constant(self)operator(\))operator(:)
         ident(c)operator(,) ident(o)operator(,) ident(e) operator(=) ident(run_cmdline)operator(()string<delimiter(")content(-S)delimiter(")>operator(,) string<delimiter(")content(default)delimiter(")>operator(,) string<delimiter(")content(-f)delimiter(")>operator(,) string<delimiter(")content(html)delimiter(")>operator(,) string<delimiter(")content(-O)delimiter(")>operator(,) string<delimiter(")content(linenos=1)delimiter(")>operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(c)operator(,) integer(0)operator(\))
 
-    keyword(def) ident(test_invalid_opts)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_invalid_opts)operator(()pre_constant(self)operator(\))operator(:)
         keyword(for) ident(opts) keyword(in) operator([)operator(()string<delimiter(")content(-L)delimiter(")>operator(,) string<delimiter(")content(-lpy)delimiter(")>operator(\))operator(,) operator(()string<delimiter(")content(-L)delimiter(")>operator(,) string<delimiter(")content(-fhtml)delimiter(")>operator(\))operator(,) operator(()string<delimiter(")content(-L)delimiter(")>operator(,) string<delimiter(")content(-Ox)delimiter(")>operator(\))operator(,)
                      operator(()string<delimiter(")content(-a)delimiter(")>operator(,)operator(\))operator(,) operator(()string<delimiter(")content(-Sst)delimiter(")>operator(,) string<delimiter(")content(-lpy)delimiter(")>operator(\))operator(,) operator(()string<delimiter(")content(-H)delimiter(")>operator(,)operator(\))operator(,)
                      operator(()string<delimiter(")content(-H)delimiter(")>operator(,) string<delimiter(")content(formatter)delimiter(")>operator(\))operator(,)operator(])operator(:)
             pre_constant(self)operator(.)ident(assert_)operator(()ident(run_cmdline)operator(()operator(*)ident(opts)operator(\))operator([)integer(0)operator(]) operator(==) integer(2)operator(\))
 
-    keyword(def) ident(test_normal)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_normal)operator(()pre_constant(self)operator(\))operator(:)
         comment(# test that cmdline gives the same output as library api)
         keyword(from) ident(pygments)operator(.)ident(lexers) keyword(import) ident(PythonLexer)
         keyword(from) ident(pygments)operator(.)ident(formatters) keyword(import) ident(HtmlFormatter)
@@ -25169,7 +25169,7 @@ keyword(from) ident(pygments)operator(.)ident(util) keyword(import) ident(ClassN
 
 
 comment(# generate methods)
-keyword(def) ident(test_example_files)operator(()operator(\))operator(:)
+keyword(def) method(test_example_files)operator(()operator(\))operator(:)
     ident(testdir) operator(=) ident(os)operator(.)ident(path)operator(.)ident(dirname)operator(()ident(__file__)operator(\))
     keyword(for) ident(fn) keyword(in) ident(os)operator(.)ident(listdir)operator(()ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(testdir)operator(,) string<delimiter(')content(examplefiles)delimiter(')>operator(\))operator(\))operator(:)
         ident(absfn) operator(=) ident(os)operator(.)ident(path)operator(.)ident(join)operator(()ident(testdir)operator(,) string<delimiter(')content(examplefiles)delimiter(')>operator(,) ident(fn)operator(\))
@@ -25191,7 +25191,7 @@ keyword(def) ident(test_example_files)operator(()operator(\))operator(:)
                 keyword(raise) exception(AssertionError)operator(()string<delimiter(')content(no lexer found for file %r)delimiter(')> operator(%) ident(fn)operator(\))
         keyword(yield) ident(check_lexer)operator(,) ident(lx)operator(,) ident(absfn)
 
-keyword(def) ident(check_lexer)operator(()ident(lx)operator(,) ident(absfn)operator(\))operator(:)
+keyword(def) method(check_lexer)operator(()ident(lx)operator(,) ident(absfn)operator(\))operator(:)
     ident(text) operator(=) predefined(open)operator(()ident(absfn)operator(,) string<delimiter(')content(rb)delimiter(')>operator(\))operator(.)ident(read)operator(()operator(\))
     ident(text) operator(=) ident(text)operator(.)ident(strip)operator(()ident(b)operator(()string<delimiter(')char(\\n)delimiter(')>operator(\))operator(\)) operator(+) ident(b)operator(()string<delimiter(')char(\\n)delimiter(')>operator(\))
     keyword(try)operator(:)
@@ -25231,8 +25231,8 @@ ident(TESTFILE)operator(,) ident(TESTDIR) operator(=) ident(support)operator(.)i
 
 ident(tokensource) operator(=) predefined(list)operator(()ident(PythonLexer)operator(()ident(encoding)operator(=)string<delimiter(')content(utf-8)delimiter(')>operator(\))operator(.)ident(get_tokens)operator(()predefined(open)operator(()ident(TESTFILE)operator(\))operator(.)ident(read)operator(()operator(\))operator(\))operator(\))
 
-keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
-    keyword(def) ident(test_correct_output)operator(()pre_constant(self)operator(\))operator(:)
+keyword(class) class(HtmlFormatterTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+    keyword(def) method(test_correct_output)operator(()pre_constant(self)operator(\))operator(:)
         ident(hfmt) operator(=) ident(HtmlFormatter)operator(()ident(nowrap)operator(=)pre_constant(True)operator(\))
         ident(houtfile) operator(=) ident(StringIO)operator(.)ident(StringIO)operator(()operator(\))
         ident(hfmt)operator(.)ident(format)operator(()ident(tokensource)operator(,) ident(houtfile)operator(\))
@@ -25245,7 +25245,7 @@ keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)iden
         ident(escaped_text) operator(=) ident(escape_html)operator(()ident(noutfile)operator(.)ident(getvalue)operator(()operator(\))operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(stripped_html)operator(,) ident(escaped_text)operator(\))
 
-    keyword(def) ident(test_external_css)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_external_css)operator(()pre_constant(self)operator(\))operator(:)
         comment(# test correct behavior)
         comment(# CSS should be in /tmp directory)
         ident(fmt1) operator(=) ident(HtmlFormatter)operator(()ident(full)operator(=)pre_constant(True)operator(,) ident(cssfile)operator(=)string<delimiter(')content(fmt1.css)delimiter(')>operator(,) ident(outencoding)operator(=)string<delimiter(')content(utf-8)delimiter(')>operator(\))
@@ -25269,7 +25269,7 @@ keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)iden
         keyword(except) exception(OSError)operator(:)
             keyword(pass)
 
-    keyword(def) ident(test_all_options)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_all_options)operator(()pre_constant(self)operator(\))operator(:)
         keyword(for) ident(optdict) keyword(in) operator([)predefined(dict)operator(()ident(nowrap)operator(=)pre_constant(True)operator(\))operator(,)
                         predefined(dict)operator(()ident(linenos)operator(=)pre_constant(True)operator(\))operator(,)
                         predefined(dict)operator(()ident(linenos)operator(=)pre_constant(True)operator(,) ident(full)operator(=)pre_constant(True)operator(\))operator(,)
@@ -25279,7 +25279,7 @@ keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)iden
             ident(fmt) operator(=) ident(HtmlFormatter)operator(()operator(**)ident(optdict)operator(\))
             ident(fmt)operator(.)ident(format)operator(()ident(tokensource)operator(,) ident(outfile)operator(\))
 
-    keyword(def) ident(test_valid_output)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_valid_output)operator(()pre_constant(self)operator(\))operator(:)
         comment(# test all available wrappers)
         ident(fmt) operator(=) ident(HtmlFormatter)operator(()ident(full)operator(=)pre_constant(True)operator(,) ident(linenos)operator(=)pre_constant(True)operator(,) ident(noclasses)operator(=)pre_constant(True)operator(,)
                             ident(outencoding)operator(=)string<delimiter(')content(utf-8)delimiter(')>operator(\))
@@ -25306,7 +25306,7 @@ keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)iden
 
         ident(os)operator(.)ident(unlink)operator(()ident(pathname)operator(\))
 
-    keyword(def) ident(test_get_style_defs)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_get_style_defs)operator(()pre_constant(self)operator(\))operator(:)
         ident(fmt) operator(=) ident(HtmlFormatter)operator(()operator(\))
         ident(sd) operator(=) ident(fmt)operator(.)ident(get_style_defs)operator(()operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(sd)operator(.)ident(startswith)operator(()string<delimiter(')content(.)delimiter(')>operator(\))operator(\))
@@ -25320,7 +25320,7 @@ keyword(class) ident(HtmlFormatterTest)operator(()ident(unittest)operator(.)iden
         ident(fl) operator(=) ident(sd)operator(.)ident(splitlines)operator(()operator(\))operator([)integer(0)operator(])
         pre_constant(self)operator(.)ident(assert_)operator(()string<delimiter(')content(.bar)delimiter(')> keyword(in) ident(fl) keyword(and) string<delimiter(')content(.baz)delimiter(')> keyword(in) ident(fl)operator(\))
 
-    keyword(def) ident(test_unicode_options)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_unicode_options)operator(()pre_constant(self)operator(\))operator(:)
         ident(fmt) operator(=) ident(HtmlFormatter)operator(()ident(title)operator(=)string<modifier(u)delimiter(')content(Föö)delimiter(')>operator(,)
                             ident(cssclass)operator(=)string<modifier(u)delimiter(')content(bär)delimiter(')>operator(,)
                             ident(cssstyles)operator(=)string<modifier(u)delimiter(')content(div:before { content: )char(\\')content(bäz)char(\\')content( })delimiter(')>operator(,)
@@ -25350,9 +25350,9 @@ keyword(import) ident(support)
 ident(TESTFILE)operator(,) ident(TESTDIR) operator(=) ident(support)operator(.)ident(location)operator(()ident(__file__)operator(\))
 
 
-keyword(class) ident(LatexFormatterTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(LatexFormatterTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_valid_output)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_valid_output)operator(()pre_constant(self)operator(\))operator(:)
         ident(tokensource) operator(=) predefined(list)operator(()ident(PythonLexer)operator(()operator(\))operator(.)ident(get_tokens)operator(()predefined(open)operator(()ident(TESTFILE)operator(\))operator(.)ident(read)operator(()operator(\))operator(\))operator(\))
         ident(fmt) operator(=) ident(LatexFormatter)operator(()ident(full)operator(=)pre_constant(True)operator(,) ident(encoding)operator(=)string<delimiter(')content(latin1)delimiter(')>operator(\))
 
@@ -25396,7 +25396,7 @@ keyword(import) ident(unittest)
 keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(Text)
 keyword(from) ident(pygments)operator(.)ident(lexer) keyword(import) ident(RegexLexer)
 
-keyword(class) ident(TestLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(TestLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     string<delimiter(""")content(Test tuple state transitions including #pop.)delimiter(""")>
     ident(tokens) operator(=) operator({)
         string<delimiter(')content(root)delimiter(')>operator(:) operator([)
@@ -25412,8 +25412,8 @@ keyword(class) ident(TestLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(TupleTransTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
-    keyword(def) ident(test)operator(()pre_constant(self)operator(\))operator(:)
+keyword(class) class(TupleTransTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+    keyword(def) method(test)operator(()pre_constant(self)operator(\))operator(:)
         ident(lx) operator(=) ident(TestLexer)operator(()operator(\))
         ident(toks) operator(=) predefined(list)operator(()ident(lx)operator(.)ident(get_tokens_unprocessed)operator(()string<delimiter(')content(abcde)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(toks)operator(,)
@@ -25435,9 +25435,9 @@ keyword(import) ident(sys)
 keyword(from) ident(pygments) keyword(import) ident(token)
 
 
-keyword(class) ident(TokenTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(TokenTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_tokentype)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_tokentype)operator(()pre_constant(self)operator(\))operator(:)
         ident(e) operator(=) pre_constant(self)operator(.)ident(assertEquals)
         ident(r) operator(=) pre_constant(self)operator(.)ident(assertRaises)
 
@@ -25447,7 +25447,7 @@ keyword(class) ident(TokenTest)operator(()ident(unittest)operator(.)ident(TestCa
 
         ident(e)operator(()ident(t)operator(.)ident(__class__)operator(,) ident(token)operator(.)ident(_TokenType)operator(\))
 
-    keyword(def) ident(test_functions)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_functions)operator(()pre_constant(self)operator(\))operator(:)
         pre_constant(self)operator(.)ident(assert_)operator(()ident(token)operator(.)ident(is_token_subtype)operator(()ident(token)operator(.)ident(String)operator(,) ident(token)operator(.)ident(String)operator(\))operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(token)operator(.)ident(is_token_subtype)operator(()ident(token)operator(.)ident(String)operator(,) ident(token)operator(.)ident(Literal)operator(\))operator(\))
         pre_constant(self)operator(.)ident(failIf)operator(()ident(token)operator(.)ident(is_token_subtype)operator(()ident(token)operator(.)ident(Literal)operator(,) ident(token)operator(.)ident(String)operator(\))operator(\))
@@ -25456,7 +25456,7 @@ keyword(class) ident(TokenTest)operator(()ident(unittest)operator(.)ident(TestCa
         pre_constant(self)operator(.)ident(assert_)operator(()ident(token)operator(.)ident(string_to_tokentype)operator(()string<delimiter(')delimiter(')>operator(\)) keyword(is) ident(token)operator(.)ident(Token)operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(token)operator(.)ident(string_to_tokentype)operator(()string<delimiter(')content(String)delimiter(')>operator(\)) keyword(is) ident(token)operator(.)ident(String)operator(\))
 
-    keyword(def) ident(test_sanity_check)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_sanity_check)operator(()pre_constant(self)operator(\))operator(:)
         ident(stp) operator(=) ident(token)operator(.)ident(STANDARD_TYPES)operator(.)ident(copy)operator(()operator(\))
         ident(stp)operator([)ident(token)operator(.)ident(Token)operator(]) operator(=) string<delimiter(')content(---)delimiter(')> comment(# Token and Text do conflict, that is okay)
         ident(t) operator(=) operator({)operator(})
@@ -25476,7 +25476,7 @@ keyword(import) ident(unittest)
 keyword(from) ident(pygments)operator(.)ident(lexer) keyword(import) ident(using)operator(,) ident(bygroups)operator(,) ident(this)operator(,) ident(RegexLexer)
 keyword(from) ident(pygments)operator(.)ident(token) keyword(import) ident(String)operator(,) ident(Text)operator(,) ident(Keyword)
 
-keyword(class) ident(TestLexer)operator(()ident(RegexLexer)operator(\))operator(:)
+keyword(class) class(TestLexer)operator(()ident(RegexLexer)operator(\))operator(:)
     ident(tokens) operator(=) operator({)
         string<delimiter(')content(root)delimiter(')>operator(:) operator([)
             operator(()string<modifier(r)delimiter(')content(#.*)delimiter(')>operator(,) ident(using)operator(()ident(this)operator(,) ident(state)operator(=)string<delimiter(')content(invalid)delimiter(')>operator(\))operator(\))operator(,)
@@ -25488,14 +25488,14 @@ keyword(class) ident(TestLexer)operator(()ident(RegexLexer)operator(\))operator(
         operator(])operator(,)
     operator(})
 
-keyword(class) ident(UsingStateTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
-    keyword(def) ident(test_basic)operator(()pre_constant(self)operator(\))operator(:)
+keyword(class) class(UsingStateTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+    keyword(def) method(test_basic)operator(()pre_constant(self)operator(\))operator(:)
         ident(expected) operator(=) operator([)operator(()ident(Text)operator(,) string<delimiter(')content(a)delimiter(')>operator(\))operator(,) operator(()ident(String)operator(,) string<delimiter(')content(")delimiter(')>operator(\))operator(,) operator(()ident(Keyword)operator(,) string<delimiter(')content(bcd)delimiter(')>operator(\))operator(,)
                     operator(()ident(String)operator(,) string<delimiter(')content(")delimiter(')>operator(\))operator(,) operator(()ident(Text)operator(,) string<delimiter(')content(e)char(\\n)delimiter(')>operator(\))operator(])
         ident(t) operator(=) predefined(list)operator(()ident(TestLexer)operator(()operator(\))operator(.)ident(get_tokens)operator(()string<delimiter(')content(a"bcd"e)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(t)operator(,) ident(expected)operator(\))
-    keyword(def) ident(test_error)operator(()pre_constant(self)operator(\))operator(:)
-        keyword(def) ident(gen)operator(()operator(\))operator(:)
+    keyword(def) method(test_error)operator(()pre_constant(self)operator(\))operator(:)
+        keyword(def) method(gen)operator(()operator(\))operator(:)
             ident(x) operator(=) predefined(list)operator(()ident(TestLexer)operator(()operator(\))operator(.)ident(get_tokens)operator(()string<delimiter(')content(#a)delimiter(')>operator(\))operator(\))
         comment(#XXX: should probably raise a more specific exception if the state)
         comment(#     doesn't exist.)
@@ -25518,9 +25518,9 @@ keyword(import) ident(os)
 keyword(from) ident(pygments) keyword(import) ident(util)
 
 
-keyword(class) ident(UtilTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
+keyword(class) class(UtilTest)operator(()ident(unittest)operator(.)ident(TestCase)operator(\))operator(:)
 
-    keyword(def) ident(test_getoptions)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_getoptions)operator(()pre_constant(self)operator(\))operator(:)
         ident(raises) operator(=) pre_constant(self)operator(.)ident(assertRaises)
         ident(equals) operator(=) pre_constant(self)operator(.)ident(assertEquals)
 
@@ -25540,14 +25540,14 @@ keyword(class) ident(UtilTest)operator(()ident(unittest)operator(.)ident(TestCas
         ident(raises)operator(()ident(util)operator(.)ident(OptionError)operator(,) ident(util)operator(.)ident(get_list_opt)operator(,) operator({)operator(})operator(,) string<delimiter(')content(a)delimiter(')>operator(,) integer(1)operator(\))
 
 
-    keyword(def) ident(test_docstring_headline)operator(()pre_constant(self)operator(\))operator(:)
-        keyword(def) ident(f1)operator(()operator(\))operator(:)
+    keyword(def) method(test_docstring_headline)operator(()pre_constant(self)operator(\))operator(:)
+        keyword(def) method(f1)operator(()operator(\))operator(:)
             string<delimiter(""")content(
 )content(            docstring headline)content(
 )content(
 )content(            other text)content(
 )content(            )delimiter(""")>
-        keyword(def) ident(f2)operator(()operator(\))operator(:)
+        keyword(def) method(f2)operator(()operator(\))operator(:)
             string<delimiter(""")content(
 )content(            docstring)content(
 )content(            headline)content(
@@ -25558,14 +25558,14 @@ keyword(class) ident(UtilTest)operator(()ident(unittest)operator(.)ident(TestCas
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(util)operator(.)ident(docstring_headline)operator(()ident(f1)operator(\))operator(,) string<delimiter(")content(docstring headline)delimiter(")>operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(util)operator(.)ident(docstring_headline)operator(()ident(f2)operator(\))operator(,) string<delimiter(")content(docstring headline)delimiter(")>operator(\))
 
-    keyword(def) ident(test_analysator)operator(()pre_constant(self)operator(\))operator(:)
-        keyword(class) ident(X)operator(()predefined(object)operator(\))operator(:)
-            keyword(def) ident(analyse)operator(()ident(text)operator(\))operator(:)
+    keyword(def) method(test_analysator)operator(()pre_constant(self)operator(\))operator(:)
+        keyword(class) class(X)operator(()predefined(object)operator(\))operator(:)
+            keyword(def) method(analyse)operator(()ident(text)operator(\))operator(:)
                 keyword(return) float(0.5)
             ident(analyse) operator(=) ident(util)operator(.)ident(make_analysator)operator(()ident(analyse)operator(\))
         pre_constant(self)operator(.)ident(assertEquals)operator(()ident(X)operator(.)ident(analyse)operator(()string<delimiter(')delimiter(')>operator(\))operator(,) float(0.5)operator(\))
 
-    keyword(def) ident(test_shebang_matches)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_shebang_matches)operator(()pre_constant(self)operator(\))operator(:)
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(shebang_matches)operator(()string<delimiter(')content(#!/usr/bin/env python)delimiter(')>operator(,) string<modifier(r)delimiter(')content(python(2)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(shebang_matches)operator(()string<delimiter(')content(#!/usr/bin/python2.4)delimiter(')>operator(,) string<modifier(r)delimiter(')content(python(2)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(shebang_matches)operator(()string<delimiter(')content(#!/usr/bin/startsomethingwith python)delimiter(')>operator(,)
@@ -25577,7 +25577,7 @@ keyword(class) ident(UtilTest)operator(()ident(unittest)operator(.)ident(TestCas
         pre_constant(self)operator(.)ident(failIf)operator(()ident(util)operator(.)ident(shebang_matches)operator(()string<delimiter(')content(#!/usr/bin/python/ruby)delimiter(')>operator(,) string<modifier(r)delimiter(')content(python(2)content(\\.)content(\\d)content(\)?)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(failIf)operator(()ident(util)operator(.)ident(shebang_matches)operator(()string<delimiter(')content(#!)delimiter(')>operator(,) string<modifier(r)delimiter(')content(python)delimiter(')>operator(\))operator(\))
 
-    keyword(def) ident(test_doctype_matches)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_doctype_matches)operator(()pre_constant(self)operator(\))operator(:)
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(doctype_matches)operator(()string<delimiter(')content(<!DOCTYPE html PUBLIC "a"> <html>)delimiter(')>operator(,)
                                           string<delimiter(')content(html.*)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(failIf)operator(()ident(util)operator(.)ident(doctype_matches)operator(()string<delimiter(')content(<?xml ?> <DOCTYPE html PUBLIC "a"> <html>)delimiter(')>operator(,)
@@ -25585,7 +25585,7 @@ keyword(class) ident(UtilTest)operator(()ident(unittest)operator(.)ident(TestCas
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(html_doctype_matches)operator(()
             string<delimiter(')content(<?xml ?><!DOCTYPE html PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN">)delimiter(')>operator(\))operator(\))
 
-    keyword(def) ident(test_xml)operator(()pre_constant(self)operator(\))operator(:)
+    keyword(def) method(test_xml)operator(()pre_constant(self)operator(\))operator(:)
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(looks_like_xml)operator(()
             string<delimiter(')content(<?xml ?><!DOCTYPE html PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN">)delimiter(')>operator(\))operator(\))
         pre_constant(self)operator(.)ident(assert_)operator(()ident(util)operator(.)ident(looks_like_xml)operator(()string<delimiter(')content(<html xmlns>abc</html>)delimiter(')>operator(\))operator(\))
author	murphy <murphy@rubychan.de>	2009-06-13 01:25:38 +0000
committer	murphy <murphy@rubychan.de>	2009-06-13 01:25:38 +0000
commit	811e389a2b1c1967178ee5797c8e0934bfe83a29 (patch)
tree	8629253c87601360b1b312d87dd4c59e60e559e7
parent	6287a02ff06e5f3af73e031117ab3876f1db348a (diff)
download	coderay-811e389a2b1c1967178ee5797c8e0934bfe83a29.tar.gz