diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CHANGES | 19 | ||||
| -rw-r--r-- | docs/src/lexerdevelopment.txt | 52 | ||||
| -rwxr-xr-x | external/lasso-builtins-generator-9.lasso | 111 | ||||
| -rw-r--r-- | pygments/lexers/_lassobuiltins.py | 3184 | ||||
| -rw-r--r-- | pygments/lexers/_mapping.py | 1 | ||||
| -rw-r--r-- | pygments/lexers/_robotframeworklexer.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/_stan_builtins.py | 226 | ||||
| -rw-r--r-- | pygments/lexers/agile.py | 9 | ||||
| -rw-r--r-- | pygments/lexers/asm.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/functional.py | 7 | ||||
| -rw-r--r-- | pygments/lexers/jvm.py | 25 | ||||
| -rw-r--r-- | pygments/lexers/math.py | 35 | ||||
| -rw-r--r-- | pygments/lexers/other.py | 10 | ||||
| -rw-r--r-- | pygments/lexers/templates.py | 12 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 68 | ||||
| -rw-r--r-- | tests/examplefiles/example.ceylon | 39 | ||||
| -rw-r--r-- | tests/examplefiles/example.clay | 33 | ||||
| -rw-r--r-- | tests/examplefiles/example.stan | 161 |
19 files changed, 2059 insertions, 1938 deletions
@@ -64,6 +64,7 @@ Other contributors, listed alphabetically, are: * Igor Kalnitsky -- vhdl lexer * Pekka Klärck -- Robot Framework lexer * Eric Knibbe -- Lasso lexer +* Stepan Koltsov -- Clay lexer * Adam Koprowski -- Opa lexer * Benjamin Kowarsch -- Modula-2 lexer * Alexander Kriegisch -- Kconfig and AspectJ lexers @@ -6,6 +6,25 @@ Issue numbers refer to the tracker at pull request numbers to the requests at <http://bitbucket.org/birkenfeld/pygments-main/pull-requests/merged>. +Version 1.7 +----------- +(under development) + +- Lexers added: + + * Clay (PR#184) + +- Python 3 lexer: add new exceptions from PEP 3151. + +- Opa lexer: add new keywords (PR#170). + +- Julia lexer: add keywords and underscore-separated number + literals (PR#176). + +- Lasso lexer: fix method highlighting, update builtins. Fix + guessing so that plain XML isn't always taken as Lasso (PR#163). + + Version 1.6 ----------- (released Feb 3, 2013) diff --git a/docs/src/lexerdevelopment.txt b/docs/src/lexerdevelopment.txt index 6ffc4b72..730a08b2 100644 --- a/docs/src/lexerdevelopment.txt +++ b/docs/src/lexerdevelopment.txt @@ -83,6 +83,58 @@ If no rule matches at the current position, the current char is emitted as an 1. +Adding and testing a new lexer +============================== + +To make pygments aware of your new lexer, you have to perform the following +steps: + +First, change to the current directory containing the pygments source code: + +.. sourcecode:: console + + $ cd .../pygments-main + +Next, make sure the lexer is known from outside of the module. All modules in +the ``pygments.lexers`` specify ``__all__``. For example, ``other.py`` sets: + +.. sourcecode:: python + + __all__ = ['BrainfuckLexer', 'BefungeLexer', ...] + +Simply add the name of your lexer class to this list. + +Finally the lexer can be made publically known by rebuilding the lexer +mapping: + +.. sourcecode:: console + + $ make mapfiles + +To test the new lexer, store an example file with the proper extension in +``tests/examplefiles``. For example, to test your ``DiffLexer``, add a +``tests/examplefiles/example.diff`` containing a sample diff output. + +Now you can use pygmentize to render your example to HTML: + +.. sourcecode:: console + + $ ./pygmentize -O full -f html -o /tmp/example.html tests/examplefiles/example.diff + +Note that this explicitely calls the ``pygmentize`` in the current directory +by preceding it with ``./``. This ensures your modifications are used. +Otherwise a possibly already installed, unmodified version without your new +lexer would have been called from the system search path (``$PATH``). + +To view the result, open ``/tmp/example.html`` in your browser. + +Once the example renders as expected, you should run the complete test suite: + +.. sourcecode:: console + + $ make test + + Regex Flags =========== diff --git a/external/lasso-builtins-generator-9.lasso b/external/lasso-builtins-generator-9.lasso index bea8b2ab..6a619106 100755 --- a/external/lasso-builtins-generator-9.lasso +++ b/external/lasso-builtins-generator-9.lasso @@ -5,13 +5,19 @@ This is the shell script that was used to extract Lasso 9's built-in keywords and generate most of the _lassobuiltins.py file. When run, it creates a file - named "lassobuiltins-9.py" containing the types, traits, and methods of the - currently-installed version of Lasso 9. + named "lassobuiltins-9.py" containing the types, traits, methods, and members + of the currently-installed version of Lasso 9. - A partial list of keywords in Lasso 8 can be generated with this code: + A list of tags in Lasso 8 can be generated with this code: <?LassoScript - local('l8tags' = list); + local('l8tags' = list, + 'l8libs' = array('Cache','ChartFX','Client','Database','File','HTTP', + 'iCal','Lasso','Link','List','PDF','Response','Stock','String', + 'Thread','Valid','WAP','XML')); + iterate(#l8libs, local('library')); + local('result' = namespace_load(#library)); + /iterate; iterate(tags_list, local('i')); #l8tags->insert(string_removeleading(#i, -pattern='_global_')); /iterate; @@ -30,9 +36,12 @@ local(f) = file("lassobuiltins-9.py") #f->writeString('# -*- coding: utf-8 -*- """ pygments.lexers._lassobuiltins - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Built-in Lasso types, traits, methods, and members. - Built-in Lasso types, traits, and methods. + :copyright: Copyright 2006-'+date->year+' by the Pygments team, see AUTHORS. + :license: BSD, see LICENSE for details. """ ') @@ -42,16 +51,16 @@ lcapi_loadModules // Load all of the libraries from builtins and lassoserver // This forces all possible available types and methods to be registered local(srcs = - tie( - dir(sys_masterHomePath + 'LassoLibraries/builtins/')->eachFilePath, - dir(sys_masterHomePath + 'LassoLibraries/lassoserver/')->eachFilePath - ) + tie( + dir(sys_masterHomePath + 'LassoLibraries/builtins/')->eachFilePath, + dir(sys_masterHomePath + 'LassoLibraries/lassoserver/')->eachFilePath + ) ) with topLevelDir in #srcs -where !#topLevelDir->lastComponent->beginsWith('.') +where not #topLevelDir->lastComponent->beginsWith('.') do protect => { - handle_error => { + handle_error => { stdoutnl('Unable to load: ' + #topLevelDir + ' ' + error_msg) } library_thread_loader->loadLibrary(#topLevelDir) @@ -61,60 +70,74 @@ do protect => { local( typesList = list(), traitsList = list(), - methodsList = list() + unboundMethodsList = list(), + memberMethodsList = list() ) -// unbound methods -with method in sys_listUnboundMethods -where !#method->methodName->asString->endsWith('=') -where #method->methodName->asString->isalpha(1) -where #methodsList !>> #method->methodName->asString -do #methodsList->insert(#method->methodName->asString) +// types +with type in sys_listTypes +where #typesList !>> #type +do { + #typesList->insert(#type) + with method in #type->getType->listMethods + let name = #method->methodName + where not #name->asString->endsWith('=') // skip setter methods + where #name->asString->isAlpha(1) // skip unpublished methods + where #memberMethodsList !>> #name + do #memberMethodsList->insert(#name) +} // traits with trait in sys_listTraits -where !#trait->asString->beginsWith('$') -where #traitsList !>> #trait->asString +where not #trait->asString->beginsWith('$') // skip combined traits +where #traitsList !>> #trait do { - #traitsList->insert(#trait->asString) - with tmethod in tie(#trait->getType->provides, #trait->getType->requires) - where !#tmethod->methodName->asString->endsWith('=') - where #tmethod->methodName->asString->isalpha(1) - where #methodsList !>> #tmethod->methodName->asString - do #methodsList->insert(#tmethod->methodName->asString) + #traitsList->insert(#trait) + with method in tie(#trait->getType->provides, #trait->getType->requires) + let name = #method->methodName + where not #name->asString->endsWith('=') // skip setter methods + where #name->asString->isAlpha(1) // skip unpublished methods + where #memberMethodsList !>> #name + do #memberMethodsList->insert(#name) } -// types -with type in sys_listTypes -where #typesList !>> #type->asString -do { - #typesList->insert(#type->asString) - with tmethod in #type->getType->listMethods - where !#tmethod->methodName->asString->endsWith('=') - where #tmethod->methodName->asString->isalpha(1) - where #methodsList !>> #tmethod->methodName->asString - do #methodsList->insert(#tmethod->methodName->asString) -} +// unbound methods +with method in sys_listUnboundMethods +let name = #method->methodName +where not #name->asString->endsWith('=') // skip setter methods +where #name->asString->isAlpha(1) // skip unpublished methods +where #typesList !>> #name +where #traitsList !>> #name +where #unboundMethodsList !>> #name +do #unboundMethodsList->insert(#name) #f->writeString("BUILTINS = { 'Types': [ ") with t in #typesList -do #f->writeString(" '"+string_lowercase(#t)+"',\n") +do !#t->asString->endsWith('$') ? #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") #f->writeString(" ], 'Traits': [ ") with t in #traitsList -do #f->writeString(" '"+string_lowercase(#t)+"',\n") +do #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") #f->writeString(" ], - 'Methods': [ + 'Unbound Methods': [ ") -with t in #methodsList -do #f->writeString(" '"+string_lowercase(#t)+"',\n") +with t in #unboundMethodsList +do #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") -#f->writeString(" ], +#f->writeString(" ] +} +MEMBERS = { + 'Member Methods': [ +") +with t in #memberMethodsList +do #f->writeString(" '"+string_lowercase(#t->asString)+"',\n") + +#f->writeString(" ] } ") diff --git a/pygments/lexers/_lassobuiltins.py b/pygments/lexers/_lassobuiltins.py index 08b65f37..f3e5147e 100644 --- a/pygments/lexers/_lassobuiltins.py +++ b/pygments/lexers/_lassobuiltins.py @@ -3,7 +3,7 @@ pygments.lexers._lassobuiltins ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Built-in Lasso types, traits, and methods. + Built-in Lasso types, traits, methods, and members. :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. @@ -62,7 +62,6 @@ BUILTINS = { 'regexp', 'zip_impl', 'zip_file_impl', - 'library_thread_loader_thread$', 'library_thread_loader', 'generateforeachunkeyed', 'generateforeachkeyed', @@ -98,6 +97,7 @@ BUILTINS = { 'map_node', 'map', 'file', + 'date', 'dir', 'magick_image', 'ldap', @@ -113,7 +113,6 @@ BUILTINS = { 'sqlite_table', 'sqlite_column', 'curl', - 'date', 'debugging_stack', 'dbgp_server', 'dbgp_packet', @@ -179,9 +178,7 @@ BUILTINS = { 'fcgi_record', 'web_request_impl', 'fcgi_request', - 'include_cache_thread$', 'include_cache', - 'atbegin_thread$', 'atbegin', 'fastcgi_each_fcgi_param', 'fastcgi_server', @@ -242,7 +239,6 @@ BUILTINS = { 'lassoapp_livesrc_fileresource', 'lassoapp_livesrc_appsource', 'lassoapp_long_expiring_bytes', - 'lassoapp_zip_file_server_thread$', 'lassoapp_zip_file_server', 'lassoapp_zipsrc_fileresource', 'lassoapp_zipsrc_appsource', @@ -258,7 +254,6 @@ BUILTINS = { 'sqlite_session_driver_impl', 'mysql_session_driver_impl', 'odbc_session_driver_impl', - 'session_delete_expired_thread_thread$', 'session_delete_expired_thread', 'email_smtp', 'client_address', @@ -348,15 +343,8 @@ BUILTINS = { 'web_node_content_css_specialized', 'web_node_content_js_specialized' ], - 'Methods': [ + 'Unbound Methods': [ 'fail_now', - 'staticarray', - 'integer', - 'decimal', - 'string', - 'bytes', - 'keyword', - 'signature', 'register', 'register_thread', 'escape_tag', @@ -372,8 +360,6 @@ BUILTINS = { 'failure_clear', 'var_keys', 'var_values', - 'null', - 'trait', 'staticarray_join', 'suspend', 'main_thread_only', @@ -381,7 +367,6 @@ BUILTINS = { 'capture_nearestloopcount', 'capture_nearestloopcontinue', 'capture_nearestloopabort', - 'pair', 'io_file_o_rdonly', 'io_file_o_wronly', 'io_file_o_rdwr', @@ -549,11 +534,9 @@ BUILTINS = { 'io_file_f_ulock', 'io_file_f_tlock', 'io_file_f_test', - 'dirdesc', 'io_file_stdin', 'io_file_stdout', 'io_file_stderr', - 'filedesc', 'uchar_alphabetic', 'uchar_ascii_hex_digit', 'uchar_bidi_control', @@ -696,7 +679,6 @@ BUILTINS = { 'u_nt_decimal', 'u_nt_digit', 'u_nt_numeric', - 'locale', 'locale_english', 'locale_french', 'locale_german', @@ -724,7 +706,6 @@ BUILTINS = { 'locale_isolanguages', 'locale_availablelocales', 'ucal_listtimezones', - 'ucal', 'ucal_era', 'ucal_year', 'ucal_month', @@ -750,7 +731,6 @@ BUILTINS = { 'ucal_lenient', 'ucal_firstdayofweek', 'ucal_daysinfirstweek', - 'xml_domimplementation', 'sys_sigalrm', 'sys_sighup', 'sys_sigkill', @@ -869,7 +849,6 @@ BUILTINS = { 'sys_is_full_path', 'lcapi_loadmodule', 'lcapi_listdatasources', - 'dsinfo', 'encrypt_blowfish', 'decrypt_blowfish', 'cipher_digest', @@ -887,11 +866,7 @@ BUILTINS = { 'cipher_encrypt_private', 'cipher_encrypt_public', 'cipher_generate_key', - 'xmlstream', - 'sourcefile', - 'tag', 'tag_exists', - 'mime_reader', 'curl_easy_init', 'curl_easy_duphandle', 'curl_easy_cleanup', @@ -1132,9 +1107,6 @@ BUILTINS = { 'curle_ssl_engine_initfailed', 'curle_login_denied', 'curlmsg_done', - 'regexp', - 'array', - 'boolean', 'zip_open', 'zip_name_locate', 'zip_fopen', @@ -1172,7 +1144,6 @@ BUILTINS = { 'evdns_resolve_ipv6', 'evdns_resolve_reverse', 'evdns_resolve_reverse_ipv6', - 'library_thread_loader', 'stdout', 'stdoutnl', 'fail', @@ -1205,85 +1176,18 @@ BUILTINS = { 'error_code_noerror', 'abort', 'protect', - 'trait_asstring', - 'any', - 'trait_generator', - 'trait_decompose_assignment', - 'trait_foreach', - 'trait_generatorcentric', 'generateforeach', - 'generateforeachunkeyed', - 'generateforeachkeyed', - 'trait_foreachtextelement', - 'trait_finite', - 'trait_finiteforeach', - 'trait_keyed', - 'trait_keyedfinite', - 'trait_keyedforeach', - 'trait_frontended', - 'trait_backended', - 'trait_doubleended', - 'trait_positionallykeyed', - 'trait_expandable', - 'trait_frontexpandable', - 'trait_backexpandable', - 'trait_contractible', - 'trait_frontcontractible', - 'trait_backcontractible', - 'trait_fullymutable', - 'trait_keyedmutable', - 'trait_endedfullymutable', - 'trait_setoperations', - 'trait_searchable', - 'trait_positionallysearchable', - 'trait_pathcomponents', - 'trait_readbytes', - 'trait_writebytes', - 'trait_setencoding', - 'trait_readstring', - 'trait_writestring', - 'trait_hashable', - 'eacher', - 'trait_each_sub', - 'trait_stack', - 'trait_list', - 'trait_array', - 'trait_map', - 'trait_close', - 'trait_file', - 'trait_scalar', 'method_name', - 'trait_queriablelambda', - 'trait_queriable', - 'queriable_asstring', - 'queriable_where', 'queriable_do', 'queriable_sum', 'queriable_average', 'queriable_min', 'queriable_max', - 'queriable_select', - 'queriable_selectmany', - 'queriable_groupby', - 'queriable_join', - 'queriable_groupjoin', - 'queriable_orderby', - 'queriable_orderbydescending', - 'queriable_thenby', - 'queriable_thenbydescending', - 'queriable_skip', - 'queriable_take', - 'queriable_grouping', 'queriable_internal_combinebindings', 'queriable_defaultcompare', 'queriable_reversecompare', 'queriable_qsort', - 'generateseries', 'timer', - 'tie', - 'pairup', - 'delve', - 'repeat', 'thread_var_push', 'thread_var_pop', 'thread_var_get', @@ -1301,24 +1205,10 @@ BUILTINS = { 'loop', 'sys_while', 'sys_iterate', - 'pair_compare', - 'serialization_object_identity_compare', - 'serialization_element', - 'trait_serializable', - 'serialization_writer_standin', - 'serialization_writer_ref', - 'serialization_writer', - 'serialization_reader', 'string_validcharset', 'eol', 'encoding_utf8', 'encoding_iso88591', - 'trait_treenode', - 'tree_nullnode', - 'tree_node', - 'tree_base', - 'map_node', - 'map', 'integer_random', 'integer_bitor', 'millis', @@ -1395,7 +1285,6 @@ BUILTINS = { 'file_modechar', 'file_forceroot', 'file_tempfile', - 'file', 'file_stdin', 'file_stdout', 'file_stderr', @@ -1446,14 +1335,10 @@ BUILTINS = { 'sys_usercapimodulepath', 'sys_appspath', 'sys_userstartuppath', - 'dir', - 'magick_image', - 'ldap', 'ldap_scope_base', 'ldap_scope_onelevel', 'ldap_scope_subtree', 'mysqlds', - 'os_process', 'odbc', 'sqliteconnector', 'sqlite_createdb', @@ -1472,7 +1357,6 @@ BUILTINS = { 'database_initialize', 'database_util_cleanpath', 'database_adddefaultsqlitehost', - 'database_registry', 'sqlite_ok', 'sqlite_error', 'sqlite_internal', @@ -1507,18 +1391,11 @@ BUILTINS = { 'sqlite_blob', 'sqlite_null', 'sqlite_text', - 'sqlite3', - 'sqlite_db', - 'sqlite_results', - 'sqlite_currentrow', - 'sqlite_table', - 'sqlite_column', 'bom_utf16be', 'bom_utf16le', 'bom_utf32be', 'bom_utf32le', 'bom_utf8', - 'curl', 'include_url', 'ftp_getdata', 'ftp_getfile', @@ -1526,7 +1403,6 @@ BUILTINS = { 'ftp_putdata', 'ftp_putfile', 'ftp_deletefile', - 'date', 'debugging_step_in', 'debugging_get_stack', 'debugging_get_context', @@ -1544,11 +1420,7 @@ BUILTINS = { 'debugging_context_locals', 'debugging_context_vars', 'debugging_context_self', - 'debugging_stack', 'dbgp_stop_stack_name', - 'dbgp_server', - 'dbgp_packet', - 'duration', 'encrypt_md5', 'inline_columninfo_pos', 'inline_resultrows_pos', @@ -1561,7 +1433,6 @@ BUILTINS = { 'inline_namedget', 'inline_namedput', 'inline', - 'inline_type', 'resultset_count', 'resultset', 'resultsets', @@ -1601,32 +1472,14 @@ BUILTINS = { 'rows_array', 'records_array', 'records_map', - 'trait_json_serialize', 'json_serialize', 'json_consume_string', 'json_consume_token', 'json_consume_array', 'json_consume_object', 'json_deserialize', - 'json_literal', - 'json_object', 'json_rpccall', - 'list_node', - 'list', - 'jchar', - 'jchararray', - 'jbyte', - 'jbytearray', - 'jfloat', - 'jint', - 'jshort', 'ljapi_initialize', - 'formattingbase', - 'currency', - 'scientific', - 'percent', - 'dateandtime', - 'timeonly', 'locale_format_style_full', 'locale_format_style_long', 'locale_format_style_medium', @@ -1644,12 +1497,6 @@ BUILTINS = { 'net_waitread', 'net_waittimeout', 'net_waitwrite', - 'trait_net', - 'net_tcp', - 'net_tcpssl', - 'net_named_pipe', - 'net_udppacket', - 'net_udp', 'admin_initialize', 'admin_getpref', 'admin_setpref', @@ -1658,29 +1505,9 @@ BUILTINS = { 'admin_lassoservicepath', 'pdf_package', 'pdf_rectangle', - 'pdf_typebase', - 'pdf_doc', - 'pdf_color', - 'pdf_barcode', - 'pdf_font', - 'pdf_image', - 'pdf_list', - 'pdf_read', - 'pdf_table', - 'pdf_text', - 'pdf_hyphenator', - 'pdf_chunk', - 'pdf_phrase', - 'pdf_paragraph', 'pdf_serve', - 'queue', 'random_seed', - 'set', - 'sys_process', - 'worker_pool', 'xml', - 'trait_xml_elementcompat', - 'trait_xml_nodecompat', 'xml_transform', 'zip_create', 'zip_excl', @@ -1740,11 +1567,6 @@ BUILTINS = { 'zip_em_rc2', 'zip_em_rc4', 'zip_em_unknown', - 'zip_file', - 'zip', - 'cache_server_element', - 'cache_server', - 'dns_response', 'dns_lookup', 'dns_default', 'string_charfromname', @@ -1775,20 +1597,12 @@ BUILTINS = { 'string_uppercase', 'string_lowercase', 'document', - 'component_render_state', - 'component', - 'component_container', - 'document_base', - 'document_body', - 'document_header', - 'text_document', - 'data_document', 'email_attachment_mime_type', 'email_translatebreakstocrlf', 'email_findemails', 'email_fix_address', 'email_fix_address_list', - 'email_compose', + 'encode_qheader', 'email_send', 'email_queue', 'email_immediate', @@ -1797,9 +1611,6 @@ BUILTINS = { 'email_token', 'email_merge', 'email_batch', - 'encode_qheader', - 'email_pop', - 'email_parse', 'email_safeemail', 'email_extract', 'email_pop_priv_substring', @@ -1809,9 +1620,7 @@ BUILTINS = { 'email_digestresponse', 'encrypt_hmac', 'encrypt_crammd5', - 'email_queue_impl_base', 'email_fs_error_clean', - 'email_stage_impl_base', 'email_initialize', 'email_mxlookup', 'lasso_errorreporting', @@ -1840,26 +1649,17 @@ BUILTINS = { 'fcgi_max_reqs', 'fcgi_mpxs_conns', 'fcgi_read_timeout_seconds', - 'fcgi_record', 'fcgi_makeendrequestbody', 'fcgi_bodychunksize', 'fcgi_makestdoutbody', 'fcgi_readparam', - 'web_connection', - 'web_request_impl', 'web_request', - 'fcgi_request', 'include_cache_compare', - 'include_cache', - 'atbegin', 'fastcgi_initialize', 'fastcgi_handlecon', 'fastcgi_handlereq', - 'fastcgi_each_fcgi_param', 'fastcgi_createfcgirequest', - 'fastcgi_server', 'web_handlefcgirequest', - 'filemaker_datasource', 'filemakerds_initialize', 'filemakerds', 'value_listitem', @@ -1867,55 +1667,6 @@ BUILTINS = { 'selected', 'checked', 'value_list', - 'http_document', - 'http_document_header', - 'http_header_field', - 'html_document_head', - 'html_document_body', - 'raw_document_body', - 'bytes_document_body', - 'html_element_coreattrs', - 'html_element_i18nattrs', - 'html_element_eventsattrs', - 'html_attributed', - 'html_attr', - 'html_atomic_element', - 'html_container_element', - 'http_error', - 'html_script', - 'html_text', - 'html_raw', - 'html_binary', - 'html_json', - 'html_cdata', - 'html_eol', - 'html_div', - 'html_span', - 'html_br', - 'html_hr', - 'html_h1', - 'html_h2', - 'html_h3', - 'html_h4', - 'html_h5', - 'html_h6', - 'html_meta', - 'html_link', - 'html_object', - 'html_style', - 'html_base', - 'html_table', - 'html_tr', - 'html_td', - 'html_th', - 'html_img', - 'html_form', - 'html_fieldset', - 'html_legend', - 'html_input', - 'html_label', - 'html_option', - 'html_select', 'http_char_space', 'http_char_htab', 'http_char_cr', @@ -1923,39 +1674,21 @@ BUILTINS = { 'http_char_question', 'http_char_colon', 'http_read_timeout_secs', - 'http_server_web_connection', - 'http_server', - 'http_server_connection_handler', - 'image', + 'http_default_files', + 'http_server_apps_path', 'jdbc_initialize', 'lassoapp_settingsdb', - 'lassoapp_resource', 'lassoapp_format_mod_date', 'lassoapp_include_current', 'lassoapp_include', 'lassoapp_find_missing_file', - 'lassoapp_source', - 'lassoapp_capabilities', 'lassoapp_get_capabilities_name', 'lassoapp_exists', 'lassoapp_path_to_method_name', 'lassoapp_invoke_resource', - 'lassoapp_installer', 'lassoapp_initialize_db', 'lassoapp_initialize', - 'lassoapp_content_rep_halt', 'lassoapp_issourcefileextension', - 'lassoapp_dirsrc_fileresource', - 'lassoapp_dirsrc_appsource', - 'lassoapp_livesrc_fileresource', - 'lassoapp_livesrc_appsource', - 'lassoapp_long_expiring_bytes', - 'lassoapp_zip_file_server', - 'lassoapp_zipsrc_fileresource', - 'lassoapp_zipsrc_appsource', - 'lassoapp_compiledsrc_fileresource', - 'lassoapp_compiledsrc_appsource', - 'lassoapp_manualsrc_appsource', 'lassoapp_current_include', 'lassoapp_current_app', 'lassoapp_do_with_include', @@ -1983,6 +1716,7 @@ BUILTINS = { 'lassoapp_mime_type_svg', 'lassoapp_mime_type_ttf', 'lassoapp_mime_type_woff', + 'lassoapp_mime_type_swf', 'lassoapp_mime_get', 'log_level_critical', 'log_level_warning', @@ -2002,9 +1736,7 @@ BUILTINS = { 'log_deprecated', 'log_max_file_size', 'log_trim_file_size', - 'log_impl_base', 'log_initialize', - 'portal_impl', 'portal', 'security_database', 'security_table_groups', @@ -2012,8 +1744,6 @@ BUILTINS = { 'security_table_ug_map', 'security_default_realm', 'security_initialize', - 'security_registry', - 'session_driver', 'session_initialize', 'session_getdefaultdriver', 'session_setdefaultdriver', @@ -2025,23 +1755,14 @@ BUILTINS = { 'session_abort', 'session_result', 'session_deleteexpired', - 'memory_session_driver_impl_entry', - 'memory_session_driver_impl', - 'sqlite_session_driver_impl_entry', - 'sqlite_session_driver_impl', - 'mysql_session_driver_impl', 'odbc_session_driver_mssql', - 'odbc_session_driver_impl', 'session_decorate', - 'session_delete_expired_thread', - 'email_smtp', 'auth_admin', 'auth_check', 'auth_custom', 'auth_group', 'auth_prompt', 'auth_user', - 'client_address', 'client_addr', 'client_authorization', 'client_browser', @@ -2056,7 +1777,6 @@ BUILTINS = { 'client_getparam', 'client_headers', 'client_integertoip', - 'client_ip', 'client_iptointeger', 'client_password', 'client_postargs', @@ -2109,246 +1829,1237 @@ BUILTINS = { 'content_replaceheader', 'content_body', 'html_comment', - 'web_node_content_json_specialized', - 'web_node', - 'web_node_container', - 'web_node_content_representation', - 'web_node_content', - 'web_node_content_document', - 'web_node_postable', - 'web_node_base', 'web_node_forpath', 'web_nodes_requesthandler', 'web_nodes_normalizeextension', 'web_nodes_processcontentnode', - 'web_node_root', 'web_nodes_initialize', - 'web_node_content_representation_xhr_container', 'web_node_content_representation_xhr', - 'web_node_content_html_specialized', - 'web_node_content_representation_html_specialized', 'web_node_content_representation_html', - 'web_node_content_css_specialized', - 'web_node_content_representation_css_specialized', 'web_node_content_representation_css', - 'web_node_content_js_specialized', - 'web_node_content_representation_js_specialized', 'web_node_content_representation_js', - 'web_node_echo', 'web_response_nodesentry', - 'web_error_atend', - 'web_response_impl', 'web_response', 'web_router_database', - 'web_router_initialize', - 'web_router', - 'asstring', - 'isnota', - 'isallof', - 'isanyof', + 'web_router_initialize' + ], + 'Lasso 8 Tags': [ + '__char', + '__sync_timestamp__', + '_admin_addgroup', + '_admin_adduser', + '_admin_defaultconnector', + '_admin_defaultconnectornames', + '_admin_defaultdatabase', + '_admin_defaultfield', + '_admin_defaultgroup', + '_admin_defaulthost', + '_admin_defaulttable', + '_admin_defaultuser', + '_admin_deleteconnector', + '_admin_deletedatabase', + '_admin_deletefield', + '_admin_deletegroup', + '_admin_deletehost', + '_admin_deletetable', + '_admin_deleteuser', + '_admin_duplicategroup', + '_admin_internaldatabase', + '_admin_listconnectors', + '_admin_listdatabases', + '_admin_listfields', + '_admin_listgroups', + '_admin_listhosts', + '_admin_listtables', + '_admin_listusers', + '_admin_refreshconnector', + '_admin_refreshsecurity', + '_admin_servicepath', + '_admin_updateconnector', + '_admin_updatedatabase', + '_admin_updatefield', + '_admin_updategroup', + '_admin_updatehost', + '_admin_updatetable', + '_admin_updateuser', + '_chartfx_activation_string', + '_chartfx_getchallengestring', + '_chop_args', + '_chop_mimes', + '_client_addr_old', + '_client_address_old', + '_client_ip_old', + '_database_names', + '_datasource_reload', + '_date_current', + '_date_format', + '_date_msec', + '_date_parse', + '_execution_timelimit', + '_file_chmod', + '_initialize', + '_jdbc_acceptsurl', + '_jdbc_debug', + '_jdbc_deletehost', + '_jdbc_driverclasses', + '_jdbc_driverinfo', + '_jdbc_metainfo', + '_jdbc_propertyinfo', + '_jdbc_setdriver', + '_lasso_param', + '_log_helper', + '_proc_noparam', + '_proc_withparam', + '_recursion_limit', + '_request_param', + '_security_binaryexpiration', + '_security_flushcaches', + '_security_isserialized', + '_security_serialexpiration', + '_srand', + '_strict_literals', + '_substring', + '_xmlrpc_exconverter', + '_xmlrpc_inconverter', + '_xmlrpc_xmlinconverter', + 'abort', + 'action_addinfo', + 'action_addrecord', + 'action_param', + 'action_params', + 'action_setfoundcount', + 'action_setrecordid', + 'action_settotalcount', + 'action_statement', + 'admin_allowedfileroots', + 'admin_changeuser', + 'admin_createuser', + 'admin_currentgroups', + 'admin_currentuserid', + 'admin_currentusername', + 'admin_getpref', + 'admin_groupassignuser', + 'admin_grouplistusers', + 'admin_groupremoveuser', + 'admin_lassoservicepath', + 'admin_listgroups', + 'admin_refreshlicensing', + 'admin_refreshsecurity', + 'admin_reloaddatasource', + 'admin_removepref', + 'admin_setpref', + 'admin_userexists', + 'admin_userlistgroups', + 'all', + 'and', + 'array', + 'array_iterator', + 'auth', + 'auth_admin', + 'auth_auth', + 'auth_custom', + 'auth_group', + 'auth_prompt', + 'auth_user', + 'base64', + 'bean', + 'bigint', + 'bom_utf16be', + 'bom_utf16le', + 'bom_utf32be', + 'bom_utf32le', + 'bom_utf8', + 'boolean', + 'bw', + 'bytes', + 'cache', + 'cache_delete', + 'cache_empty', + 'cache_exists', + 'cache_fetch', + 'cache_internal', + 'cache_maintenance', + 'cache_object', + 'cache_preferences', + 'cache_store', + 'case', + 'chartfx', + 'chartfx_records', + 'chartfx_serve', + 'checked', + 'choice_list', + 'choice_listitem', + 'choicelistitem', + 'cipher_decrypt', + 'cipher_digest', + 'cipher_encrypt', + 'cipher_hmac', + 'cipher_keylength', + 'cipher_list', + 'click_text', + 'client_addr', + 'client_address', + 'client_authorization', + 'client_browser', + 'client_contentlength', + 'client_contenttype', + 'client_cookielist', + 'client_cookies', + 'client_encoding', + 'client_formmethod', + 'client_getargs', + 'client_getparams', + 'client_headers', + 'client_ip', + 'client_ipfrominteger', + 'client_iptointeger', + 'client_password', + 'client_postargs', + 'client_postparams', + 'client_type', + 'client_url', + 'client_username', + 'cn', + 'column', + 'column_name', + 'column_names', + 'compare_beginswith', + 'compare_contains', + 'compare_endswith', + 'compare_equalto', + 'compare_greaterthan', + 'compare_greaterthanorequals', + 'compare_greaterthanorequls', + 'compare_lessthan', + 'compare_lessthanorequals', + 'compare_notbeginswith', + 'compare_notcontains', + 'compare_notendswith', + 'compare_notequalto', + 'compare_notregexp', + 'compare_regexp', + 'compare_strictequalto', + 'compare_strictnotequalto', + 'compiler_removecacheddoc', + 'compiler_setdefaultparserflags', + 'compress', + 'content_body', + 'content_encoding', + 'content_header', + 'content_type', + 'cookie', + 'cookie_set', + 'curl_ftp_getfile', + 'curl_ftp_getlisting', + 'curl_ftp_putfile', + 'curl_include_url', + 'currency', + 'database_changecolumn', + 'database_changefield', + 'database_createcolumn', + 'database_createfield', + 'database_createtable', + 'database_fmcontainer', + 'database_hostinfo', + 'database_inline', + 'database_name', + 'database_nameitem', + 'database_names', + 'database_realname', + 'database_removecolumn', + 'database_removefield', + 'database_removetable', + 'database_repeating', + 'database_repeating_valueitem', + 'database_repeatingvalueitem', + 'database_schemanameitem', + 'database_schemanames', + 'database_tablecolumn', + 'database_tablenameitem', + 'database_tablenames', + 'datasource_name', + 'datasource_register', + 'date', + 'date__date_current', + 'date__date_format', + 'date__date_msec', + 'date__date_parse', + 'date_add', + 'date_date', + 'date_difference', + 'date_duration', + 'date_format', + 'date_getcurrentdate', + 'date_getday', + 'date_getdayofweek', + 'date_gethour', + 'date_getlocaltimezone', + 'date_getminute', + 'date_getmonth', + 'date_getsecond', + 'date_gettime', + 'date_getyear', + 'date_gmttolocal', + 'date_localtogmt', + 'date_maximum', + 'date_minimum', + 'date_msec', + 'date_setformat', + 'date_subtract', + 'db_layoutnameitem', + 'db_layoutnames', + 'db_nameitem', + 'db_names', + 'db_tablenameitem', + 'db_tablenames', + 'dbi_column_names', + 'dbi_field_names', + 'decimal', + 'decimal_setglobaldefaultprecision', + 'decode_base64', + 'decode_bheader', + 'decode_hex', + 'decode_html', + 'decode_json', + 'decode_qheader', + 'decode_quotedprintable', + 'decode_quotedprintablebytes', + 'decode_url', + 'decode_xml', + 'decompress', + 'decrypt_blowfish', + 'decrypt_blowfish2', + 'default', + 'define_atbegin', + 'define_atend', + 'define_constant', + 'define_prototype', + 'define_tag', + 'define_tagp', + 'define_type', + 'define_typep', + 'deserialize', + 'directory_directorynameitem', + 'directory_lister', + 'directory_nameitem', + 'directorynameitem', + 'dns_default', + 'dns_lookup', + 'dns_response', + 'duration', + 'else', + 'email_batch', + 'email_compose', + 'email_digestchallenge', + 'email_digestresponse', + 'email_extract', + 'email_findemails', + 'email_immediate', + 'email_merge', + 'email_mxerror', + 'email_mxlookup', + 'email_parse', + 'email_pop', + 'email_queue', + 'email_result', + 'email_safeemail', + 'email_send', + 'email_smtp', + 'email_status', + 'email_token', + 'email_translatebreakstocrlf', + 'encode_base64', + 'encode_bheader', + 'encode_break', + 'encode_breaks', + 'encode_crc32', + 'encode_hex', + 'encode_html', + 'encode_htmltoxml', + 'encode_json', + 'encode_qheader', + 'encode_quotedprintable', + 'encode_quotedprintablebytes', + 'encode_set', + 'encode_smart', + 'encode_sql', + 'encode_sql92', + 'encode_stricturl', + 'encode_url', + 'encode_xml', + 'encrypt_blowfish', + 'encrypt_blowfish2', + 'encrypt_crammd5', + 'encrypt_hmac', + 'encrypt_md5', + 'eq', + 'error_adderror', + 'error_code', + 'error_code_aborted', + 'error_code_assert', + 'error_code_bof', + 'error_code_connectioninvalid', + 'error_code_couldnotclosefile', + 'error_code_couldnotcreateoropenfile', + 'error_code_couldnotdeletefile', + 'error_code_couldnotdisposememory', + 'error_code_couldnotlockmemory', + 'error_code_couldnotreadfromfile', + 'error_code_couldnotunlockmemory', + 'error_code_couldnotwritetofile', + 'error_code_criterianotmet', + 'error_code_datasourceerror', + 'error_code_directoryfull', + 'error_code_diskfull', + 'error_code_dividebyzero', + 'error_code_eof', + 'error_code_failure', + 'error_code_fieldrestriction', + 'error_code_file', + 'error_code_filealreadyexists', + 'error_code_filecorrupt', + 'error_code_fileinvalid', + 'error_code_fileinvalidaccessmode', + 'error_code_fileisclosed', + 'error_code_fileisopen', + 'error_code_filelocked', + 'error_code_filenotfound', + 'error_code_fileunlocked', + 'error_code_httpfilenotfound', + 'error_code_illegalinstruction', + 'error_code_illegaluseoffrozeninstance', + 'error_code_invaliddatabase', + 'error_code_invalidfilename', + 'error_code_invalidmemoryobject', + 'error_code_invalidparameter', + 'error_code_invalidpassword', + 'error_code_invalidpathname', + 'error_code_invalidusername', + 'error_code_ioerror', + 'error_code_loopaborted', + 'error_code_memory', + 'error_code_network', + 'error_code_nilpointer', + 'error_code_noerr', + 'error_code_nopermission', + 'error_code_outofmemory', + 'error_code_outofstackspace', + 'error_code_overflow', + 'error_code_postconditionfailed', + 'error_code_preconditionfailed', + 'error_code_resnotfound', + 'error_code_resource', + 'error_code_streamreaderror', + 'error_code_streamwriteerror', + 'error_code_syntaxerror', + 'error_code_tagnotfound', + 'error_code_unknownerror', + 'error_code_varnotfound', + 'error_code_volumedoesnotexist', + 'error_code_webactionnotsupported', + 'error_code_webadderror', + 'error_code_webdeleteerror', + 'error_code_webmodulenotfound', + 'error_code_webnosuchobject', + 'error_code_webrepeatingrelatedfield', + 'error_code_webrequiredfieldmissing', + 'error_code_webtimeout', + 'error_code_webupdateerror', + 'error_columnrestriction', + 'error_currenterror', + 'error_databaseconnectionunavailable', + 'error_databasetimeout', + 'error_deleteerror', + 'error_fieldrestriction', + 'error_filenotfound', + 'error_invaliddatabase', + 'error_invalidpassword', + 'error_invalidusername', + 'error_modulenotfound', + 'error_msg', + 'error_msg_aborted', + 'error_msg_assert', + 'error_msg_bof', + 'error_msg_connectioninvalid', + 'error_msg_couldnotclosefile', + 'error_msg_couldnotcreateoropenfile', + 'error_msg_couldnotdeletefile', + 'error_msg_couldnotdisposememory', + 'error_msg_couldnotlockmemory', + 'error_msg_couldnotreadfromfile', + 'error_msg_couldnotunlockmemory', + 'error_msg_couldnotwritetofile', + 'error_msg_criterianotmet', + 'error_msg_datasourceerror', + 'error_msg_directoryfull', + 'error_msg_diskfull', + 'error_msg_dividebyzero', + 'error_msg_eof', + 'error_msg_failure', + 'error_msg_fieldrestriction', + 'error_msg_file', + 'error_msg_filealreadyexists', + 'error_msg_filecorrupt', + 'error_msg_fileinvalid', + 'error_msg_fileinvalidaccessmode', + 'error_msg_fileisclosed', + 'error_msg_fileisopen', + 'error_msg_filelocked', + 'error_msg_filenotfound', + 'error_msg_fileunlocked', + 'error_msg_httpfilenotfound', + 'error_msg_illegalinstruction', + 'error_msg_illegaluseoffrozeninstance', + 'error_msg_invaliddatabase', + 'error_msg_invalidfilename', + 'error_msg_invalidmemoryobject', + 'error_msg_invalidparameter', + 'error_msg_invalidpassword', + 'error_msg_invalidpathname', + 'error_msg_invalidusername', + 'error_msg_ioerror', + 'error_msg_loopaborted', + 'error_msg_memory', + 'error_msg_network', + 'error_msg_nilpointer', + 'error_msg_noerr', + 'error_msg_nopermission', + 'error_msg_outofmemory', + 'error_msg_outofstackspace', + 'error_msg_overflow', + 'error_msg_postconditionfailed', + 'error_msg_preconditionfailed', + 'error_msg_resnotfound', + 'error_msg_resource', + 'error_msg_streamreaderror', + 'error_msg_streamwriteerror', + 'error_msg_syntaxerror', + 'error_msg_tagnotfound', + 'error_msg_unknownerror', + 'error_msg_varnotfound', + 'error_msg_volumedoesnotexist', + 'error_msg_webactionnotsupported', + 'error_msg_webadderror', + 'error_msg_webdeleteerror', + 'error_msg_webmodulenotfound', + 'error_msg_webnosuchobject', + 'error_msg_webrepeatingrelatedfield', + 'error_msg_webrequiredfieldmissing', + 'error_msg_webtimeout', + 'error_msg_webupdateerror', + 'error_noerror', + 'error_nopermission', + 'error_norecordsfound', + 'error_outofmemory', + 'error_pop', + 'error_push', + 'error_reqcolumnmissing', + 'error_reqfieldmissing', + 'error_requiredcolumnmissing', + 'error_requiredfieldmissing', + 'error_reset', + 'error_seterrorcode', + 'error_seterrormessage', + 'error_updateerror', + 'euro', + 'event_schedule', + 'ew', + 'fail', + 'fail_if', + 'false', + 'field', + 'field_name', + 'field_names', + 'file', + 'file_autoresolvefullpaths', + 'file_chmod', + 'file_control', + 'file_copy', + 'file_create', + 'file_creationdate', + 'file_currenterror', + 'file_delete', + 'file_exists', + 'file_getlinecount', + 'file_getsize', + 'file_isdirectory', + 'file_listdirectory', + 'file_moddate', + 'file_modechar', + 'file_modeline', + 'file_move', + 'file_openread', + 'file_openreadwrite', + 'file_openwrite', + 'file_openwriteappend', + 'file_openwritetruncate', + 'file_probeeol', + 'file_processuploads', + 'file_read', + 'file_readline', + 'file_rename', + 'file_serve', + 'file_setsize', + 'file_stream', + 'file_streamcopy', + 'file_uploads', + 'file_waitread', + 'file_waittimeout', + 'file_waitwrite', + 'file_write', + 'find_soap_ops', + 'form_param', + 'found_count', + 'ft', + 'ftp_getfile', + 'ftp_getlisting', + 'ftp_putfile', + 'full', + 'global', + 'global_defined', + 'global_remove', + 'global_reset', + 'globals', + 'gt', + 'gte', + 'handle', + 'handle_error', + 'header', + 'html_comment', + 'http_getfile', + 'ical_alarm', + 'ical_attribute', + 'ical_calendar', + 'ical_daylight', + 'ical_event', + 'ical_freebusy', + 'ical_item', + 'ical_journal', + 'ical_parse', + 'ical_standard', + 'ical_timezone', + 'ical_todo', + 'if', + 'if_empty', + 'if_false', + 'if_null', + 'if_true', + 'image', + 'image_url', + 'img', + 'include', + 'include_cgi', + 'include_currentpath', + 'include_once', + 'include_raw', + 'include_url', + 'inline', + 'integer', + 'iterate', + 'iterator', + 'java', + 'java_bean', + 'json_records', + 'json_rpccall', + 'keycolumn_name', + 'keycolumn_value', + 'keyfield_name', + 'keyfield_value', + 'lasso_comment', + 'lasso_currentaction', + 'lasso_datasourceis', + 'lasso_datasourceis4d', + 'lasso_datasourceisfilemaker', + 'lasso_datasourceisfilemaker7', + 'lasso_datasourceisfilemaker9', + 'lasso_datasourceisfilemakersa', + 'lasso_datasourceisjdbc', + 'lasso_datasourceislassomysql', + 'lasso_datasourceismysql', + 'lasso_datasourceisodbc', + 'lasso_datasourceisopenbase', + 'lasso_datasourceisoracle', + 'lasso_datasourceispostgresql', + 'lasso_datasourceisspotlight', + 'lasso_datasourceissqlite', + 'lasso_datasourceissqlserver', + 'lasso_datasourcemodulename', + 'lasso_datatype', + 'lasso_disableondemand', + 'lasso_errorreporting', + 'lasso_executiontimelimit', + 'lasso_parser', + 'lasso_process', + 'lasso_sessionid', + 'lasso_siteid', + 'lasso_siteisrunning', + 'lasso_sitename', + 'lasso_siterestart', + 'lasso_sitestart', + 'lasso_sitestop', + 'lasso_tagexists', + 'lasso_tagmodulename', + 'lasso_uniqueid', + 'lasso_updatecheck', + 'lasso_uptime', + 'lasso_version', + 'lassoapp_create', + 'lassoapp_dump', + 'lassoapp_flattendir', + 'lassoapp_getappdata', + 'lassoapp_link', + 'lassoapp_list', + 'lassoapp_process', + 'lassoapp_unitize', + 'layout_name', + 'ldap', + 'ldap_scope_base', + 'ldap_scope_onelevel', + 'ldap_scope_subtree', + 'ldml', + 'ldml_ldml', + 'library', + 'library_once', + 'link', + 'link_currentaction', + 'link_currentactionparams', + 'link_currentactionurl', + 'link_currentgroup', + 'link_currentgroupparams', + 'link_currentgroupurl', + 'link_currentrecord', + 'link_currentrecordparams', + 'link_currentrecordurl', + 'link_currentsearch', + 'link_currentsearchparams', + 'link_currentsearchurl', + 'link_detail', + 'link_detailparams', + 'link_detailurl', + 'link_firstgroup', + 'link_firstgroupparams', + 'link_firstgroupurl', + 'link_firstrecord', + 'link_firstrecordparams', + 'link_firstrecordurl', + 'link_lastgroup', + 'link_lastgroupparams', + 'link_lastgroupurl', + 'link_lastrecord', + 'link_lastrecordparams', + 'link_lastrecordurl', + 'link_nextgroup', + 'link_nextgroupparams', + 'link_nextgroupurl', + 'link_nextrecord', + 'link_nextrecordparams', + 'link_nextrecordurl', + 'link_params', + 'link_prevgroup', + 'link_prevgroupparams', + 'link_prevgroupurl', + 'link_prevrecord', + 'link_prevrecordparams', + 'link_prevrecordurl', + 'link_setformat', + 'link_url', + 'list', + 'list_additem', + 'list_fromlist', + 'list_fromstring', + 'list_getitem', + 'list_itemcount', + 'list_iterator', + 'list_removeitem', + 'list_replaceitem', + 'list_reverseiterator', + 'list_tostring', + 'literal', + 'ljax_end', + 'ljax_hastarget', + 'ljax_include', + 'ljax_start', + 'ljax_target', + 'local', + 'local_defined', + 'local_remove', + 'local_reset', + 'locale_format', + 'locals', + 'log', + 'log_always', + 'log_critical', + 'log_deprecated', + 'log_destination_console', + 'log_destination_database', + 'log_destination_file', + 'log_detail', + 'log_level_critical', + 'log_level_deprecated', + 'log_level_detail', + 'log_level_sql', + 'log_level_warning', + 'log_setdestination', + 'log_sql', + 'log_warning', + 'logicalop_value', + 'logicaloperator_value', + 'loop', + 'loop_abort', + 'loop_continue', + 'loop_count', + 'lt', + 'lte', + 'magick_image', + 'map', + 'map_iterator', + 'match_comparator', + 'match_notrange', + 'match_notregexp', + 'match_range', + 'match_regexp', + 'math_abs', + 'math_acos', + 'math_add', + 'math_asin', + 'math_atan', + 'math_atan2', + 'math_ceil', + 'math_converteuro', + 'math_cos', + 'math_div', + 'math_exp', + 'math_floor', + 'math_internal_rand', + 'math_internal_randmax', + 'math_internal_srand', + 'math_ln', + 'math_log', + 'math_log10', + 'math_max', + 'math_min', + 'math_mod', + 'math_mult', + 'math_pow', + 'math_random', + 'math_range', + 'math_rint', + 'math_roman', + 'math_round', + 'math_sin', + 'math_sqrt', + 'math_sub', + 'math_tan', + 'maxrecords_value', + 'memory_session_driver', + 'mime_type', + 'minimal', + 'misc__srand', + 'misc_randomnumber', + 'misc_roman', + 'misc_valid_creditcard', + 'mysql_session_driver', + 'named_param', + 'namespace_current', + 'namespace_delimiter', + 'namespace_exists', + 'namespace_file_fullpathexists', + 'namespace_global', + 'namespace_import', + 'namespace_load', + 'namespace_page', + 'namespace_unload', + 'namespace_using', + 'neq', + 'net', + 'net_connectinprogress', + 'net_connectok', + 'net_typessl', + 'net_typessltcp', + 'net_typessludp', + 'net_typetcp', + 'net_typeudp', + 'net_waitread', + 'net_waittimeout', + 'net_waitwrite', + 'no_default_output', + 'none', + 'noprocess', + 'not', + 'nrx', + 'nslookup', + 'null', + 'object', + 'once', + 'oneoff', + 'op_logicalvalue', + 'operator_logicalvalue', + 'option', + 'or', + 'os_process', + 'output', + 'output_none', + 'pair', + 'params_up', + 'pdf_barcode', + 'pdf_color', + 'pdf_doc', + 'pdf_font', + 'pdf_image', + 'pdf_list', + 'pdf_read', + 'pdf_serve', + 'pdf_table', + 'pdf_text', + 'percent', + 'portal', + 'postcondition', + 'precondition', + 'prettyprintingnsmap', + 'prettyprintingtypemap', + 'priorityqueue', + 'private', + 'proc_convert', + 'proc_convertbody', + 'proc_convertone', + 'proc_extract', + 'proc_extractone', + 'proc_find', + 'proc_first', + 'proc_foreach', + 'proc_get', + 'proc_join', + 'proc_lasso', + 'proc_last', + 'proc_map_entry', + 'proc_null', + 'proc_regexp', + 'proc_xml', + 'proc_xslt', + 'process', + 'protect', + 'queue', + 'rand', + 'randomnumber', + 'raw', + 'recid_value', + 'record_count', + 'recordcount', + 'recordid_value', + 'records', + 'records_array', + 'records_map', + 'redirect_url', + 'reference', + 'referer', + 'referer_url', + 'referrer', + 'referrer_url', + 'regexp', + 'repeating', + 'repeating_valueitem', + 'repeatingvalueitem', + 'repetition', + 'req_column', + 'req_field', + 'required_column', + 'required_field', + 'response_fileexists', + 'response_filepath', + 'response_localpath', + 'response_path', + 'response_realm', + 'resultset', + 'resultset_count', + 'return', + 'return_value', + 'reverseiterator', + 'roman', + 'row_count', + 'rows', + 'rows_array', + 'run_children', + 'rx', + 'schema_name', + 'scientific', + 'search_args', + 'search_arguments', + 'search_columnitem', + 'search_fielditem', + 'search_operatoritem', + 'search_opitem', + 'search_valueitem', + 'searchfielditem', + 'searchoperatoritem', + 'searchopitem', + 'searchvalueitem', + 'select', + 'selected', + 'self', + 'serialize', + 'series', + 'server_date', + 'server_day', + 'server_ip', + 'server_name', + 'server_port', + 'server_push', + 'server_siteisrunning', + 'server_sitestart', + 'server_sitestop', + 'server_time', + 'session_abort', + 'session_addoutputfilter', + 'session_addvar', + 'session_addvariable', + 'session_deleteexpired', + 'session_driver', + 'session_end', + 'session_id', + 'session_removevar', + 'session_removevariable', + 'session_result', + 'session_setdriver', + 'session_start', + 'set', + 'set_iterator', + 'set_reverseiterator', + 'shown_count', + 'shown_first', + 'shown_last', + 'site_atbegin', + 'site_id', + 'site_name', + 'site_restart', + 'skiprecords_value', + 'sleep', + 'soap_convertpartstopairs', + 'soap_definetag', + 'soap_info', + 'soap_lastrequest', + 'soap_lastresponse', + 'soap_stub', + 'sort_args', + 'sort_arguments', + 'sort_columnitem', + 'sort_fielditem', + 'sort_orderitem', + 'sortcolumnitem', + 'sortfielditem', + 'sortorderitem', + 'sqlite_createdb', + 'sqlite_session_driver', + 'sqlite_setsleepmillis', + 'sqlite_setsleeptries', + 'srand', + 'stack', + 'stock_quote', + 'string', + 'string_charfromname', + 'string_concatenate', + 'string_countfields', + 'string_endswith', + 'string_extract', + 'string_findposition', + 'string_findregexp', + 'string_fordigit', + 'string_getfield', + 'string_getunicodeversion', + 'string_insert', + 'string_isalpha', + 'string_isalphanumeric', + 'string_isdigit', + 'string_ishexdigit', + 'string_islower', + 'string_isnumeric', + 'string_ispunctuation', + 'string_isspace', + 'string_isupper', + 'string_length', + 'string_lowercase', + 'string_remove', + 'string_removeleading', + 'string_removetrailing', + 'string_replace', + 'string_replaceregexp', + 'string_todecimal', + 'string_tointeger', + 'string_uppercase', + 'string_validcharset', + 'table_name', + 'table_realname', + 'tag', + 'tag_name', + 'tags', + 'tags_find', + 'tags_list', + 'tcp_close', + 'tcp_open', + 'tcp_send', + 'tcp_tcp_close', + 'tcp_tcp_open', + 'tcp_tcp_send', + 'thread_abort', + 'thread_atomic', + 'thread_event', + 'thread_exists', + 'thread_getcurrentid', + 'thread_getpriority', + 'thread_info', + 'thread_list', + 'thread_lock', + 'thread_pipe', + 'thread_priority_default', + 'thread_priority_high', + 'thread_priority_low', + 'thread_rwlock', + 'thread_semaphore', + 'thread_setpriority', + 'token_value', + 'total_records', + 'treemap', + 'treemap_iterator', + 'true', + 'url_rewrite', + 'valid_creditcard', + 'valid_date', + 'valid_email', + 'valid_url', + 'value_list', + 'value_listitem', + 'valuelistitem', + 'var', + 'var_defined', + 'var_remove', + 'var_reset', + 'var_set', + 'variable', + 'variable_defined', + 'variable_set', + 'variables', + 'variant_count', + 'vars', + 'wap_isenabled', + 'wap_maxbuttons', + 'wap_maxcolumns', + 'wap_maxhorzpixels', + 'wap_maxrows', + 'wap_maxvertpixels', + 'while', + 'wsdl_extract', + 'wsdl_getbinding', + 'wsdl_getbindingforoperation', + 'wsdl_getbindingoperations', + 'wsdl_getmessagenamed', + 'wsdl_getmessageparts', + 'wsdl_getmessagetriofromporttype', + 'wsdl_getopbodystyle', + 'wsdl_getopbodyuse', + 'wsdl_getoperation', + 'wsdl_getoplocation', + 'wsdl_getopmessagetypes', + 'wsdl_getopsoapaction', + 'wsdl_getportaddress', + 'wsdl_getportsforservice', + 'wsdl_getporttype', + 'wsdl_getporttypeoperation', + 'wsdl_getservicedocumentation', + 'wsdl_getservices', + 'wsdl_gettargetnamespace', + 'wsdl_issoapoperation', + 'wsdl_listoperations', + 'wsdl_maketest', + 'xml', + 'xml_extract', + 'xml_rpc', + 'xml_rpccall', + 'xml_rw', + 'xml_serve', + 'xml_transform', + 'xml_xml', + 'xml_xmlstream', + 'xmlstream', + 'xsd_attribute', + 'xsd_blankarraybase', + 'xsd_blankbase', + 'xsd_buildtype', + 'xsd_cache', + 'xsd_checkcardinality', + 'xsd_continueall', + 'xsd_continueannotation', + 'xsd_continueany', + 'xsd_continueanyattribute', + 'xsd_continueattribute', + 'xsd_continueattributegroup', + 'xsd_continuechoice', + 'xsd_continuecomplexcontent', + 'xsd_continuecomplextype', + 'xsd_continuedocumentation', + 'xsd_continueextension', + 'xsd_continuegroup', + 'xsd_continuekey', + 'xsd_continuelist', + 'xsd_continuerestriction', + 'xsd_continuesequence', + 'xsd_continuesimplecontent', + 'xsd_continuesimpletype', + 'xsd_continueunion', + 'xsd_deserialize', + 'xsd_fullyqualifyname', + 'xsd_generate', + 'xsd_generateblankfromtype', + 'xsd_generateblanksimpletype', + 'xsd_generatetype', + 'xsd_getschematype', + 'xsd_issimpletype', + 'xsd_loadschema', + 'xsd_lookupnamespaceuri', + 'xsd_lookuptype', + 'xsd_processany', + 'xsd_processattribute', + 'xsd_processattributegroup', + 'xsd_processcomplextype', + 'xsd_processelement', + 'xsd_processgroup', + 'xsd_processimport', + 'xsd_processinclude', + 'xsd_processschema', + 'xsd_processsimpletype', + 'xsd_ref', + 'xsd_type' + ] +} +MEMBERS = { + 'Member Methods': [ + 'escape_member', 'oncompare', + 'sameas', 'isa', 'ascopy', + 'asstring', 'ascopydeep', 'type', - 'invoke', - 'atend', - 'decomposeassignment', - 'asgenerator', - 'foreach', - 'eachword', - 'eachline', - 'eachcharacter', - 'foreachwordbreak', - 'foreachlinebreak', - 'foreachcharacter', - 'isempty', - 'isnotempty', - 'ifempty', - 'ifnotempty', - 'size', - 'values', - 'asarray', - 'aslist', - 'asstaticarray', - 'join', - 'get', - 'keys', - 'askeyedgenerator', - 'eachpair', - 'eachkey', - 'foreachpair', - 'foreachkey', - 'front', - 'first', - 'back', - 'last', - 'second', - 'insert', - 'insertfront', - 'insertfirst', - 'insertback', - 'insertfrom', - 'insertlast', - 'remove', - 'removeall', - 'removefront', - 'removefirst', - 'removeback', - 'removelast', - 'difference', - 'intersection', - 'union', - 'contains', - 'find', - 'findposition', - 'componentdelimiter', - 'extensiondelimiter', - 'lastcomponent', - 'foreachpathcomponent', - 'eachcomponent', - 'striplastcomponent', - 'firstcomponent', - 'stripfirstcomponent', - 'splitextension', - 'hastrailingcomponent', - 'isfullpath', - 'findlast', - 'sub', - 'readsomebytes', - 'readbytesfully', - 'readbytes', - 'writebytes', - 'encoding', - 'readstring', - 'writestring', - 'hash', - 'foreachsub', - 'eachsub', - 'push', - 'pop', - 'top', - 'dowithclose', - 'close', - 'fd', - 'do', - 'sum', - 'average', - 'where', - 'select', - 'selectmany', - 'groupby', - 'groupjoin', - 'orderby', - 'orderbydescending', - 'thenby', - 'thenbydescending', - 'skip', - 'take', - 'serialize', - 'serializationelements', - 'acceptdeserializedelement', - 'left', - 'right', - 'up', - 'value', - 'bind', - 'listen', - 'localaddress', - 'remoteaddress', - 'shutdownrd', - 'shutdownwr', - 'shutdownrdwr', - 'setname', - 'contents', - 'tagname', - 'foreachchild', - 'eachchild', - 'foreachmatch', - 'eachmatch', - 'haschildnodes', - 'childnodes', - 'extract', - 'connection', - 'requestparams', - 'stdin', - 'mimes', - 'setstatus', - 'getstatus', - 'writeheaderline', - 'writeheaderbytes', - 'writebodybytes', - 'id', - 'class', - 'style', - 'title', - 'gethtmlattr', - 'lang', - 'onclick', - 'ondblclick', - 'onmousedown', - 'onmouseup', - 'onmouseover', - 'onmousemove', - 'onmouseout', - 'onkeypress', - 'onkeydown', - 'onkeyup', - 'sethtmlattr', - 'gethtmlattrstring', - 'hashtmlattr', - 'addcomponent', - 'attributes', - 'issourcefile', - 'resourceinvokable', - 'resourcename', - 'fullpath', - 'appname', - 'srcpath', - 'resources', - 'foo', - 'startup', - 'validatesessionstable', - 'createtable', - 'fetchdata', - 'savedata', - 'init', - 'kill', - 'expire', - 'jsonlabel', - 'jsonhtml', - 'jsonisleaf', - 'delim', - 'name', - 'path', - 'nodelist', - 'subnode', - 'subnodes', - 'representnoderesult', - 'mime', - 'extensions', - 'representnode', - 'defaultcontentrepresentation', - 'supportscontentrepresentation', - 'acceptpost', - 'htmlcontent', - 'csscontent', - 'jscontent', - 'escape_member', - 'sameas', + 'trait', 'parent', 'settrait', 'oncreate', 'listmethods', 'hasmethod', + 'invoke', 'addtrait', + 'isnota', + 'isallof', + 'isanyof', + 'size', 'gettype', 'istype', 'doccomment', 'requires', 'provides', + 'name', 'subtraits', 'description', + 'hash', 'hosttonet16', 'hosttonet32', 'nettohost16', @@ -2365,10 +3076,14 @@ BUILTINS = { 'bitnot', 'bitshiftleft', 'bitshiftright', + 'bytes', 'abs', 'div', 'dereferencepointer', 'asdecimal', + 'serializationelements', + 'acceptdeserializedelement', + 'serialize', 'deg2rad', 'asstringhex', 'asstringoct', @@ -2384,6 +3099,7 @@ BUILTINS = { 'floor', 'frexp', 'ldexp', + 'log', 'log10', 'modf', 'pow', @@ -2444,12 +3160,15 @@ BUILTINS = { 'length', 'chardigitvalue', 'private_compare', + 'remove', 'charname', 'chartype', 'decompose', 'normalize', 'digit', 'foldcase', + 'sub', + 'integer', 'private_merge', 'unescape', 'trim', @@ -2489,6 +3208,10 @@ BUILTINS = { 'getpropertyvalue', 'hasbinaryproperty', 'asbytes', + 'find', + 'findlast', + 'contains', + 'get', 'equals', 'compare', 'comparecodepointorder', @@ -2501,9 +3224,42 @@ BUILTINS = { 'beginswith', 'endswith', 'replace', + 'values', + 'foreachcharacter', + 'foreachlinebreak', + 'foreachwordbreak', 'eachwordbreak', + 'eachcharacter', + 'foreachmatch', + 'eachmatch', 'encodesql92', 'encodesql', + 'keys', + 'decomposeassignment', + 'firstcomponent', + 'ifempty', + 'eachsub', + 'stripfirstcomponent', + 'isnotempty', + 'first', + 'lastcomponent', + 'foreachpathcomponent', + 'isfullpath', + 'back', + 'second', + 'componentdelimiter', + 'isempty', + 'foreachsub', + 'front', + 'striplastcomponent', + 'eachcomponent', + 'eachline', + 'splitextension', + 'hastrailingcomponent', + 'last', + 'ifnotempty', + 'extensiondelimiter', + 'eachword', 'substring', 'setsize', 'reserve', @@ -2536,6 +3292,8 @@ BUILTINS = { 'encodemd5', 'encodehex', 'decodehex', + 'uncompress', + 'compress', 'detectcharset', 'bestcharset', 'crc', @@ -2546,6 +3304,32 @@ BUILTINS = { 'exportpointerbits', 'foreachbyte', 'eachbyte', + 'setposition', + 'position', + 'value', + 'join', + 'asstaticarray', + 'foreach', + 'findposition', + 'min', + 'groupjoin', + 'orderbydescending', + 'average', + 'take', + 'do', + 'selectmany', + 'skip', + 'select', + 'sum', + 'max', + 'asarray', + 'thenbydescending', + 'aslist', + 'orderby', + 'thenby', + 'where', + 'groupby', + 'asgenerator', 'typename', 'returntype', 'restname', @@ -2575,6 +3359,7 @@ BUILTINS = { 'hostextra', 'hostisdynamic', 'refobj', + 'connection', 'prepared', 'getset', 'addset', @@ -2586,14 +3371,35 @@ BUILTINS = { 'filename', 'expose', 'recover', + 'insert', + 'removeall', 'count', 'exchange', 'findindex', + 'foreachpair', + 'foreachkey', 'sort', + 'insertfirst', + 'difference', + 'removeback', + 'insertback', + 'removelast', + 'removefront', + 'insertfrom', + 'intersection', + 'top', + 'insertlast', + 'push', + 'union', + 'removefirst', + 'insertfront', + 'pop', + 'fd', 'family', 'isvalid', 'isssl', 'open', + 'close', 'read', 'write', 'ioctl', @@ -2637,6 +3443,7 @@ BUILTINS = { 'parse', 'add', 'roll', + 'set', 'getattr', 'setattr', 'clear', @@ -2653,10 +3460,12 @@ BUILTINS = { 'nodevalue', 'nodetype', 'parentnode', + 'childnodes', 'firstchild', 'lastchild', 'previoussibling', 'nextsibling', + 'attributes', 'ownerdocument', 'namespaceuri', 'prefix', @@ -2665,11 +3474,17 @@ BUILTINS = { 'replacechild', 'removechild', 'appendchild', + 'haschildnodes', 'clonenode', 'issupported', 'hasattributes', + 'extract', 'extractone', + 'extractfast', 'transform', + 'foreachchild', + 'eachchild', + 'extractfastone', 'data', 'substringdata', 'appenddata', @@ -2693,6 +3508,7 @@ BUILTINS = { 'createattributens', 'getelementsbytagnamens', 'getelementbyid', + 'tagname', 'getattribute', 'setattribute', 'removeattribute', @@ -2706,6 +3522,8 @@ BUILTINS = { 'setattributenodens', 'hasattribute', 'hasattributens', + 'setname', + 'contents', 'specified', 'ownerelement', 'splittext', @@ -2723,7 +3541,11 @@ BUILTINS = { 'setnameditemns', 'removenameditem', 'removenameditemns', + 'askeyedgenerator', + 'eachpair', + 'eachkey', 'next', + 'readstring', 'readattributevalue', 'attributecount', 'baseuri', @@ -2755,11 +3577,13 @@ BUILTINS = { 'bind_parameter_index', 'reset', 'column_count', + 'column_name', 'column_decltype', 'column_blob', 'column_double', 'column_int64', 'column_text', + 'column_type', 'ismultipart', 'gotfileupload', 'setmaxfilesize', @@ -2775,6 +3599,7 @@ BUILTINS = { 'setreplacepattern', 'setfindpattern', 'setignorecase', + 'output', 'appendreplacement', 'matches', 'private_replaceall', @@ -2793,6 +3618,7 @@ BUILTINS = { 'findsymbols', 'loadlibrary', 'getlibrary', + 'atend', 'f', 'r', 'form', @@ -2801,6 +3627,7 @@ BUILTINS = { 'key', 'by', 'from', + 'init', 'to', 'd', 't', @@ -2818,8 +3645,12 @@ BUILTINS = { 'asxml', 'tabstr', 'toxmlstring', + 'document', 'idmap', 'readidobjects', + 'left', + 'right', + 'up', 'red', 'root', 'getnode', @@ -2832,14 +3663,22 @@ BUILTINS = { 'private_rebalanceforinsert', 'eachnode', 'foreachnode', + 'encoding', 'resolvelinks', + 'readbytesfully', + 'dowithclose', + 'readsomebytes', + 'readbytes', + 'writestring', 'parentdir', 'aslazystring', + 'path', 'openread', 'openwrite', 'openwriteonly', 'openappend', 'opentruncate', + 'writebytes', 'exists', 'modificationtime', 'lastaccesstime', @@ -2853,9 +3692,7 @@ BUILTINS = { 'chmod', 'chown', 'isopen', - 'position', 'setmarker', - 'setposition', 'setmode', 'foreachline', 'lock', @@ -2867,6 +3704,48 @@ BUILTINS = { 'isdir', 'realpath', 'openwith', + 'asraw', + 'rawdiff', + 'getformat', + 'setformat', + 'subtract', + 'gmt', + 'dst', + 'era', + 'year', + 'month', + 'week', + 'weekofyear', + 'weekofmonth', + 'day', + 'dayofmonth', + 'dayofyear', + 'dayofweek', + 'dayofweekinmonth', + 'ampm', + 'am', + 'pm', + 'hour', + 'hourofday', + 'hourofampm', + 'minute', + 'millisecond', + 'zoneoffset', + 'dstoffset', + 'yearwoy', + 'dowlocal', + 'extendedyear', + 'julianday', + 'millisecondsinday', + 'firstdayofweek', + 'fixformat', + 'minutesbetween', + 'hoursbetween', + 'secondsbetween', + 'daysbetween', + 'businessdaysbetween', + 'pdifference', + 'getfield', 'create', 'setcwd', 'foreachentry', @@ -2900,6 +3779,7 @@ BUILTINS = { 'addcomment', 'comments', 'describe', + 'file', 'height', 'pixel', 'resolutionv', @@ -3114,6 +3994,7 @@ BUILTINS = { 'datasourcecolumnnames', 'tablecolumnnames', 'bindcount', + 'sqlite3', 'db', 'tables', 'hastable', @@ -3145,50 +4026,9 @@ BUILTINS = { 'version', 'perform', 'performonce', - 'asraw', - 'rawdiff', - 'getformat', - 'setformat', - 'subtract', - 'gmt', - 'dst', - 'era', - 'year', - 'month', - 'week', - 'weekofyear', - 'weekofmonth', - 'day', - 'dayofmonth', - 'dayofyear', - 'dayofweek', - 'dayofweekinmonth', - 'ampm', - 'am', - 'pm', - 'hour', - 'hourofday', - 'hourofampm', - 'minute', - 'millisecond', - 'zoneoffset', - 'dstoffset', - 'yearwoy', - 'dowlocal', - 'extendedyear', - 'julianday', - 'millisecondsinday', - 'firstdayofweek', - 'fixformat', - 'minutesbetween', - 'hoursbetween', - 'secondsbetween', - 'daysbetween', - 'businessdaysbetween', - 'pdifference', - 'getfield', 's', 'linediffers', + 'sourcefile', 'sourceline', 'sourcecolumn', 'continuationpacket', @@ -3227,11 +4067,14 @@ BUILTINS = { 'handlecontextget', 'handlesource', 'error', + 'setstatus', + 'getstatus', 'stoprunning', 'pollide', 'polldbg', 'runonce', 'arguments', + 'id', 'argumentvalue', 'end', 'start', @@ -3241,6 +4084,7 @@ BUILTINS = { 'actionparams', 'capi', 'doclose', + 'dsinfo', 'isnothing', 'named', 'workinginputcolumns', @@ -3258,6 +4102,13 @@ BUILTINS = { 'head', 'removenode', 'listnode', + 'bind', + 'listen', + 'remoteaddress', + 'shutdownrdwr', + 'shutdownwr', + 'shutdownrd', + 'localaddress', 'accept', 'connect', 'foreachaccept', @@ -3270,6 +4121,7 @@ BUILTINS = { 'fromname', 'fromport', 'env', + 'checked', 'getclass', 'jobjectisa', 'new', @@ -3415,6 +4267,7 @@ BUILTINS = { 'startone', 'addtask', 'waitforcompletion', + 'isidle', 'scanworkers', 'scantasks', 'z', @@ -3428,8 +4281,10 @@ BUILTINS = { 'getfile', 'meta', 'criteria', + 'map', 'valid', 'lazyvalue', + 'dns_response', 'qdcount', 'qdarray', 'answer', @@ -3446,6 +4301,7 @@ BUILTINS = { 'renderbytes', 'renderstring', 'components', + 'addcomponent', 'addcomponents', 'body', 'renderdocumentbytes', @@ -3478,6 +4334,7 @@ BUILTINS = { 'auth', 'quit', 'rset', + 'list', 'uidl', 'retr', 'dele', @@ -3504,6 +4361,7 @@ BUILTINS = { 'parse_parts', 'parse_rawhdrs', 'rawheaders', + 'content_type', 'content_transfer_encoding', 'content_disposition', 'boundary', @@ -3511,10 +4369,12 @@ BUILTINS = { 'cc', 'subject', 'bcc', + 'date', 'pause', 'continue', 'touch', 'refresh', + 'queue', 'status', 'queue_status', 'active_tick', @@ -3567,6 +4427,7 @@ BUILTINS = { 'httpacceptlanguage', 'ishttps', 'cookies', + 'cookie', 'rawheader', 'queryparam', 'postparam', @@ -3580,6 +4441,12 @@ BUILTINS = { 'isxhr', 'reqid', 'statusmsg', + 'requestparams', + 'stdin', + 'mimes', + 'writeheaderline', + 'writeheaderbytes', + 'writebodybytes', 'cap', 'n', 'proxying', @@ -3590,6 +4457,7 @@ BUILTINS = { 'handledevconnection', 'splittoprivatedev', 'getmode', + 'curl', 'novaluelists', 'makeurl', 'choosecolumntype', @@ -3598,6 +4466,7 @@ BUILTINS = { 'buildquery', 'getsortfieldspart', 'endjs', + 'title', 'addjs', 'addjstext', 'addendjs', @@ -3606,7 +4475,26 @@ BUILTINS = { 'addfavicon', 'attrs', 'dtdid', + 'lang', 'xhtml', + 'style', + 'gethtmlattr', + 'hashtmlattr', + 'onmouseover', + 'onkeydown', + 'dir', + 'onclick', + 'onkeypress', + 'onmouseout', + 'onkeyup', + 'onmousemove', + 'onmouseup', + 'ondblclick', + 'onmousedown', + 'sethtmlattr', + 'class', + 'gethtmlattrstring', + 'tag', 'code', 'msg', 'scripttype', @@ -3638,6 +4526,7 @@ BUILTINS = { 'inputtype', 'maxlength', 'for', + 'selected', 'label', 'multiple', 'buff', @@ -3653,6 +4542,7 @@ BUILTINS = { 'addoneheaderline', 'safeexport8bits', 'writeheader', + 'fail', 'connhandler', 'port', 'connectionhandler', @@ -3663,6 +4553,7 @@ BUILTINS = { 'scriptextensions', 'sendfile', 'probemimetype', + 'appname', 'inits', 'installs', 'rootmap', @@ -3677,6 +4568,12 @@ BUILTINS = { 'execinstalls', 'execinits', 'payload', + 'fullpath', + 'resourcename', + 'issourcefile', + 'resourceinvokable', + 'srcpath', + 'resources', 'eligiblepath', 'eligiblepaths', 'expiresminutes', @@ -3685,12 +4582,14 @@ BUILTINS = { 'addzip', 'getzipfilebytes', 'resourcedata', + 'zip', 'zipfile', 'zipname', 'zipfilename', 'rawinvokable', 'route', 'setdestination', + 'getprowcount', 'encodepassword', 'checkuser', 'needinitialization', @@ -3723,6 +4622,13 @@ BUILTINS = { 'nextprune', 'nextprunedelta', 'sessionsdump', + 'startup', + 'validatesessionstable', + 'createtable', + 'fetchdata', + 'savedata', + 'kill', + 'expire', 'prune', 'entry', 'host', @@ -3731,10 +4637,21 @@ BUILTINS = { 'getdefaultstorage', 'onconvert', 'send', + 'nodelist', + 'delim', + 'subnode', + 'subnodes', 'addsubnode', 'removesubnode', 'nodeforpath', + 'representnoderesult', + 'mime', + 'extensions', + 'representnode', 'jsonfornode', + 'defaultcontentrepresentation', + 'supportscontentrepresentation', + 'htmlcontent', 'appmessage', 'appstatus', 'atends', @@ -3747,10 +4664,13 @@ BUILTINS = { 'outputencoding', 'sessionsmap', 'htmlizestacktrace', + 'includes', 'respond', 'sendresponse', 'sendchunk', 'makecookieyumyum', + 'getinclude', + 'include', 'includeonce', 'includelibrary', 'includelibraryonce', @@ -3782,97 +4702,17 @@ BUILTINS = { 'shouldabort', 'gettrigger', 'trigger', - 'rule' + 'rule', + 'foo', + 'jsonlabel', + 'jsonhtml', + 'jsonisleaf', + 'acceptpost', + 'csscontent', + 'jscontent' ], - 'Lasso 8 Tags': [ - '__char', - '__sync_timestamp__', - '_admin_addgroup', - '_admin_adduser', - '_admin_defaultconnector', - '_admin_defaultconnectornames', - '_admin_defaultdatabase', - '_admin_defaultfield', - '_admin_defaultgroup', - '_admin_defaulthost', - '_admin_defaulttable', - '_admin_defaultuser', - '_admin_deleteconnector', - '_admin_deletedatabase', - '_admin_deletefield', - '_admin_deletegroup', - '_admin_deletehost', - '_admin_deletetable', - '_admin_deleteuser', - '_admin_duplicategroup', - '_admin_internaldatabase', - '_admin_listconnectors', - '_admin_listdatabases', - '_admin_listfields', - '_admin_listgroups', - '_admin_listhosts', - '_admin_listtables', - '_admin_listusers', - '_admin_refreshconnector', - '_admin_refreshsecurity', - '_admin_servicepath', - '_admin_updateconnector', - '_admin_updatedatabase', - '_admin_updatefield', - '_admin_updategroup', - '_admin_updatehost', - '_admin_updatetable', - '_admin_updateuser', - '_chartfx_activation_string', - '_chartfx_getchallengestring', - '_chop_args', - '_chop_mimes', - '_client_addr_old', - '_client_address_old', - '_client_ip_old', - '_database_names', - '_datasource_reload', - '_date_current', - '_date_format', - '_date_msec', - '_date_parse', - '_execution_timelimit', - '_file_chmod', - '_initialize', - '_jdbc_acceptsurl', - '_jdbc_debug', - '_jdbc_deletehost', - '_jdbc_driverclasses', - '_jdbc_driverinfo', - '_jdbc_metainfo', - '_jdbc_propertyinfo', - '_jdbc_setdriver', - '_lasso_param', - '_log_helper', - '_proc_noparam', - '_proc_withparam', - '_recursion_limit', - '_request_param', - '_security_binaryexpiration', - '_security_flushcaches', - '_security_isserialized', - '_security_serialexpiration', - '_srand', - '_strict_literals', - '_substring', - '_xmlrpc_exconverter', - '_xmlrpc_inconverter', - '_xmlrpc_xmlinconverter', - 'abort', + 'Lasso 8 Member Tags': [ 'accept', - 'action_addinfo', - 'action_addrecord', - 'action_param', - 'action_params', - 'action_setfoundcount', - 'action_setrecordid', - 'action_settotalcount', - 'action_statement', 'add', 'addattachment', 'addattribute', @@ -3909,36 +4749,13 @@ BUILTINS = { 'addtextarea', 'addtextfield', 'addtextpart', - 'admin_allowedfileroots', - 'admin_changeuser', - 'admin_createuser', - 'admin_currentgroups', - 'admin_currentuserid', - 'admin_currentusername', - 'admin_getpref', - 'admin_groupassignuser', - 'admin_grouplistusers', - 'admin_groupremoveuser', - 'admin_lassoservicepath', - 'admin_listgroups', - 'admin_refreshlicensing', - 'admin_refreshsecurity', - 'admin_reloaddatasource', - 'admin_removepref', - 'admin_setpref', - 'admin_userexists', - 'admin_userlistgroups', 'alarms', - 'all', - 'and', 'annotate', 'answer', 'append', 'appendreplacement', 'appendtail', 'arc', - 'array', - 'array_iterator', 'asasync', 'astype', 'atbegin', @@ -3949,23 +4766,13 @@ BUILTINS = { 'attop', 'attributecount', 'attributes', - 'auth', - 'auth_admin', - 'auth_auth', - 'auth_custom', - 'auth_group', - 'auth_prompt', - 'auth_user', 'authenticate', 'authorize', 'backward', - 'base64', 'baseuri', 'bcc', - 'bean', 'beanproperties', 'beginswith', - 'bigint', 'bind', 'bitand', 'bitclear', @@ -3980,217 +4787,46 @@ BUILTINS = { 'bitxor', 'blur', 'body', - 'bom_utf16be', - 'bom_utf16le', - 'bom_utf32be', - 'bom_utf32le', - 'bom_utf8', - 'boolean', 'boundary', - 'bw', 'bytes', - 'cache', - 'cache_delete', - 'cache_empty', - 'cache_exists', - 'cache_fetch', - 'cache_internal', - 'cache_maintenance', - 'cache_object', - 'cache_preferences', - 'cache_store', 'call', 'cancel', 'capabilities', - 'case', 'cc', 'chardigitvalue', 'charname', 'charset', - 'chartfx', - 'chartfx_records', - 'chartfx_serve', 'chartype', - 'checked', 'children', - 'choice_list', - 'choice_listitem', - 'choicelistitem', - 'cipher_decrypt', - 'cipher_digest', - 'cipher_encrypt', - 'cipher_hmac', - 'cipher_keylength', - 'cipher_list', 'circle', - 'click_text', - 'client_addr', - 'client_address', - 'client_authorization', - 'client_browser', - 'client_contentlength', - 'client_contenttype', - 'client_cookielist', - 'client_cookies', - 'client_encoding', - 'client_formmethod', - 'client_getargs', - 'client_getparams', - 'client_headers', - 'client_ip', - 'client_ipfrominteger', - 'client_iptointeger', - 'client_password', - 'client_postargs', - 'client_postparams', - 'client_type', - 'client_url', - 'client_username', 'close', 'closepath', 'closewrite', - 'cn', 'code', 'colorspace', - 'column', - 'column_name', - 'column_names', 'command', 'comments', 'compare', - 'compare_beginswith', - 'compare_contains', - 'compare_endswith', - 'compare_equalto', - 'compare_greaterthan', - 'compare_greaterthanorequals', - 'compare_greaterthanorequls', - 'compare_lessthan', - 'compare_lessthanorequals', - 'compare_notbeginswith', - 'compare_notcontains', - 'compare_notendswith', - 'compare_notequalto', - 'compare_notregexp', - 'compare_regexp', - 'compare_strictequalto', - 'compare_strictnotequalto', 'comparecodepointorder', 'compile', - 'compiler_removecacheddoc', - 'compiler_setdefaultparserflags', 'composite', - 'compress', 'connect', 'contains', - 'content_body', 'content_disposition', - 'content_encoding', - 'content_header', 'content_transfer_encoding', 'content_type', 'contents', 'contrast', 'convert', - 'cookie', - 'cookie_set', 'crop', - 'curl_ftp_getfile', - 'curl_ftp_getlisting', - 'curl_ftp_putfile', - 'curl_include_url', - 'currency', 'curveto', 'data', - 'database_changecolumn', - 'database_changefield', - 'database_createcolumn', - 'database_createfield', - 'database_createtable', - 'database_fmcontainer', - 'database_hostinfo', - 'database_inline', - 'database_name', - 'database_nameitem', - 'database_names', - 'database_realname', - 'database_removecolumn', - 'database_removefield', - 'database_removetable', - 'database_repeating', - 'database_repeating_valueitem', - 'database_repeatingvalueitem', - 'database_schemanameitem', - 'database_schemanames', - 'database_tablecolumn', - 'database_tablenameitem', - 'database_tablenames', - 'datasource_name', - 'datasource_register', 'date', - 'date__date_current', - 'date__date_format', - 'date__date_msec', - 'date__date_parse', - 'date_add', - 'date_date', - 'date_difference', - 'date_duration', - 'date_format', - 'date_getcurrentdate', - 'date_getday', - 'date_getdayofweek', - 'date_gethour', - 'date_getlocaltimezone', - 'date_getminute', - 'date_getmonth', - 'date_getsecond', - 'date_gettime', - 'date_getyear', - 'date_gmttolocal', - 'date_localtogmt', - 'date_maximum', - 'date_minimum', - 'date_msec', - 'date_setformat', - 'date_subtract', 'day', 'daylights', 'dayofweek', 'dayofyear', - 'db_layoutnameitem', - 'db_layoutnames', - 'db_nameitem', - 'db_names', - 'db_tablenameitem', - 'db_tablenames', - 'dbi_column_names', - 'dbi_field_names', - 'decimal', - 'decimal_setglobaldefaultprecision', - 'decode_base64', - 'decode_bheader', - 'decode_hex', - 'decode_html', - 'decode_json', - 'decode_qheader', - 'decode_quotedprintable', - 'decode_quotedprintablebytes', - 'decode_url', - 'decode_xml', - 'decompress', 'decrement', - 'decrypt_blowfish', - 'decrypt_blowfish2', - 'default', - 'define_atbegin', - 'define_atend', - 'define_constant', - 'define_prototype', - 'define_tag', - 'define_tagp', - 'define_type', - 'define_typep', 'delete', 'depth', 'describe', @@ -4200,242 +4836,17 @@ BUILTINS = { 'detachreference', 'difference', 'digit', - 'directory_directorynameitem', - 'directory_lister', - 'directory_nameitem', - 'directorynameitem', - 'dns_default', - 'dns_lookup', - 'dns_response', 'document', 'down', 'drawtext', 'dst', 'dump', - 'duration', - 'else', - 'email_batch', - 'email_compose', - 'email_digestchallenge', - 'email_digestresponse', - 'email_extract', - 'email_findemails', - 'email_immediate', - 'email_merge', - 'email_mxerror', - 'email_mxlookup', - 'email_parse', - 'email_pop', - 'email_queue', - 'email_result', - 'email_safeemail', - 'email_send', - 'email_smtp', - 'email_status', - 'email_token', - 'email_translatebreakstocrlf', - 'encode_base64', - 'encode_bheader', - 'encode_break', - 'encode_breaks', - 'encode_crc32', - 'encode_hex', - 'encode_html', - 'encode_htmltoxml', - 'encode_json', - 'encode_qheader', - 'encode_quotedprintable', - 'encode_quotedprintablebytes', - 'encode_set', - 'encode_smart', - 'encode_sql', - 'encode_sql92', - 'encode_stricturl', - 'encode_url', - 'encode_xml', - 'encrypt_blowfish', - 'encrypt_blowfish2', - 'encrypt_crammd5', - 'encrypt_hmac', - 'encrypt_md5', 'endswith', 'enhance', - 'eq', 'equals', - 'error_adderror', - 'error_code', - 'error_code_aborted', - 'error_code_assert', - 'error_code_bof', - 'error_code_connectioninvalid', - 'error_code_couldnotclosefile', - 'error_code_couldnotcreateoropenfile', - 'error_code_couldnotdeletefile', - 'error_code_couldnotdisposememory', - 'error_code_couldnotlockmemory', - 'error_code_couldnotreadfromfile', - 'error_code_couldnotunlockmemory', - 'error_code_couldnotwritetofile', - 'error_code_criterianotmet', - 'error_code_datasourceerror', - 'error_code_directoryfull', - 'error_code_diskfull', - 'error_code_dividebyzero', - 'error_code_eof', - 'error_code_failure', - 'error_code_fieldrestriction', - 'error_code_file', - 'error_code_filealreadyexists', - 'error_code_filecorrupt', - 'error_code_fileinvalid', - 'error_code_fileinvalidaccessmode', - 'error_code_fileisclosed', - 'error_code_fileisopen', - 'error_code_filelocked', - 'error_code_filenotfound', - 'error_code_fileunlocked', - 'error_code_httpfilenotfound', - 'error_code_illegalinstruction', - 'error_code_illegaluseoffrozeninstance', - 'error_code_invaliddatabase', - 'error_code_invalidfilename', - 'error_code_invalidmemoryobject', - 'error_code_invalidparameter', - 'error_code_invalidpassword', - 'error_code_invalidpathname', - 'error_code_invalidusername', - 'error_code_ioerror', - 'error_code_loopaborted', - 'error_code_memory', - 'error_code_network', - 'error_code_nilpointer', - 'error_code_noerr', - 'error_code_nopermission', - 'error_code_outofmemory', - 'error_code_outofstackspace', - 'error_code_overflow', - 'error_code_postconditionfailed', - 'error_code_preconditionfailed', - 'error_code_resnotfound', - 'error_code_resource', - 'error_code_streamreaderror', - 'error_code_streamwriteerror', - 'error_code_syntaxerror', - 'error_code_tagnotfound', - 'error_code_unknownerror', - 'error_code_varnotfound', - 'error_code_volumedoesnotexist', - 'error_code_webactionnotsupported', - 'error_code_webadderror', - 'error_code_webdeleteerror', - 'error_code_webmodulenotfound', - 'error_code_webnosuchobject', - 'error_code_webrepeatingrelatedfield', - 'error_code_webrequiredfieldmissing', - 'error_code_webtimeout', - 'error_code_webupdateerror', - 'error_columnrestriction', - 'error_currenterror', - 'error_databaseconnectionunavailable', - 'error_databasetimeout', - 'error_deleteerror', - 'error_fieldrestriction', - 'error_filenotfound', - 'error_invaliddatabase', - 'error_invalidpassword', - 'error_invalidusername', - 'error_modulenotfound', - 'error_msg', - 'error_msg_aborted', - 'error_msg_assert', - 'error_msg_bof', - 'error_msg_connectioninvalid', - 'error_msg_couldnotclosefile', - 'error_msg_couldnotcreateoropenfile', - 'error_msg_couldnotdeletefile', - 'error_msg_couldnotdisposememory', - 'error_msg_couldnotlockmemory', - 'error_msg_couldnotreadfromfile', - 'error_msg_couldnotunlockmemory', - 'error_msg_couldnotwritetofile', - 'error_msg_criterianotmet', - 'error_msg_datasourceerror', - 'error_msg_directoryfull', - 'error_msg_diskfull', - 'error_msg_dividebyzero', - 'error_msg_eof', - 'error_msg_failure', - 'error_msg_fieldrestriction', - 'error_msg_file', - 'error_msg_filealreadyexists', - 'error_msg_filecorrupt', - 'error_msg_fileinvalid', - 'error_msg_fileinvalidaccessmode', - 'error_msg_fileisclosed', - 'error_msg_fileisopen', - 'error_msg_filelocked', - 'error_msg_filenotfound', - 'error_msg_fileunlocked', - 'error_msg_httpfilenotfound', - 'error_msg_illegalinstruction', - 'error_msg_illegaluseoffrozeninstance', - 'error_msg_invaliddatabase', - 'error_msg_invalidfilename', - 'error_msg_invalidmemoryobject', - 'error_msg_invalidparameter', - 'error_msg_invalidpassword', - 'error_msg_invalidpathname', - 'error_msg_invalidusername', - 'error_msg_ioerror', - 'error_msg_loopaborted', - 'error_msg_memory', - 'error_msg_network', - 'error_msg_nilpointer', - 'error_msg_noerr', - 'error_msg_nopermission', - 'error_msg_outofmemory', - 'error_msg_outofstackspace', - 'error_msg_overflow', - 'error_msg_postconditionfailed', - 'error_msg_preconditionfailed', - 'error_msg_resnotfound', - 'error_msg_resource', - 'error_msg_streamreaderror', - 'error_msg_streamwriteerror', - 'error_msg_syntaxerror', - 'error_msg_tagnotfound', - 'error_msg_unknownerror', - 'error_msg_varnotfound', - 'error_msg_volumedoesnotexist', - 'error_msg_webactionnotsupported', - 'error_msg_webadderror', - 'error_msg_webdeleteerror', - 'error_msg_webmodulenotfound', - 'error_msg_webnosuchobject', - 'error_msg_webrepeatingrelatedfield', - 'error_msg_webrequiredfieldmissing', - 'error_msg_webtimeout', - 'error_msg_webupdateerror', - 'error_noerror', - 'error_nopermission', - 'error_norecordsfound', - 'error_outofmemory', - 'error_pop', - 'error_push', - 'error_reqcolumnmissing', - 'error_reqfieldmissing', - 'error_requiredcolumnmissing', - 'error_requiredfieldmissing', - 'error_reset', - 'error_seterrorcode', - 'error_seterrormessage', - 'error_updateerror', 'errors', - 'euro', 'eval', - 'event_schedule', 'events', - 'ew', 'execute', 'export16bits', 'export32bits', @@ -4445,54 +4856,11 @@ BUILTINS = { 'exportstring', 'extract', 'extractone', - 'fail', - 'fail_if', - 'false', - 'field', - 'field_name', - 'field_names', 'fieldnames', 'fieldtype', 'fieldvalue', 'file', - 'file_autoresolvefullpaths', - 'file_chmod', - 'file_control', - 'file_copy', - 'file_create', - 'file_creationdate', - 'file_currenterror', - 'file_delete', - 'file_exists', - 'file_getlinecount', - 'file_getsize', - 'file_isdirectory', - 'file_listdirectory', - 'file_moddate', - 'file_modechar', - 'file_modeline', - 'file_move', - 'file_openread', - 'file_openreadwrite', - 'file_openwrite', - 'file_openwriteappend', - 'file_openwritetruncate', - 'file_probeeol', - 'file_processuploads', - 'file_read', - 'file_readline', - 'file_rename', - 'file_serve', - 'file_setsize', - 'file_stream', - 'file_streamcopy', - 'file_uploads', - 'file_waitread', - 'file_waittimeout', - 'file_waitwrite', - 'file_write', 'find', - 'find_soap_ops', 'findindex', 'findnamespace', 'findnamespacebyhref', @@ -4505,19 +4873,12 @@ BUILTINS = { 'flush', 'foldcase', 'foreach', - 'form_param', 'format', 'forward', - 'found_count', 'freebusies', 'freezetype', 'freezevalue', 'from', - 'ft', - 'ftp_getfile', - 'ftp_getlisting', - 'ftp_putfile', - 'full', 'fulltype', 'generatechecksum', 'get', @@ -4556,17 +4917,8 @@ BUILTINS = { 'gettextalignment', 'gettextsize', 'gettype', - 'global', - 'global_defined', - 'global_remove', - 'global_reset', - 'globals', 'gmt', 'groupcount', - 'gt', - 'gte', - 'handle', - 'handle_error', 'hasattribute', 'haschildren', 'hasvalue', @@ -4577,44 +4929,15 @@ BUILTINS = { 'hosttonet16', 'hosttonet32', 'hour', - 'html_comment', - 'http_getfile', - 'ical_alarm', - 'ical_attribute', - 'ical_calendar', - 'ical_daylight', - 'ical_event', - 'ical_freebusy', - 'ical_item', - 'ical_journal', - 'ical_parse', - 'ical_standard', - 'ical_timezone', - 'ical_todo', 'id', - 'if', - 'if_empty', - 'if_false', - 'if_null', - 'if_true', 'ignorecase', - 'image', - 'image_url', - 'img', 'import16bits', 'import32bits', 'import64bits', 'import8bits', 'importfdf', 'importstring', - 'include', - 'include_cgi', - 'include_currentpath', - 'include_once', - 'include_raw', - 'include_url', 'increment', - 'inline', 'input', 'insert', 'insertatcurrent', @@ -4644,234 +4967,32 @@ BUILTINS = { 'isuuppercase', 'isuwhitespace', 'iswhitespace', - 'iterate', 'iterator', - 'java', - 'java_bean', 'javascript', 'join', 'journals', - 'json_records', - 'json_rpccall', 'key', - 'keycolumn_name', - 'keycolumn_value', - 'keyfield_name', - 'keyfield_value', 'keys', - 'lasso_comment', - 'lasso_currentaction', - 'lasso_datasourceis', - 'lasso_datasourceis4d', - 'lasso_datasourceisfilemaker', - 'lasso_datasourceisfilemaker7', - 'lasso_datasourceisfilemaker9', - 'lasso_datasourceisfilemakersa', - 'lasso_datasourceisjdbc', - 'lasso_datasourceislassomysql', - 'lasso_datasourceismysql', - 'lasso_datasourceisodbc', - 'lasso_datasourceisopenbase', - 'lasso_datasourceisoracle', - 'lasso_datasourceispostgresql', - 'lasso_datasourceisspotlight', - 'lasso_datasourceissqlite', - 'lasso_datasourceissqlserver', - 'lasso_datasourcemodulename', - 'lasso_datatype', - 'lasso_disableondemand', - 'lasso_errorreporting', - 'lasso_executiontimelimit', - 'lasso_parser', - 'lasso_process', - 'lasso_sessionid', - 'lasso_siteid', - 'lasso_siteisrunning', - 'lasso_sitename', - 'lasso_siterestart', - 'lasso_sitestart', - 'lasso_sitestop', - 'lasso_tagexists', - 'lasso_tagmodulename', - 'lasso_uniqueid', - 'lasso_updatecheck', - 'lasso_uptime', - 'lasso_version', - 'lassoapp_create', - 'lassoapp_dump', - 'lassoapp_flattendir', - 'lassoapp_getappdata', - 'lassoapp_link', - 'lassoapp_list', - 'lassoapp_process', - 'lassoapp_unitize', 'last', 'lastchild', 'lasterror', - 'layout_name', - 'ldap', - 'ldap_scope_base', - 'ldap_scope_onelevel', - 'ldap_scope_subtree', - 'ldml', - 'ldml_ldml', 'left', 'length', - 'library', - 'library_once', 'line', - 'link', - 'link_currentaction', - 'link_currentactionparams', - 'link_currentactionurl', - 'link_currentgroup', - 'link_currentgroupparams', - 'link_currentgroupurl', - 'link_currentrecord', - 'link_currentrecordparams', - 'link_currentrecordurl', - 'link_currentsearch', - 'link_currentsearchparams', - 'link_currentsearchurl', - 'link_detail', - 'link_detailparams', - 'link_detailurl', - 'link_firstgroup', - 'link_firstgroupparams', - 'link_firstgroupurl', - 'link_firstrecord', - 'link_firstrecordparams', - 'link_firstrecordurl', - 'link_lastgroup', - 'link_lastgroupparams', - 'link_lastgroupurl', - 'link_lastrecord', - 'link_lastrecordparams', - 'link_lastrecordurl', - 'link_nextgroup', - 'link_nextgroupparams', - 'link_nextgroupurl', - 'link_nextrecord', - 'link_nextrecordparams', - 'link_nextrecordurl', - 'link_params', - 'link_prevgroup', - 'link_prevgroupparams', - 'link_prevgroupurl', - 'link_prevrecord', - 'link_prevrecordparams', - 'link_prevrecordurl', - 'link_setformat', - 'link_url', - 'list', - 'list_additem', - 'list_fromlist', - 'list_fromstring', - 'list_getitem', - 'list_itemcount', - 'list_iterator', - 'list_removeitem', - 'list_replaceitem', - 'list_reverseiterator', - 'list_tostring', 'listen', - 'literal', - 'ljax_end', - 'ljax_hastarget', - 'ljax_include', - 'ljax_start', - 'ljax_target', - 'local', - 'local_defined', - 'local_remove', - 'local_reset', 'localaddress', - 'locale_format', 'localname', - 'locals', 'lock', - 'log', - 'log_always', - 'log_critical', - 'log_deprecated', - 'log_destination_console', - 'log_destination_database', - 'log_destination_file', - 'log_detail', - 'log_level_critical', - 'log_level_deprecated', - 'log_level_detail', - 'log_level_sql', - 'log_level_warning', - 'log_setdestination', - 'log_sql', - 'log_warning', - 'logicalop_value', - 'logicaloperator_value', 'lookupnamespace', - 'loop', - 'loop_abort', - 'loop_continue', - 'loop_count', 'lowercase', - 'lt', - 'lte', - 'magick_image', - 'map', - 'map_iterator', 'marker', - 'match_comparator', - 'match_notrange', - 'match_notregexp', - 'match_range', - 'match_regexp', 'matches', 'matchesstart', 'matchposition', 'matchstring', - 'math_abs', - 'math_acos', - 'math_add', - 'math_asin', - 'math_atan', - 'math_atan2', - 'math_ceil', - 'math_converteuro', - 'math_cos', - 'math_div', - 'math_exp', - 'math_floor', - 'math_internal_rand', - 'math_internal_randmax', - 'math_internal_srand', - 'math_ln', - 'math_log', - 'math_log10', - 'math_max', - 'math_min', - 'math_mod', - 'math_mult', - 'math_pow', - 'math_random', - 'math_range', - 'math_rint', - 'math_roman', - 'math_round', - 'math_sin', - 'math_sqrt', - 'math_sub', - 'math_tan', - 'maxrecords_value', - 'memory_session_driver', 'merge', 'millisecond', - 'mime_type', - 'minimal', 'minute', - 'misc__srand', - 'misc_randomnumber', - 'misc_roman', - 'misc_valid_creditcard', 'mode', 'modulate', 'month', @@ -4880,113 +5001,30 @@ BUILTINS = { 'movetoelement', 'movetofirstattribute', 'movetonextattribute', - 'mysql_session_driver', 'name', - 'named_param', - 'namespace_current', - 'namespace_delimiter', - 'namespace_exists', - 'namespace_file_fullpathexists', - 'namespace_global', - 'namespace_import', - 'namespace_load', - 'namespace_page', - 'namespace_unload', - 'namespace_using', 'namespaces', 'namespaceuri', - 'neq', - 'net', - 'net_connectinprogress', - 'net_connectok', - 'net_typessl', - 'net_typessltcp', - 'net_typessludp', - 'net_typetcp', - 'net_typeudp', - 'net_waitread', - 'net_waittimeout', - 'net_waitwrite', 'nettohost16', 'nettohost32', 'newchild', 'next', 'nextsibling', - 'no_default_output', 'nodetype', - 'none', - 'noprocess', - 'not', - 'nrx', - 'nslookup', - 'null', - 'object', - 'once', - 'oneoff', - 'op_logicalvalue', 'open', - 'operator_logicalvalue', - 'option', - 'or', - 'os_process', 'output', - 'output_none', 'padleading', 'padtrailing', 'pagecount', 'pagesize', - 'pair', 'paraminfo', 'params', - 'params_up', 'parent', 'path', - 'pdf_barcode', - 'pdf_color', - 'pdf_doc', - 'pdf_font', - 'pdf_image', - 'pdf_list', - 'pdf_read', - 'pdf_serve', - 'pdf_table', - 'pdf_text', - 'percent', 'pixel', - 'portal', 'position', - 'postcondition', - 'precondition', 'prefix', - 'prettyprintingnsmap', - 'prettyprintingtypemap', 'previoussibling', - 'priorityqueue', - 'private', - 'proc_convert', - 'proc_convertbody', - 'proc_convertone', - 'proc_extract', - 'proc_extractone', - 'proc_find', - 'proc_first', - 'proc_foreach', - 'proc_get', - 'proc_join', - 'proc_lasso', - 'proc_last', - 'proc_map_entry', - 'proc_null', - 'proc_regexp', - 'proc_xml', - 'proc_xslt', - 'process', 'properties', - 'protect', - 'queue', - 'rand', - 'randomnumber', - 'raw', 'rawheaders', 'read', 'readattributevalue', @@ -4996,24 +5034,10 @@ BUILTINS = { 'readlock', 'readstring', 'readunlock', - 'recid_value', 'recipients', - 'record_count', - 'recordcount', - 'recordid_value', - 'records', - 'records_array', - 'records_map', 'rect', - 'redirect_url', 'refcount', - 'reference', - 'referer', - 'referer_url', 'referrals', - 'referrer', - 'referrer_url', - 'regexp', 'remoteaddress', 'remove', 'removeall', @@ -5026,96 +5050,31 @@ BUILTINS = { 'removenamespace', 'removetrailing', 'render', - 'repeating', - 'repeating_valueitem', - 'repeatingvalueitem', - 'repetition', 'replace', 'replaceall', 'replacefirst', 'replacepattern', 'replacewith', - 'req_column', - 'req_field', - 'required_column', - 'required_field', 'reserve', 'reset', 'resolutionh', 'resolutionv', 'response', - 'response_fileexists', - 'response_filepath', - 'response_localpath', - 'response_path', - 'response_realm', 'results', - 'resultset', - 'resultset_count', 'retrieve', - 'return', - 'return_value', 'returntype', 'reverse', 'reverseiterator', 'right', - 'roman', 'rotate', - 'row_count', - 'rows', - 'rows_array', 'run', - 'run_children', - 'rx', 'save', 'scale', - 'schema_name', - 'scientific', 'search', - 'search_args', - 'search_arguments', - 'search_columnitem', - 'search_fielditem', - 'search_operatoritem', - 'search_opitem', - 'search_valueitem', - 'searchfielditem', - 'searchoperatoritem', - 'searchopitem', - 'searchvalueitem', 'second', - 'select', - 'selected', - 'self', 'send', 'serialize', - 'series', - 'server_date', - 'server_day', - 'server_ip', - 'server_name', - 'server_port', - 'server_push', - 'server_siteisrunning', - 'server_sitestart', - 'server_sitestop', - 'server_time', - 'session_abort', - 'session_addoutputfilter', - 'session_addvar', - 'session_addvariable', - 'session_deleteexpired', - 'session_driver', - 'session_end', - 'session_id', - 'session_removevar', - 'session_removevariable', - 'session_result', - 'session_setdriver', - 'session_start', 'set', - 'set_iterator', - 'set_reverseiterator', 'setalignment', 'setbarheight', 'setbarmultiplier', @@ -5163,126 +5122,30 @@ BUILTINS = { 'showchecksum', 'showcode39startstop', 'showeanguardbars', - 'shown_count', - 'shown_first', - 'shown_last', 'signal', 'signalall', - 'site_atbegin', - 'site_id', - 'site_name', - 'site_restart', 'size', - 'skiprecords_value', - 'sleep', 'smooth', - 'soap_convertpartstopairs', - 'soap_definetag', - 'soap_info', - 'soap_lastrequest', - 'soap_lastresponse', - 'soap_stub', 'sort', - 'sort_args', - 'sort_arguments', - 'sort_columnitem', - 'sort_fielditem', - 'sort_orderitem', - 'sortcolumnitem', - 'sortfielditem', - 'sortorderitem', 'sortwith', 'split', - 'sqlite_createdb', - 'sqlite_session_driver', - 'sqlite_setsleepmillis', - 'sqlite_setsleeptries', - 'srand', - 'stack', 'standards', 'steal', - 'stock_quote', - 'string', - 'string_charfromname', - 'string_concatenate', - 'string_countfields', - 'string_endswith', - 'string_extract', - 'string_findposition', - 'string_findregexp', - 'string_fordigit', - 'string_getfield', - 'string_getunicodeversion', - 'string_insert', - 'string_isalpha', - 'string_isalphanumeric', - 'string_isdigit', - 'string_ishexdigit', - 'string_islower', - 'string_isnumeric', - 'string_ispunctuation', - 'string_isspace', - 'string_isupper', - 'string_length', - 'string_lowercase', - 'string_remove', - 'string_removeleading', - 'string_removetrailing', - 'string_replace', - 'string_replaceregexp', - 'string_todecimal', - 'string_tointeger', - 'string_uppercase', - 'string_validcharset', 'subject', 'substring', 'subtract', 'swapbytes', - 'table_name', - 'table_realname', - 'tag', - 'tag_name', - 'tags', - 'tags_find', - 'tags_list', - 'tcp_close', - 'tcp_open', - 'tcp_send', - 'tcp_tcp_close', - 'tcp_tcp_open', - 'tcp_tcp_send', 'textwidth', - 'thread_abort', - 'thread_atomic', - 'thread_event', - 'thread_exists', - 'thread_getcurrentid', - 'thread_getpriority', - 'thread_info', - 'thread_list', - 'thread_lock', - 'thread_pipe', - 'thread_priority_default', - 'thread_priority_high', - 'thread_priority_low', - 'thread_rwlock', - 'thread_semaphore', - 'thread_setpriority', 'time', 'timezones', 'titlecase', 'to', 'todos', - 'token_value', 'tolower', - 'total_records', 'totitle', 'toupper', 'transform', - 'treemap', - 'treemap_iterator', 'trim', - 'true', 'type', 'unescape', 'union', @@ -5291,126 +5154,19 @@ BUILTINS = { 'unserialize', 'up', 'uppercase', - 'url_rewrite', - 'valid_creditcard', - 'valid_date', - 'valid_email', - 'valid_url', 'value', - 'value_list', - 'value_listitem', - 'valuelistitem', 'values', 'valuetype', - 'var', - 'var_defined', - 'var_remove', - 'var_reset', - 'var_set', - 'variable', - 'variable_defined', - 'variable_set', - 'variables', - 'variant_count', - 'vars', 'wait', - 'wap_isenabled', - 'wap_maxbuttons', - 'wap_maxcolumns', - 'wap_maxhorzpixels', - 'wap_maxrows', - 'wap_maxvertpixels', 'waskeyword', 'week', - 'while', 'width', 'write', 'writelock', 'writeto', 'writeunlock', - 'wsdl_extract', - 'wsdl_getbinding', - 'wsdl_getbindingforoperation', - 'wsdl_getbindingoperations', - 'wsdl_getmessagenamed', - 'wsdl_getmessageparts', - 'wsdl_getmessagetriofromporttype', - 'wsdl_getopbodystyle', - 'wsdl_getopbodyuse', - 'wsdl_getoperation', - 'wsdl_getoplocation', - 'wsdl_getopmessagetypes', - 'wsdl_getopsoapaction', - 'wsdl_getportaddress', - 'wsdl_getportsforservice', - 'wsdl_getporttype', - 'wsdl_getporttypeoperation', - 'wsdl_getservicedocumentation', - 'wsdl_getservices', - 'wsdl_gettargetnamespace', - 'wsdl_issoapoperation', - 'wsdl_listoperations', - 'wsdl_maketest', - 'xml', - 'xml_extract', - 'xml_rpc', - 'xml_rpccall', - 'xml_rw', - 'xml_serve', - 'xml_transform', - 'xml_xml', - 'xml_xmlstream', 'xmllang', 'xmlschematype', - 'xmlstream', - 'xsd_attribute', - 'xsd_blankarraybase', - 'xsd_blankbase', - 'xsd_buildtype', - 'xsd_cache', - 'xsd_checkcardinality', - 'xsd_continueall', - 'xsd_continueannotation', - 'xsd_continueany', - 'xsd_continueanyattribute', - 'xsd_continueattribute', - 'xsd_continueattributegroup', - 'xsd_continuechoice', - 'xsd_continuecomplexcontent', - 'xsd_continuecomplextype', - 'xsd_continuedocumentation', - 'xsd_continueextension', - 'xsd_continuegroup', - 'xsd_continuekey', - 'xsd_continuelist', - 'xsd_continuerestriction', - 'xsd_continuesequence', - 'xsd_continuesimplecontent', - 'xsd_continuesimpletype', - 'xsd_continueunion', - 'xsd_deserialize', - 'xsd_fullyqualifyname', - 'xsd_generate', - 'xsd_generateblankfromtype', - 'xsd_generateblanksimpletype', - 'xsd_generatetype', - 'xsd_getschematype', - 'xsd_issimpletype', - 'xsd_loadschema', - 'xsd_lookupnamespaceuri', - 'xsd_lookuptype', - 'xsd_processany', - 'xsd_processattribute', - 'xsd_processattributegroup', - 'xsd_processcomplextype', - 'xsd_processelement', - 'xsd_processgroup', - 'xsd_processimport', - 'xsd_processinclude', - 'xsd_processschema', - 'xsd_processsimpletype', - 'xsd_ref', - 'xsd_type', 'year' ] } diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py index 1fb14901..3513856a 100644 --- a/pygments/lexers/_mapping.py +++ b/pygments/lexers/_mapping.py @@ -58,6 +58,7 @@ LEXERS = { 'CheetahJavascriptLexer': ('pygments.lexers.templates', 'JavaScript+Cheetah', ('js+cheetah', 'javascript+cheetah', 'js+spitfire', 'javascript+spitfire'), (), ('application/x-javascript+cheetah', 'text/x-javascript+cheetah', 'text/javascript+cheetah', 'application/x-javascript+spitfire', 'text/x-javascript+spitfire', 'text/javascript+spitfire')), 'CheetahLexer': ('pygments.lexers.templates', 'Cheetah', ('cheetah', 'spitfire'), ('*.tmpl', '*.spt'), ('application/x-cheetah', 'application/x-spitfire')), 'CheetahXmlLexer': ('pygments.lexers.templates', 'XML+Cheetah', ('xml+cheetah', 'xml+spitfire'), (), ('application/xml+cheetah', 'application/xml+spitfire')), + 'ClayLexer': ('pygments.lexers.compiled', 'Clay', ('clay',), ('*.clay',), ('text/x-clay',)), 'ClojureLexer': ('pygments.lexers.jvm', 'Clojure', ('clojure', 'clj'), ('*.clj',), ('text/x-clojure', 'application/x-clojure')), 'CobolFreeformatLexer': ('pygments.lexers.compiled', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()), 'CobolLexer': ('pygments.lexers.compiled', 'COBOL', ('cobol',), ('*.cob', '*.COB', '*.cpy', '*.CPY'), ('text/x-cobol',)), diff --git a/pygments/lexers/_robotframeworklexer.py b/pygments/lexers/_robotframeworklexer.py index 0192d289..bc64e12b 100644 --- a/pygments/lexers/_robotframeworklexer.py +++ b/pygments/lexers/_robotframeworklexer.py @@ -163,7 +163,7 @@ class RowSplitter(object): def split(self, row): splitter = (row.startswith('| ') and self._split_from_pipes or self._split_from_spaces) - for value in splitter(row.rstrip()): + for value in splitter(row): yield value yield '\n' diff --git a/pygments/lexers/_stan_builtins.py b/pygments/lexers/_stan_builtins.py index 69d8ce75..637072e4 100644 --- a/pygments/lexers/_stan_builtins.py +++ b/pygments/lexers/_stan_builtins.py @@ -1,27 +1,31 @@ # -*- coding: utf-8 -*- """ - pygments.lexers._stan_builtins - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +pygments.lexers._stan_builtins +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - This file contains the names of functions for Stan used by - ``pygments.lexers.math.StanLexer. +This file contains the names of functions for Stan used by +``pygments.lexers.math.StanLexer. - :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. - :license: BSD, see LICENSE for details. +:copyright: Copyright 2013 by the Pygments team, see AUTHORS. +:license: BSD, see LICENSE for details. """ -CONSTANTS=[ 'e', - 'epsilon', - 'log10', - 'log2', - 'negative_epsilon', - 'negative_infinity', - 'not_a_number', - 'pi', - 'positive_infinity', - 'sqrt2'] +KEYWORDS = ['else', 'for', 'if', 'in', 'lower', 'lp__', 'print', 'upper', 'while'] + +TYPES = [ 'corr_matrix', + 'cov_matrix', + 'int', + 'matrix', + 'ordered', + 'positive_ordered', + 'real', + 'row_vector', + 'simplex', + 'unit_vector', + 'vector'] -FUNCTIONS=[ 'Phi', +FUNCTIONS = [ 'Phi', + 'Phi_approx', 'abs', 'acos', 'acosh', @@ -30,37 +34,66 @@ FUNCTIONS=[ 'Phi', 'atan', 'atan2', 'atanh', + 'bernoulli_cdf', 'bernoulli_log', + 'bernoulli_logit_log', + 'bernoulli_rng', + 'beta_binomial_cdf', 'beta_binomial_log', + 'beta_binomial_rng', + 'beta_cdf', 'beta_log', + 'beta_rng', 'binary_log_loss', + 'binomial_cdf', 'binomial_coefficient_log', + 'binomial_log', + 'binomial_logit_log', + 'binomial_rng', + 'block', 'categorical_log', + 'categorical_rng', + 'cauchy_cdf', 'cauchy_log', + 'cauchy_rng', 'cbrt', 'ceil', 'chi_square_log', + 'chi_square_rng', 'cholesky_decompose', 'col', 'cols', 'cos', 'cosh', + 'crossprod', + 'cumulative_sum', 'determinant', 'diag_matrix', + 'diag_post_multiply', + 'diag_pre_multiply', 'diagonal', + 'dims', 'dirichlet_log', + 'dirichlet_rng', 'dot_product', 'dot_self', 'double_exponential_log', - 'eigenvalues', + 'double_exponential_rng', + 'e', 'eigenvalues_sym', + 'eigenvectors_sym', + 'epsilon', 'erf', 'erfc', 'exp', 'exp2', + 'exp_mod_normal_cdf', + 'exp_mod_normal_log', + 'exp_mod_normal_rng', 'expm1', 'exponential_cdf', 'exponential_log', + 'exponential_rng', 'fabs', 'fdim', 'floor', @@ -69,85 +102,148 @@ FUNCTIONS=[ 'Phi', 'fmin', 'fmod', 'gamma_log', + 'gamma_rng', + 'gumbel_cdf', + 'gumbel_log', + 'gumbel_rng', 'hypergeometric_log', + 'hypergeometric_rng', 'hypot', 'if_else', 'int_step', + 'inv_chi_square_cdf', 'inv_chi_square_log', + 'inv_chi_square_rng', 'inv_cloglog', + 'inv_gamma_cdf', 'inv_gamma_log', + 'inv_gamma_rng', 'inv_logit', 'inv_wishart_log', + 'inv_wishart_rng', 'inverse', 'lbeta', 'lgamma', 'lkj_corr_cholesky_log', + 'lkj_corr_cholesky_rng', 'lkj_corr_log', + 'lkj_corr_rng', 'lkj_cov_log', 'lmgamma', 'log', 'log10', 'log1m', + 'log1m_inv_logit', 'log1p', 'log1p_exp', 'log2', + 'log_determinant', + 'log_inv_logit', 'log_sum_exp', + 'logistic_cdf', 'logistic_log', + 'logistic_rng', 'logit', 'lognormal_cdf', 'lognormal_log', + 'lognormal_rng', 'max', + 'mdivide_left_tri_low', + 'mdivide_right_tri_low', 'mean', 'min', 'multi_normal_cholesky_log', 'multi_normal_log', + 'multi_normal_prec_log', + 'multi_normal_rng', 'multi_student_t_log', + 'multi_student_t_rng', + 'multinomial_cdf', 'multinomial_log', + 'multinomial_rng', 'multiply_log', 'multiply_lower_tri_self_transpose', + 'neg_binomial_cdf', 'neg_binomial_log', + 'neg_binomial_rng', + 'negative_epsilon', + 'negative_infinity', 'normal_cdf', 'normal_log', + 'normal_rng', + 'not_a_number', 'ordered_logistic_log', + 'ordered_logistic_rng', + 'owens_t', + 'pareto_cdf', 'pareto_log', + 'pareto_rng', + 'pi', + 'poisson_cdf', 'poisson_log', + 'poisson_log_log', + 'poisson_rng', + 'positive_infinity', 'pow', 'prod', + 'rep_array', + 'rep_matrix', + 'rep_row_vector', + 'rep_vector', 'round', 'row', 'rows', + 'scaled_inv_chi_square_cdf', 'scaled_inv_chi_square_log', + 'scaled_inv_chi_square_rng', 'sd', 'sin', 'singular_values', 'sinh', + 'size', + 'skew_normal_cdf', + 'skew_normal_log', + 'skew_normal_rng', 'softmax', 'sqrt', + 'sqrt2', 'square', 'step', + 'student_t_cdf', 'student_t_log', + 'student_t_rng', 'sum', 'tan', 'tanh', + 'tcrossprod', 'tgamma', 'trace', 'trunc', 'uniform_log', + 'uniform_rng', 'variance', 'weibull_cdf', 'weibull_log', - 'wishart_log'] + 'weibull_rng', + 'wishart_log', + 'wishart_rng'] -DISTRIBUTIONS=[ 'bernoulli', +DISTRIBUTIONS = [ 'bernoulli', + 'bernoulli_logit', 'beta', 'beta_binomial', + 'binomial', + 'binomial_coefficient', + 'binomial_logit', 'categorical', 'cauchy', 'chi_square', 'dirichlet', 'double_exponential', + 'exp_mod_normal', 'exponential', 'gamma', + 'gumbel', 'hypergeometric', 'inv_chi_square', 'inv_gamma', @@ -159,16 +255,106 @@ DISTRIBUTIONS=[ 'bernoulli', 'lognormal', 'multi_normal', 'multi_normal_cholesky', + 'multi_normal_prec', 'multi_student_t', 'multinomial', + 'multiply', 'neg_binomial', 'normal', 'ordered_logistic', 'pareto', 'poisson', + 'poisson_log', 'scaled_inv_chi_square', + 'skew_normal', 'student_t', 'uniform', 'weibull', 'wishart'] +RESERVED = [ 'alignas', + 'alignof', + 'and', + 'and_eq', + 'asm', + 'auto', + 'bitand', + 'bitor', + 'bool', + 'break', + 'case', + 'catch', + 'char', + 'char16_t', + 'char32_t', + 'class', + 'compl', + 'const', + 'const_cast', + 'constexpr', + 'continue', + 'decltype', + 'default', + 'delete', + 'do', + 'double', + 'dynamic_cast', + 'enum', + 'explicit', + 'export', + 'extern', + 'false', + 'false', + 'float', + 'friend', + 'goto', + 'inline', + 'int', + 'long', + 'mutable', + 'namespace', + 'new', + 'noexcept', + 'not', + 'not_eq', + 'nullptr', + 'operator', + 'or', + 'or_eq', + 'private', + 'protected', + 'public', + 'register', + 'reinterpret_cast', + 'repeat', + 'return', + 'short', + 'signed', + 'sizeof', + 'static', + 'static_assert', + 'static_cast', + 'struct', + 'switch', + 'template', + 'then', + 'this', + 'thread_local', + 'throw', + 'true', + 'true', + 'try', + 'typedef', + 'typeid', + 'typename', + 'union', + 'unsigned', + 'until', + 'using', + 'virtual', + 'void', + 'volatile', + 'wchar_t', + 'xor', + 'xor_eq'] + diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py index 8bcb1d46..3c1525d0 100644 --- a/pygments/lexers/agile.py +++ b/pygments/lexers/agile.py @@ -234,7 +234,14 @@ class Python3Lexer(RegexLexer): r'TypeError|UnboundLocalError|UnicodeDecodeError|' r'UnicodeEncodeError|UnicodeError|UnicodeTranslateError|' r'UnicodeWarning|UserWarning|ValueError|VMSError|Warning|' - r'WindowsError|ZeroDivisionError)\b', Name.Exception), + r'WindowsError|ZeroDivisionError|' + # new builtin exceptions from PEP 3151 + r'BlockingIOError|ChildProcessError|ConnectionError|' + r'BrokenPipeError|ConnectionAbortedError|ConnectionRefusedError|' + r'ConnectionResetError|FileExistsError|FileNotFoundError|' + r'InterruptedError|IsADirectoryError|NotADirectoryError|' + r'PermissionError|ProcessLookupError|TimeoutError)\b', + Name.Exception), ] tokens['numbers'] = [ (r'(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?', Number.Float), diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index 7ff64bcc..f080327b 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -244,7 +244,7 @@ class LlvmLexer(RegexLexer): r'|align|addrspace|section|alias|module|asm|sideeffect|gc|dbg' r'|ccc|fastcc|coldcc|x86_stdcallcc|x86_fastcallcc|arm_apcscc' - r'|arm_aapcscc|arm_aapcs_vfpcc' + r'|arm_aapcscc|arm_aapcs_vfpcc|ptx_device|ptx_kernel' r'|cc|c' diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index a082811b..889e7ec6 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -1663,9 +1663,10 @@ class OpaLexer(RegexLexer): # but if you color only real keywords, you might just # as well not color anything keywords = [ - 'and', 'as', 'begin', 'css', 'database', 'db', 'do', 'else', 'end', - 'external', 'forall', 'if', 'import', 'match', 'package', 'parser', - 'rec', 'server', 'then', 'type', 'val', 'with', 'xml_parser', + 'and', 'as', 'begin', 'case', 'client', 'css', 'database', 'db', 'do', + 'else', 'end', 'external', 'forall', 'function', 'if', 'import', + 'match', 'module', 'or', 'package', 'parser', 'rec', 'server', 'then', + 'type', 'val', 'with', 'xml_parser', ] # matches both stuff and `stuff` diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index 717621e9..ed4d257c 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -888,11 +888,11 @@ class CeylonLexer(RegexLexer): (r'[^\S\n]+', Text), (r'//.*?\n', Comment.Single), (r'/\*.*?\*/', Comment.Multiline), - (r'(variable|shared|abstract|doc|by|formal|actual)', + (r'(variable|shared|abstract|doc|by|formal|actual|late|native)', Name.Decorator), (r'(break|case|catch|continue|default|else|finally|for|in|' - r'variable|if|return|switch|this|throw|try|while|is|exists|' - r'nonempty|then|outer)\b', Keyword), + r'variable|if|return|switch|this|throw|try|while|is|exists|dynamic|' + r'nonempty|then|outer|assert)\b', Keyword), (r'(abstracts|extends|satisfies|adapts|' r'super|given|of|out|assign|' r'transient|volatile)\b', Keyword.Declaration), @@ -900,16 +900,16 @@ class CeylonLexer(RegexLexer): Keyword.Type), (r'(package)(\s+)', bygroups(Keyword.Namespace, Text)), (r'(true|false|null)\b', Keyword.Constant), - (r'(class|interface|object)(\s+)', + (r'(class|interface|object|alias)(\s+)', bygroups(Keyword.Declaration, Text), 'class'), (r'(import)(\s+)', bygroups(Keyword.Namespace, Text), 'import'), (r'"(\\\\|\\"|[^"])*"', String), - (r"'\\.'|'[^\\]'|'\\u[0-9a-fA-F]{4}'", String.Quoted), - (r"`\\.`|`[^\\]`|`\\u[0-9a-fA-F]{4}`", String.Char), - (r'(\.)([a-zA-Z_][a-zA-Z0-9_]*)', + (r"'\\.'|'[^\\]'|'\\\{#[0-9a-fA-F]{4}\}'", String.Char), + (r'".*``.*``.*"', String.Interpol), + (r'(\.)([a-z_][a-zA-Z0-9_]*)', bygroups(Operator, Name.Attribute)), (r'[a-zA-Z_][a-zA-Z0-9_]*:', Name.Label), - (r'[a-zA-Z_\$][a-zA-Z0-9_]*', Name), + (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), (r'[~\^\*!%&\[\]\(\)\{\}<>\|+=:;,./?-]', Operator), (r'\d{1,3}(_\d{3})+\.\d{1,3}(_\d{3})+[kMGTPmunpf]?', Number.Float), (r'\d{1,3}(_\d{3})+\.[0-9]+([eE][+-]?[0-9]+)?[kMGTPmunpf]?', @@ -917,16 +917,19 @@ class CeylonLexer(RegexLexer): (r'[0-9][0-9]*\.\d{1,3}(_\d{3})+[kMGTPmunpf]?', Number.Float), (r'[0-9][0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[kMGTPmunpf]?', Number.Float), - (r'0x[0-9a-fA-F]+', Number.Hex), + (r'#([0-9a-fA-F]{4})(_[0-9a-fA-F]{4})+', Number.Hex), + (r'#[0-9a-fA-F]+', Number.Hex), + (r'\$([01]{4})(_[01]{4})+', Number.Integer), + (r'\$[01]+', Number.Integer), (r'\d{1,3}(_\d{3})+[kMGTP]?', Number.Integer), (r'[0-9]+[kMGTP]?', Number.Integer), (r'\n', Text) ], 'class': [ - (r'[a-zA-Z_][a-zA-Z0-9_]*', Name.Class, '#pop') + (r'[A-Za-z_][a-zA-Z0-9_]*', Name.Class, '#pop') ], 'import': [ - (r'[a-zA-Z0-9_.]+\w+ \{([a-zA-Z,]+|\.\.\.)\}', + (r'[a-z][a-zA-Z0-9_.]*', Name.Namespace, '#pop') ], } diff --git a/pygments/lexers/math.py b/pygments/lexers/math.py index 537c6d0e..0b757e44 100644 --- a/pygments/lexers/math.py +++ b/pygments/lexers/math.py @@ -59,7 +59,7 @@ class JuliaLexer(RegexLexer): (r'(begin|while|for|in|return|break|continue|' r'macro|quote|let|if|elseif|else|try|catch|end|' r'bitstype|ccall|do|using|module|import|export|' - r'importall|baremodule)\b', Keyword), + r'importall|baremodule|immutable)\b', Keyword), (r'(local|global|const)\b', Keyword.Declaration), (r'(Bool|Int|Int8|Int16|Int32|Int64|Uint|Uint8|Uint16|Uint32|Uint64' r'|Float32|Float64|Complex64|Complex128|Any|Nothing|None)\b', @@ -99,11 +99,17 @@ class JuliaLexer(RegexLexer): (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), # numbers + (r'(\d+(_\d+)+\.\d*|\d*\.\d+(_\d+)+)([eEf][+-]?[0-9]+)?', Number.Float), (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float), + (r'\d+(_\d+)+[eEf][+-]?[0-9]+', Number.Float), (r'\d+[eEf][+-]?[0-9]+', Number.Float), + (r'0b[01]+(_[01]+)+', Number.Binary), (r'0b[01]+', Number.Binary), + (r'0o[0-7]+(_[0-7]+)+', Number.Oct), (r'0o[0-7]+', Number.Oct), + (r'0x[a-fA-F0-9]+(_[a-fA-F0-9]+)+', Number.Hex), (r'0x[a-fA-F0-9]+', Number.Hex), + (r'\d+(_\d+)+', Number.Integer), (r'\d+', Number.Integer) ], @@ -1294,8 +1300,11 @@ class JagsLexer(RegexLexer): return 0 class StanLexer(RegexLexer): - """ - Pygments Lexer for Stan models. + """Pygments Lexer for Stan models. + + The Stan modeling language is specified in the *Stan 1.3.0 + Modeling Language Manual* `pdf + <http://code.google.com/p/stan/downloads/detail?name=stan-reference-1.3.0.pdf>`_. *New in Pygments 1.6.* """ @@ -1304,13 +1313,6 @@ class StanLexer(RegexLexer): aliases = ['stan'] filenames = ['*.stan'] - _RESERVED = ('for', 'in', 'while', 'repeat', 'until', 'if', - 'then', 'else', 'true', 'false', 'T', - 'lower', 'upper', 'print') - - _TYPES = ('int', 'real', 'vector', 'simplex', 'ordered', 'row_vector', - 'matrix', 'corr_matrix', 'cov_matrix', 'positive_ordered') - tokens = { 'whitespace' : [ (r"\s+", Text), @@ -1334,20 +1336,21 @@ class StanLexer(RegexLexer): 'model', r'generated\s+quantities')), bygroups(Keyword.Namespace, Text, Punctuation)), # Reserved Words - (r'(%s)\b' % r'|'.join(_RESERVED), Keyword.Reserved), + (r'(%s)\b' % r'|'.join(_stan_builtins.KEYWORDS), Keyword), + # Truncation + (r'T(?=\s*\[)', Keyword), # Data types - (r'(%s)\b' % r'|'.join(_TYPES), Keyword.Type), + (r'(%s)\b' % r'|'.join(_stan_builtins.TYPES), Keyword.Type), # Punctuation - (r"[;:,\[\]()<>]", Punctuation), + (r"[;:,\[\]()]", Punctuation), # Builtin (r'(%s)(?=\s*\()' % r'|'.join(_stan_builtins.FUNCTIONS + _stan_builtins.DISTRIBUTIONS), Name.Builtin), - (r'(%s)(?=\s*\()' - % r'|'.join(_stan_builtins.CONSTANTS), Keyword.Constant), # Special names ending in __, like lp__ (r'[A-Za-z][A-Za-z0-9_]*__\b', Name.Builtin.Pseudo), + (r'(%s)\b' % r'|'.join(_stan_builtins.RESERVED), Keyword.Reserved), # Regular variable names (r'[A-Za-z][A-Za-z0-9_]*\b', Name), # Real Literals @@ -1359,7 +1362,7 @@ class StanLexer(RegexLexer): # SLexer makes these tokens Operators. (r'<-|~', Operator), # Infix and prefix operators (and = ) - (r"\+|-|\.?\*|\.?/|\\|'|=", Operator), + (r"\+|-|\.?\*|\.?/|\\|'|==?|!=?|<=?|>=?|\|\||&&", Operator), # Block delimiters (r'[{}]', Punctuation), ] diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index c8557922..8491d19d 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -1397,8 +1397,6 @@ class RebolLexer(RegexLexer): (r';.*\n', Comment), (r'%"', Name.Decorator, 'stringFile'), (r'%[^(\^{^")\s\[\]]+', Name.Decorator), - (r'<[a-zA-Z0-9:._-]*>', Name.Tag), - (r'<[^(<>\s")]+', Name.Tag, 'tag'), (r'[+-]?([a-zA-Z]{1,3})?\$\d+(\.\d+)?', Number.Float), # money (r'[+-]?\d+\:\d+(\:\d+)?(\.\d+)?', String.Other), # time (r'\d+\-[0-9a-zA-Z]+\-\d+(\/\d+\:\d+(\:\d+)?' @@ -1415,6 +1413,8 @@ class RebolLexer(RegexLexer): (r'comment\s', Comment, 'comment'), (r'/[^(\^{^")\s/[\]]*', Name.Attribute), (r'([^(\^{^")\s/[\]]+)(?=[:({"\s/\[\]])', word_callback), + (r'<[a-zA-Z0-9:._-]*>', Name.Tag), + (r'<[^(<>\s")]+', Name.Tag, 'tag'), (r'([^(\^{^")\s]+)', Text), ], 'string': [ @@ -3306,7 +3306,7 @@ class NSISLexer(RegexLexer): tokens = { 'root': [ (r'[;\#].*\n', Comment), - (r"'.*'", String.Single), + (r"'.*?'", String.Single), (r'"', String.Double, 'str_double'), (r'`', String.Backtick, 'str_backtick'), include('macro'), @@ -3457,7 +3457,7 @@ class RPMSpecLexer(RegexLexer): include('macro'), (r'(?i)^(Name|Version|Release|Epoch|Summary|Group|License|Packager|' r'Vendor|Icon|URL|Distribution|Prefix|Patch[0-9]*|Source[0-9]*|' - r'Requires\(?[a-z]*\)?|[a-z]+Req|Obsoletes|Provides|Conflicts|' + r'Requires\(?[a-z]*\)?|[a-z]+Req|Obsoletes|Suggests|Provides|Conflicts|' r'Build[a-z]+|[a-z]+Arch|Auto[a-z]+)(:)(.*)$', bygroups(Generic.Heading, Punctuation, using(this))), (r'^%description', Name.Decorator, 'description'), @@ -3467,7 +3467,7 @@ class RPMSpecLexer(RegexLexer): r'make(?:install)|ghost|patch[0-9]+|find_lang|exclude|verify)', Keyword), include('interpol'), - (r"'.*'", String.Single), + (r"'.*?'", String.Single), (r'"', String.Double, 'string'), (r'.', Text), ], diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index b3e70d05..ff4a0453 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -1657,7 +1657,7 @@ class LassoHtmlLexer(DelegatingLexer): super(LassoHtmlLexer, self).__init__(HtmlLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.01 if re.search(r'<\w+>', text, re.I): rv += 0.2 if html_doctype_matches(text): @@ -1683,9 +1683,9 @@ class LassoXmlLexer(DelegatingLexer): super(LassoXmlLexer, self).__init__(XmlLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.01 if looks_like_xml(text): - rv += 0.5 + rv += 0.4 return rv @@ -1707,8 +1707,8 @@ class LassoCssLexer(DelegatingLexer): super(LassoCssLexer, self).__init__(CssLexer, LassoLexer, **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) - if re.search(r'\w+:.+;', text): + rv = LassoLexer.analyse_text(text) - 0.05 + if re.search(r'\w+:.+?;', text): rv += 0.1 if 'padding:' in text: rv += 0.1 @@ -1736,7 +1736,7 @@ class LassoJavascriptLexer(DelegatingLexer): **options) def analyse_text(text): - rv = LassoLexer.analyse_text(text) + rv = LassoLexer.analyse_text(text) - 0.05 if 'function' in text: rv += 0.2 return rv diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 24942007..dc8c7c5f 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -3106,8 +3106,8 @@ class LassoLexer(RegexLexer): Additional options accepted: `builtinshighlighting` - If given and ``True``, highlight builtin tags, types, traits, and - methods (default: ``True``). + If given and ``True``, highlight builtin types, traits, methods, and + members (default: ``True``). `requiredelimiters` If given and ``True``, only highlight code between delimiters as Lasso (default: ``False``). @@ -3186,13 +3186,15 @@ class LassoLexer(RegexLexer): # names (r'\$[a-z_][\w.]*', Name.Variable), - (r'#[a-z_][\w.]*|#\d+', Name.Variable.Instance), + (r'#([a-z_][\w.]*|\d+)', Name.Variable.Instance), (r"(\.)('[a-z_][\w.]*')", bygroups(Name.Builtin.Pseudo, Name.Variable.Class)), - (r"(self)(->)('[a-z_][\w.]*')", + (r"(self)(\s*->\s*)('[a-z_][\w.]*')", bygroups(Name.Builtin.Pseudo, Operator, Name.Variable.Class)), (r'(\.\.?)([a-z_][\w.]*)', - bygroups(Name.Builtin.Pseudo, Name.Other)), + bygroups(Name.Builtin.Pseudo, Name.Other.Member)), + (r'(->\\?\s*|&\s*)([a-z_][\w.]*)', + bygroups(Operator, Name.Other.Member)), (r'(self|inherited|global|void)\b', Name.Builtin.Pseudo), (r'-[a-z_][\w.]*', Name.Attribute), (r'(::\s*)([a-z_][\w.]*)', bygroups(Punctuation, Name.Label)), @@ -3207,15 +3209,13 @@ class LassoLexer(RegexLexer): r'Error_UpdateError)\b', Name.Exception), # definitions - (r'(define)(\s+)([a-z_][\w.]*)(\s*)(=>)(\s*)(type|trait|thread)\b', - bygroups(Keyword.Declaration, Text, Name.Class, Text, Operator, - Text, Keyword)), - (r'(define)(\s+)([a-z_][\w.]*)(->)([a-z_][\w.]*=?|[-+*/%<>]|==)', + (r'(define)(\s+)([a-z_][\w.]*)(\s*=>\s*)(type|trait|thread)\b', + bygroups(Keyword.Declaration, Text, Name.Class, Operator, Keyword)), + (r'(define)(\s+)([a-z_][\w.]*)(\s*->\s*)([a-z_][\w.]*=?|[-+*/%<>]|==)', bygroups(Keyword.Declaration, Text, Name.Class, Operator, - Name.Function), 'signature'), + Name.Function), 'signature'), (r'(define)(\s+)([a-z_][\w.]*)', - bygroups(Keyword.Declaration, Text, Name.Function), - 'signature'), + bygroups(Keyword.Declaration, Text, Name.Function), 'signature'), (r'(public|protected|private|provide)(\s+)(([a-z_][\w.]*=?|' r'[-+*/%<>]|==)(?=\s*\())', bygroups(Keyword, Text, Name.Function), 'signature'), @@ -3224,14 +3224,13 @@ class LassoLexer(RegexLexer): # keywords (r'(true|false|none|minimal|full|all)\b', Keyword.Constant), - (r'(local|var|variable|data)\b', Keyword.Declaration), + (r'(local|var|variable|data(?=\s))\b', Keyword.Declaration), (r'(array|date|decimal|duration|integer|map|pair|string|tag|xml|' - r'null)\b', Keyword.Type), + r'null|list|queue|set|stack|staticarray)\b', Keyword.Type), (r'([a-z_][\w.]*)(\s+)(in)\b', bygroups(Name, Text, Keyword)), (r'(let|into)(\s+)([a-z_][\w.]*)', bygroups(Keyword, Text, Name)), (r'require\b', Keyword, 'requiresection'), - (r'(/?)(Namespace_Using)\b', - bygroups(Punctuation, Keyword.Namespace)), + (r'(/?)(Namespace_Using)\b', bygroups(Punctuation, Keyword.Namespace)), (r'(/?)(Cache|Database_Names|Database_SchemaNames|' r'Database_TableNames|Define_Tag|Define_Type|Email_Batch|' r'Encode_Set|HTML_Comment|Handle|Handle_Error|Header|If|Inline|' @@ -3249,16 +3248,13 @@ class LassoLexer(RegexLexer): r'frozen|group|handle_failure|import|in|into|join|let|match|max|' r'min|on|order|parent|protected|provide|public|require|skip|' r'split_thread|sum|take|thread|to|trait|type|where|with|yield)\b', - bygroups(Punctuation, Keyword)), + bygroups(Punctuation, Keyword)), # other - (r'(([a-z_][\w.]*=?|[-+*/%<>]|==)(?=\s*\([^)]*\)\s*=>))', - Name.Function, 'signature'), + (r',', Punctuation, 'commamember'), (r'(and|or|not)\b', Operator.Word), - (r'([a-z_][\w.]*)(\s*)(::\s*)([a-z_][\w.]*)(\s*)(=)', - bygroups(Name, Text, Punctuation, Name.Label, Text, Operator)), - (r'((?<!->)[a-z_][\w.]*)(\s*)(=(?!=))', - bygroups(Name, Text, Operator)), + (r'([a-z_][\w.]*)(\s*::\s*)?([a-z_][\w.]*)?(\s*=(?!=))', + bygroups(Name, Punctuation, Name.Label, Operator)), (r'(/?)([\w.]+)', bygroups(Punctuation, Name.Other)), (r'(=)(bw|ew|cn|lte?|gte?|n?eq|ft|n?rx)\b', bygroups(Operator, Operator.Word)), @@ -3310,6 +3306,13 @@ class LassoLexer(RegexLexer): (r'[(,]', Punctuation), include('whitespacecomments'), ], + 'commamember': [ + (r'(([a-z_][\w.]*=?|[-+*/%<>]|==)' + r'(?=\s*(\(([^()]*\([^()]*\))*[^)]*\)\s*)?(::[\w.\s]+)?=>))', + Name.Function, 'signature'), + include('whitespacecomments'), + (r'', Text, '#pop'), + ], } def __init__(self, **options): @@ -3319,10 +3322,13 @@ class LassoLexer(RegexLexer): options, 'requiredelimiters', False) self._builtins = set() + self._members = set() if self.builtinshighlighting: - from pygments.lexers._lassobuiltins import BUILTINS + from pygments.lexers._lassobuiltins import BUILTINS, MEMBERS for key, value in BUILTINS.iteritems(): self._builtins.update(value) + for key, value in MEMBERS.iteritems(): + self._members.update(value) RegexLexer.__init__(self, **options) def get_tokens_unprocessed(self, text): @@ -3331,22 +3337,22 @@ class LassoLexer(RegexLexer): stack.append('delimiters') for index, token, value in \ RegexLexer.get_tokens_unprocessed(self, text, stack): - if token is Name.Other: - if value.lower() in self._builtins: - yield index, Name.Builtin, value - continue + if (token is Name.Other and value.lower() in self._builtins or + token is Name.Other.Member and value.lower() in self._members): + yield index, Name.Builtin, value + continue yield index, token, value def analyse_text(text): rv = 0.0 if 'bin/lasso9' in text: rv += 0.8 - if re.search(r'<\?(=|lasso)', text, re.I): + if re.search(r'<\?(=|lasso)|\A\[', text, re.I): rv += 0.4 if re.search(r'local\(', text, re.I): rv += 0.4 - if re.search(r'\[\n|\?>', text): - rv += 0.4 + if '?>' in text: + rv += 0.1 return rv diff --git a/tests/examplefiles/example.ceylon b/tests/examplefiles/example.ceylon index b136b995..04223c56 100644 --- a/tests/examplefiles/example.ceylon +++ b/tests/examplefiles/example.ceylon @@ -1,33 +1,52 @@ +import ceylon.language { parseInteger } + doc "A top-level function, with multi-line documentation." -void topLevel(String? a, Integer b=5, String... seqs) { +void topLevel(String? a, Integer b=5, String* seqs) { function nested(String s) { print(s[1..2]); return true; } - for (s in seqs.filter((String x) x.size > 2)) { + for (s in seqs.filter((String x) => x.size > 2)) { nested(s); } - value uppers = seqs.sequence[].uppercased; - String|Nothing z = a; - Sequence<Integer> ints = { 1, 2, 3, 4, 5 }; + value uppers = seqs.map((String x) { + return x.uppercased; + }); + String|Null z = a; + {Integer+} ints = { 1, 2, 3, 4, 5 }; + value numbers = [ 1, #ffff, #ffff_ffff, $10101010, $1010_1010_1010_1010, + 123_456_789 ]; + value chars = ['a', '\{#ffff}' ]; } -shared class Example<Element>(name, element) satisfies Comparable<Example<Element>> +shared class Example_1<Element>(name, element) satisfies Comparable<Example_1<Element>> given Element satisfies Comparable<Element> { shared String name; shared Element element; + shared [Integer,String] tuple = [1, "2"]; + shared late String lastName; + variable Integer cnt = 0; + + shared Integer count => cnt; + assign count { + assert(count >= cnt); + cnt = count; + } - shared actual Comparison compare(Example<Element> other) { + shared actual Comparison compare(Example_1<Element> other) { return element <=> other.element; } shared actual String string { - return "Example with " + element.string; + return "Example with ``element.string``"; } } -Example<Integer> instance = Example { - name = "Named args call"; +Example_1<Integer> instance = Example_1 { element = 5; + name = "Named args call \{#0060}"; }; + +object example1 extends Example_1<Integer>("object", 5) { +}
\ No newline at end of file diff --git a/tests/examplefiles/example.clay b/tests/examplefiles/example.clay new file mode 100644 index 00000000..784752c6 --- /dev/null +++ b/tests/examplefiles/example.clay @@ -0,0 +1,33 @@ + +/// @section StringLiteralRef + +record StringLiteralRef ( + sizep : Pointer[SizeT], +); + + +/// @section predicates + +overload ContiguousSequence?(#StringLiteralRef) : Bool = true; +[s when StringLiteral?(s)] +overload ContiguousSequence?(#Static[s]) : Bool = true; + + + +/// @section size, begin, end, index + +forceinline overload size(a:StringLiteralRef) = a.sizep^; + +forceinline overload begin(a:StringLiteralRef) : Pointer[Char] = Pointer[Char](a.sizep + 1); +forceinline overload end(a:StringLiteralRef) = begin(a) + size(a); + +[I when Integer?(I)] +forceinline overload index(a:StringLiteralRef, i:I) : ByRef[Char] { + assert["boundsChecks"](i >= 0 and i < size(a), "StringLiteralRef index out of bounds"); + return ref (begin(a) + i)^; +} + +foo() = """ +long\tlong +story +""" diff --git a/tests/examplefiles/example.stan b/tests/examplefiles/example.stan index 5723403c..e936f54a 100644 --- a/tests/examplefiles/example.stan +++ b/tests/examplefiles/example.stan @@ -6,92 +6,103 @@ It is not a real model and will not compile # also a comment // also a comment data { - // valid name - int abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_abc; - // all types should be highlighed - int a3; - real foo[2]; - vector[3] bar; - row_vector[3] baz; - matrix[3,3] qux; - simplex[3] quux; - ordered[3] corge; - positive_ordered[3] wibble; - corr_matrix[3] grault; - cov_matrix[3] garply; - - real<lower=-1,upper=1> foo1; - real<lower=0> foo2; - real<upper=0> foo3; - - // bad names - // includes . - // real foo.; - // beings with number - //real 0foo; - // begins with _ - //real _foo; + // valid name + int abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_abc; + // all types should be highlighed + int a3; + real foo[2]; + vector[3] bar; + row_vector[3] baz; + matrix[3,3] qux; + simplex[3] quux; + ordered[3] corge; + positive_ordered[3] wibble; + corr_matrix[3] grault; + cov_matrix[3] garply; + + real<lower=-1,upper=1> foo1; + real<lower=0> foo2; + real<upper=0> foo3; } transformed data { - real xyzzy; - int thud; - row_vector grault2; - matrix qux2; - - // all floating point literals should be recognized - // all operators should be recognized - // paren should be recognized; - xyzzy <- 1234.5687 + .123 - (2.7e3 / 2E-5 * 135e-5); - // integer literal - thud <- -12309865; - // ./ and .* should be recognized as operators - grault2 <- grault .* garply ./ garply; - // ' and \ should be regognized as operators - qux2 <- qux' \ bar; - + real xyzzy; + int thud; + row_vector grault2; + matrix qux2; + + // all floating point literals should be recognized + // all operators should be recognized + // paren should be recognized; + xyzzy <- 1234.5687 + .123 - (2.7e3 / 2E-5 * 135e-5); + // integer literal + thud <- -12309865; + // ./ and .* should be recognized as operators + grault2 <- grault .* garply ./ garply; + // ' and \ should be regognized as operators + qux2 <- qux' \ bar; + } parameters { - real fred; - real plugh; - + real fred; + real plugh; } transformed parameters { } model { - // ~, <- are operators, - // T may be be recognized - // normal is a function - fred ~ normal(0, 1) T(-0.5, 0.5); - // interior block - { - real tmp; - // for, in should be highlighted - for (i in 1:10) { - tmp <- tmp + 0.1; - } - } - // lp__ should be highlighted - // normal_log as a function - lp__ <- lp__ + normal_log(plugh, 0, 1); + // ~, <- are operators, + // T may be be recognized + // normal is a function + fred ~ normal(0, 1) T(-0.5, 0.5); + real tmp; + // C++ reserved + real public; + + // control structures + for (i in 1:10) { + tmp <- tmp + 0.1; + } + tmp <- 0.0; + while (tmp < 5.0) { + tmp <- tmp + 1; + } + if (tmp > 0.0) { + print(tmp); + } else { + print(tmp); + } - // print statement and string literal - print("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_~@#$%^&*`'-+={}[].,;: "); - print("Hello, world!"); - print(""); + // operators + tmp || tmp; + tmp && tmp; + tmp == tmp; + tmp != tmp; + tmp < tmp; + tmp <= tmp; + tmp > tmp; + tmp >= tmp; + tmp + tmp; + tmp - tmp; + tmp * tmp; + tmp / tmp; + tmp .* tmp; + tmp ./ tmp; + ! tmp; + - tmp; + + tmp; + tmp '; + // lp__ should be highlighted + // normal_log as a function + lp__ <- lp__ + normal_log(plugh, 0, 1); + + // print statement and string literal + print("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_~@#$%^&*`'-+={}[].,;: "); + print("Hello, world!"); + print(""); + } generated quantities { - real bar1; - bar1 <- foo + 1; + real bar1; + bar1 <- foo + 1; } -## Baddness -//foo <- 2.0; -//foo ~ normal(0, 1); -//not_a_block { -//} - -/* -what happens with this? -*/ -// */ |