@@ -146,6 +146,22 @@
<string>comment.line.percentage.matlab</string>
</dict>
<dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.matlab</string>
+ </dict>
+ </dict>
+ <key>comment</key>
+ <string>Add support for octave style comments</string>
+ <key>match</key>
+ <string>(#).*$\n?</string>
+ <key>name</key>
+ <string>comment.line.pound_sign.matlab</string>
+ </dict>
+ <dict>
<key>match</key>
<string>[a-zA-Z)\]]'</string>
<key>name</key>
@@ -226,7 +242,7 @@
((?>[a-zA-Z_]\w*))?
(?>\s*=\s*)?
((?>[a-zA-Z_]\w*(?>[?!]|=(?!>))? )) # the function name
- (?=[ \t]*[^\s%]) # make sure arguments and not a comment follow
+ (?=[ \t]*[^\s%|#]) # make sure arguments and not a comment follow
\s*(\() # the opening parenthesis for arguments
</string>
<key>beginCaptures</key>
@@ -329,13 +345,13 @@
</dict>
<dict>
<key>match</key>
- <string>\b(DEFAULT_EXEC_PATH|ignore_function_time_stamp|DEFAULT_LOADPATH|max_recursion_depth|EDITOR|output_max_field_width|EXEC_PATH|output_precision|IMAGEPATH|page_output_immediately|INFO_FILE|page_screen_output|INFO_PROGRAM|print_answer_id_name|LOADPATH|print_empty_dimensions|MAKEINFO_PROGRAM|print_rhs_assign_val|PAGER|save_header_format_string|PS1|save_precision|PS2|saving_history|PS4|sighup_dumps_octave_core|__kluge_procbuf_delay__|sigterm_dumps_octave_core|__nargin__|silent_functions|ans|split_long_rows|automatic_replot|string_fill_char|beep_on_error|struct_levels_to_print|completion_append_char|suppress_verbose_help_message|crash_dumps_octave_core|variables_can_hide_functions|current_script_file_name|warn_assign_as_truth_value|debug_on_error|warn_divide_by_zero|debug_on_interrupt|warn_empty_list_elements|debug_on_warning|warn_fortran_indexing|debug_symtab_lookups|warn_function_name_clash|default_save_format|warn_future_time_stamp|echo_executing_commands|warn_imag_to_real|fixed_point_format|warn_matlab_incompatible|gnuplot_binary|warn_missing_semicolon|gnuplot_command_axes|warn_neg_dim_as_zero|gnuplot_command_end|warn_num_to_str|gnuplot_command_plot|warn_precedence_change|gnuplot_command_replot|warn_reload_forces_clear|gnuplot_command_splot|warn_resize_on_range_error|gnuplot_command_title|warn_separator_insert|gnuplot_command_using|warn_single_quote_string|gnuplot_command_with|warn_str_to_num|gnuplot_has_frames|warn_undefined_return_values|history_file|warn_variable_switch_label|history_size)\b</string>
+ <string>\b(DEFAULT_EXEC_PATH|ignore_function_time_stamp|DEFAULT_LOADPATH|max_recursion_depth|EDITOR|output_max_field_width|EXEC_PATH|output_precision|IMAGEPATH|page_output_immediately|INFO_FILE|page_screen_output|INFO_PROGRAM|print_answer_id_name|LOADPATH|print_empty_dimensions|MAKEINFO_PROGRAM|print_rhs_assign_val|PAGER|save_header_format_string|PS1|save_precision|PS2|saving_history|PS4|sighup_dumps_octave_core|sigterm_dumps_octave_core|silent_functions|ans|split_long_rows|automatic_replot|string_fill_char|beep_on_error|struct_levels_to_print|completion_append_char|suppress_verbose_help_message|crash_dumps_octave_core|variables_can_hide_functions|current_script_file_name|warn_assign_as_truth_value|debug_on_error|warn_divide_by_zero|debug_on_interrupt|warn_empty_list_elements|debug_on_warning|warn_fortran_indexing|debug_symtab_lookups|warn_function_name_clash|default_save_format|warn_future_time_stamp|echo_executing_commands|warn_imag_to_real|fixed_point_format|warn_matlab_incompatible|gnuplot_binary|warn_missing_semicolon|gnuplot_command_axes|warn_neg_dim_as_zero|gnuplot_command_end|warn_num_to_str|gnuplot_command_plot|warn_precedence_change|gnuplot_command_replot|warn_reload_forces_clear|gnuplot_command_splot|warn_resize_on_range_error|gnuplot_command_title|warn_separator_insert|gnuplot_command_using|warn_single_quote_string|gnuplot_command_with|warn_str_to_num|gnuplot_has_frames|warn_undefined_return_values|history_file|warn_variable_switch_label|history_size)\b</string>
<key>name</key>
<string>support.variable.matlab</string>
</dict>
<dict>
<key>match</key>
- <string>\b(__end__|diary|isvarname|set|casesen|echo|load|show|cd|edit_history|ls|type|chdir|format|mark_as_command|unmark_command|clear|gset|mislocked|which|dbclear|gshow|mlock|who|dbstatus|help|more|whos|dbstop|history|munlock|dbtype|hold|run_history|dbwhere|iskeyword|save)\b</string>
+ <string>\b(diary|isvarname|set|echo|load|show|cd|edit_history|ls|type|chdir|format|mark_as_command|unmark_command|clear|gset|mislocked|which|dbclear|gshow|mlock|who|dbstatus|help|more|whos|dbstop|history|munlock|dbtype|hold|run_history|dbwhere|iskeyword|save)\b</string>
<key>name</key>
<string>keyword.other.commands.matlab</string>
</dict>
@@ -347,7 +363,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(ERRNO|iscellstr|__end__|ischar|__error_text__|iscntrl|__print_symbol_info__|iscomplex|__print_symtab_info__|isdigit|abs|isempty|acos|isfield|acosh|isfinite|airy|isglobal|all|isgraph|angle|ishold|any|isieee|append|isinf|arg|iskeyword|asin|islist|asinh|islogical|assignin|islower|atan|ismatrix|atan2|isna|atanh|isnan|atexit|isnumeric|balance|isprint|besselh|ispunct|besseli|isreal|besselj|isspace|besselk|isstream|bessely|isstreamoff|betainc|isstruct|casesen|isupper|cd|isvarname|ceil|isxdigit|cell|kbhit|cellstr|keyboard|char|kill|chdir|kron|chol|lasterr|class|lastwarn|clc|length|clear|lgamma|clearplot|link|clg|linspace|closeplot|list|colloc|load|completion_matches|localtime|conj|log|cos|log10|cosh|lpsolve|cumprod|lpsolve_options|cumsum|ls|daspk|lsode|daspk_options|lsode_options|dasrt|lstat|dasrt_options|lu|dassl|mark_as_command|dassl_options|max|dbclear|min|dbstatus|mislocked|dbstop|mkdir|dbtype|mkfifo|dbwhere|mkstemp|det|mktime|diag|mlock|diary|more|disp|munlock|do_string_escapes|nargin|document|nargout|dup2|native_float_format|echo|ndims|edit_history|nth|eig|numel|endgrent|octave_config_info|endpwent|octave_tmp_file_name|erf|odessa|erfc|odessa_options|error|ones|error_text|pause|eval|pclose|evalin|permute|exec|pinv|exist|pipe|exit|popen|exp|printf|expm|prod|eye|purge_tmp_files|fclose|putenv|fcntl|puts|fdisp|pwd|feof|qr|ferror|quad|feval|quad_options|fflush|quit|fft|qz|fft2|rand|fgetl|randn|fgets|read_readline_init_file|fieldnames|readdir|file_in_loadpath|readlink|file_in_path|real|filter|rehash|find|rename|find_first_of_in_loadpath|reshape|finite|reverse|fix|rmdir|floor|round|fmod|run_history|fnmatch|save|fopen|scanf|fork|schur|format|set|fprintf|setgrent|fputs|setpwent|fread|shell_cmd|freport|show|frewind|sign|fscanf|sin|fseek|sinh|fsolve|size|fsolve_options|sleep|ftell|sort|func2str|source|functions|splice|fwrite|sprintf|gamma|sqrt|gammainc|sqrtm|gammaln|squeeze|getegid|sscanf|getenv|stat|geteuid|str2func|getgid|streamoff|getgrent|strftime|getgrgid|strptime|getgrnam|sum|getpgrp|sumsq|getpid|svd|getppid|syl|getpwent|symlink|getpwnam|system|getpwuid|tan|getrusage|tanh|getuid|tilde_expand|givens|time|glob|tmpfile|gmtime|tmpnam|graw|toascii|gset|tolower|gshow|toupper|help|type|hess|typeinfo|history|umask|hold|undo_string_escapes|home|unlink|ifft|unmark_command|ifft2|usage|imag|usleep|input|va_arg|input_event_hook|va_start|inv|vr_val|inverse|waitpid|ipermute|warning|is_nan_or_na|warranty|isalnum|which|isalpha|who|isascii|whos|isbool|zeros|iscell)\b</string>
+ <string>\b(ERRNO|iscellstr|ischar|iscntrl|iscomplex|isdigit|abs|isempty|acos|isfield|acosh|isfinite|airy|isglobal|all|isgraph|angle|ishold|any|isieee|append|isinf|arg|iskeyword|asin|islist|asinh|islogical|assignin|islower|atan|ismatrix|atan2|isna|atanh|isnan|atexit|isnumeric|balance|isprint|besselh|ispunct|besseli|isreal|besselj|isspace|besselk|isstream|bessely|isstreamoff|betainc|isstruct|casesen|isupper|cd|isvarname|ceil|isxdigit|cell|kbhit|cellstr|keyboard|char|kill|chdir|kron|chol|lasterr|class|lastwarn|clc|length|clear|lgamma|clear/|link|clg|linspace|closeplot|list|colloc|load|completion_matches|localtime|conj|log|cos|log10|cosh|lpsolve|cumprod|lpsolve_options|cumsum|ls|daspk|lsode|daspk_options|lsode_options|dasrt|lstat|dasrt_options|lu|dassl|mark_as_command|dassl_options|max|dbclear|min|dbstatus|mislocked|dbstop|mkdir|dbtype|mkfifo|dbwhere|mkstemp|det|mktime|diag|mlock|diary|more|disp|munlock|do_string_escapes|nargin|document|nargout|dup2|native_float_format|echo|ndims|edit_history|nth|eig|numel|endgrent|octave_config_info|endpwent|octave_tmp_file_name|erf|odessa|erfc|odessa_options|error|ones|error_text|pause|eval|pclose|evalin|permute|exec|pinv|exist|pipe|exit|popen|exp|printf|expm|prod|eye|purge_tmp_files|fclose|putenv|fcntl|puts|fdisp|pwd|feof|qr|ferror|quad|feval|quad_options|fflush|quit|fft|qz|fft2|rand|fgetl|randn|fgets|read_readline_init_file|fieldnames|readdir|file_in_loadpath|readlink|file_in_path|real|filter|rehash|find|rename|find_first_of_in_loadpath|reshape|finite|reverse|fix|rmdir|floor|round|fmod|run_history|fnmatch|save|fopen|scanf|fork|schur|format|set|fprintf|setgrent|fputs|setpwent|fread|shell_cmd|freport|show|frewind|sign|fscanf|sin|fseek|sinh|fsolve|size|fsolve_options|sleep|ftell|sort|func2str|source|functions|splice|fwrite|sprintf|gamma|sqrt|gammainc|sqrtm|gammaln|squeeze|getegid|sscanf|getenv|stat|geteuid|str2func|getgid|streamoff|getgrent|strftime|getgrgid|strptime|getgrnam|sum|getpgrp|sumsq|getpid|svd|getppid|syl|getpwent|symlink|getpwnam|system|getpwuid|tan|getrusage|tanh|getuid|tilde_expand|givens|time|glob|tmpfile|gmtime|tmpnam|graw|toascii|gset|tolower|gshow|toupper|help|type|hess|typeinfo|history|umask|hold|undo_string_escapes|home|unlink|ifft|unmark_command|ifft2|usage|imag|usleep|input|va_arg|input_event_hook|va_start|inv|vr_val|inverse|waitpid|ipermute|warning|is_nan_or_na|warranty|isalnum|which|isalpha|who|isascii|whos|isbool|zeros|iscell)\b</string>
<key>name</key>
<string>support.function.general.matlab</string>
</dict>
@@ -359,7 +375,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(DEMOcontrol|bode_bounds|dlqe|lqe|obsv|__bodquist__|controldemo|dlqr|lqg|place|__freqresp__|ctrb|dlyap|lqr|pzmap|__stepimp__|damp|dre|lsim|rldemo|analdemo|dare|frdemo|ltifr|rlocus|are|dcgain|freqchkw|lyap|step|bddemo|dgram|gram|nichols|tzero|bode|dkalman|impulse|nyquist|tzero2)\b</string>
+ <string>\b(DEMOcontrol|bode_bounds|dlqe|lqe|obsv|controldemo|dlqr|lqg|place|ctrb|dlyap|lqr|pzmap|damp|dre|lsim|rldemo|analdemo|dare|frdemo|ltifr|rlocus|are|dcgain|freqchkw|lyap|step|bddemo|dgram|gram|nichols|tzero|bode|dkalman|impulse|nyquist|tzero2)\b</string>
<key>name</key>
<string>support.function.control.base.matlab</string>
</dict>
@@ -371,25 +387,37 @@
</dict>
<dict>
<key>match</key>
+ <string>\b(interp(1|2|3|m|n|q)?|griddata(3|n)?)\b</string>
+ <key>name</key>
+ <string>support.function.interpolation.matlab</string>
+ </dict>
+ <dict>
+ <key>match</key>
+ <string>\b(delaunay(n|3)?|voronoi(n)?|convhull(n)?|qhull|tsearch|dsearch)\b</string>
+ <key>name</key>
+ <string>support.function.geometry.matlab</string>
+ </dict>
+ <dict>
+ <key>match</key>
<string>\b(dezero|packsys|series|syschnames|dlqg|qzval|swapcols|unpacksys|minfo|rotg|swaprows)\b</string>
<key>name</key>
<string>invalid.deprecated.obsolete.function.control.matlab</string>
</dict>
<dict>
<key>match</key>
- <string>\b(__abcddims__|is_observable|sys2tf|sysprune|__syschnamesl__|is_sample|sys2zp|sysreorder|__syscont_disc__|is_signal_list|sysadd|sysrepdemo|__sysdefioname__|is_siso|sysappend|sysscale|__sysdefstname__|is_stabilizable|syschtsam|syssetsignals|__sysgroupn__|is_stable|sysconnect|syssub|__tf2sysl__|jet707|syscont|sysupdate|__zp2ssg2__|listidx|sysdimensions|tf2ss|abcddim|moddemo|sysdisc|tf2sys|buildssic|ord2|sysdup|tf2zp|c2d|packedform|sysgetsignals|tfout|d2c|parallel|sysgettsam|ugain|dmr2d|ss2sys|sysgettype|zp2ss|fir2sys|ss2tf|sysgroup|zp2sys|is_abcd|ss2zp|sysidx|zp2tf|is_controllable|starp|sysmin|zpout|is_detectable|sys2fir|sysmult|is_digital|sys2ss|sysout)\b</string>
+ <string>\b(is_observable|sys2tf|sysprune|is_sample|sys2zp|sysreorder|is_signal_list|sysadd|sysrepdemo|is_siso|sysappend|sysscale|is_stabilizable|syschtsam|syssetsignals|is_stable|sysconnect|syssub|jet707|syscont|sysupdate|listidx|sysdimensions|tf2ss|abcddim|moddemo|sysdisc|tf2sys|buildssic|ord2|sysdup|tf2zp|c2d|packedform|sysgetsignals|tfout|d2c|parallel|sysgettsam|ugain|dmr2d|ss2sys|sysgettype|zp2ss|fir2sys|ss2tf|sysgroup|zp2sys|is_abcd|ss2zp|sysidx|zp2tf|is_controllable|starp|sysmin|zpout|is_detectable|sys2fir|sysmult|is_digital|sys2ss|sysout)\b</string>
<key>name</key>
<string>support.function.control.system.matlab</string>
</dict>
<dict>
<key>match</key>
- <string>\b(__outlist__|run_cmd|zgfmul|zgrownorm|__zgpbal__|sortcom|zgfslv|zgscal|axis2dlim|strappend|zginit|zgsgiv|prompt|swap|zgreduce|zgshsr)\b</string>
+ <string>\b(run_cmd|zgfmul|zgrownorm|sortcom|zgfslv|zgscal|axis2dlim|strappend|zginit|zgsgiv|prompt|swap|zgreduce|zgshsr)\b</string>
<key>name</key>
<string>support.function.control.util.matlab</string>
</dict>
<dict>
<key>match</key>
- <string>\b(is_bool|is_matrix|is_struct|setstr|is_complex|is_scalar|is_symmetric|struct_contains|is_global|is_square|is_vector|struct_elements|is_list|is_stream|isstr)\b</string>
+ <string>\b(casesen|is_bool|is_matrix|is_struct|setstr|is_complex|is_scalar|is_symmetric|struct_contains|is_global|is_square|is_vector|struct_elements|is_list|is_stream|isstr)\b</string>
<key>name</key>
<string>invalid.deprecated.function.matlab</string>
</dict>
@@ -437,7 +465,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(__axis_label__|__plt__|loglogerr|semilogyerr|__errcomm__|__pltopt1__|mesh|shg|__errplot__|__pltopt__|meshdom|sombrero|__plr1__|axis|meshgrid|stairs|__plr2__|bar|mplot|subplot|__plr__|bottom_title|multiplot|subwindow|__plt1__|close|oneplot|title|__plt2__|contour|plot|top_title|__plt2mm__|errorbar|plot_border|xlabel|__plt2mv__|figure|polar|ylabel|__plt2ss__|grid|semilogx|zlabel|__plt2vm__|hist|semilogxerr|__plt2vv__|loglog|semilogy)\b</string>
+ <string>\b(loglogerr|semilogyerr|mesh|shg|meshdom|sombrero|axis|meshgrid|stairs|bar|mplot|subplot|bottom_title|multiplot|subwindow|close|oneplot|title|contour|plot|top_title|errorbar|plot_border|xlabel|figure|polar|ylabel|grid|semilogx|zlabel|hist|semilogxerr|loglog|semilogy|plot3|scatter|surf(c|l)?|mesh(c|z)?|waterfall|patch|surface|material|hidden|shading)\b</string>
<key>name</key>
<string>support.function.plot.matlab</string>
</dict>
@@ -455,7 +483,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(complement|create_set|intersection|union)\b</string>
+ <string>\b(complement|create_set|intersect|union|setdiff|unique|setxor|ismember)\b</string>
<key>name</key>
<string>support.function.set.matlab</string>
</dict>
@@ -479,7 +507,7 @@
</dict>
<dict>
<key>match</key>
- <string>\b(center|iqr|median|ranks|table|cloglog|kendall|moment|run_count|values|cor|kurtosis|ols|skewness|var|corrcoef|logit|ppplot|spearman|cov|mahalanobis|probit|statistics|cut|mean|qqplot|std|gls|meansq|range|studentize)\b</string>
+ <string>\b(center|iqr|median|ranks|table|cloglog|kendall|moment|run_count|values|cor|kurtosis|ols|skewness|var|corrcoef|logit|ppplot|spearman|cov|mahalanobis|probit|statistics|cut|mean|qqplot|std|gls|meansq|range|studentize|nanmean|nanmedian|nansum|nanvar|nanstd|nanmin|nanmax|nancov)\b</string>
<key>name</key>
<string>support.function.statistics.base.matlab</string>
</dict>
@@ -513,6 +541,12 @@
<key>name</key>
<string>support.function.time.matlab</string>
</dict>
+ <dict>
+ <key>match</key>
+ <string>\b__(abcddims|gnuplot_save_data|isequal|pltopt|area|gnuplot_send_inline_data|lin_interpn|print_symbol_info|axes_limits|gnuplot_set|line|print_symtab_info|axis_label|nargin|qp|bar|next_line_color|quiver|bars|gnuplot_version|norm|request_drawnow|bodquist|go_axes|outlist|scatter|clear_plot_window|go_axes_init|patch|splinen|contour|go_close_all|pchip_deriv|stem|contourc|go_delete|plr1|stepimp|default_plot_options|go_draw_axes|plr2|syschnamesl|delaunayn|go_draw_figure|plt1|sysconcat|dsearchn|go_figure|plt2|syscont_disc|end|go_figure_handles|plt2mm|sysdefioname|errcomm|go_handles|plt2mv|sysdefstname|error_text|go_image|plt2ss|sysgroupn|errplot|go_line|plt2sv|tf2sysl|freqresp|go_patch|plt2vm|tfl|fsolve_defopts|go_surface|plt2vs|token_count|glpk|go_text|plt2vv|version_info|gud_mode|plt|voronoi|gnuplot_raw|img|plt_get_axis_arg|zgpbal|gnuplot_replot|img_via_file|pltopt1|zp2ssg2)__\b</string>
+ <key>name</key>
+ <string>support.function.octave_internal.matlab</string>
+ </dict>
</array>
<key>scopeName</key>
<string>source.matlab</string>
Syntaxes/M.plist
@@ -8,3 +8,7 @@ function aa = test
% at least it's detected as a function!
function bb = test3 ...
(a, b, c)
+
+% Octave style testing:
+function test_neither_hash # comment
+function [a, b, c] = test_both_hash(a, b, c) # Both input and output arguments
Tests/test_functions.m
@@ -121,6 +121,7 @@
<string>9475371F-F8A7-4C46-BAC9-B42E7E34F2AD</string>
<string>F7A928F5-B70D-4DB0-8DEF-F61928038A6C</string>
<string>0EA9BDAD-6EA3-48C4-ADF5-EA549D84CAF0</string>
+ <string>5C7F21FA-156C-4A86-AB20-7F9678010BCA</string>
<string>8E4BA761-42BB-4CFC-B117-A547228878B8</string>
<string>6392FF26-D584-435E-8202-9BC99FF26488</string>
<string>7135F592-1176-478A-BA31-BD8A7DA56F93</string>
info.plist
2ee26657209d746cf564636dfe37eb68335281e9
mattfoster
mattfoster@dfb7d73b-c2ec-0310-8fea-fb051d288c6d
http://github.com/mattfoster/matlab-tmbundle/commit/79759daa8bf268720a49d123ee41ddd8f6cb8bf8
79759daa8bf268720a49d123ee41ddd8f6cb8bf8
2008-05-21T07:02:42-07:00
2008-05-21T07:02:42-07:00
• Added file containing test function definitions. We should correctly hilight all cases but the last (multiline) one.
• Updated menu to contain new snippets
• Updated language definition. This is still work in progress. If anyone has ideas about which of the several thousand Matlab functions to include, let me know!
git-svn-id: http://svn.textmate.org/trunk/Bundles/Matlab.tmbundle@9645 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
28c8319f5daac2e2d5eef2aa4fa93d46db8713c1
mattfoster
mattfoster@dfb7d73b-c2ec-0310-8fea-fb051d288c6d