Merge pull request #3773 from portalgun/matlab-setget

MatLab: return appropriate tags for set get methods + unit

Units/parser-matlab.r/matlab_setget.m.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+

Units/parser-matlab.r/matlab_setget.m.d/expected.tags

@@ -0,0 +1,16 @@
+input	input.m	/^classdef input < handle$/;"	c
+get.myproperty	input.m	/^    function out=get.myproperty(obj)$/;"	f
+set.myproperty	input.m	/^    function out=set.myproperty(obj,val)$/;"	f
+classfunc1	input.m	/^        function [x,y,z] = classfunc1$/;"	f
+classfunc2	input.m	/^        function x = classfunc2()$/;"	f
+x	input.m	/^            x = func2(1);$/;"	v
+classfunc3	input.m	/^        function classfunc3;$/;"	f
+func1	input.m	/^function [x,y,z] = func1() % Silly function with multiple outputs$/;"	f
+x	input.m	/^    x = 1;$/;"	v
+y	input.m	/^    y = 2;$/;"	v
+z	input.m	/^    z = 3;$/;"	v
+func2	input.m	/^function x = func2(arg)$/;"	f
+x	input.m	/^    x = arg;$/;"	v
+func3	input.m	/^function func3()$/;"	f
+A	input.m	/^    A = magic(4);$/;"	v
+R	input.m	/^    R = randn(3,4,5);$/;"	v

Units/parser-matlab.r/matlab_setget.m.d/features

@@ -0,0 +1 @@
+regex

Units/parser-matlab.r/matlab_setget.m.d/input.m

@@ -0,0 +1,45 @@
+classdef input < handle
+    properties
+        myproperty
+    end
+    properties(Hidden)
+        myproperty_
+    end
+    function out=get.myproperty(obj)
+        out=myproperty_;
+    end
+    function out=set.myproperty(obj,val)
+        myproperty_=val;
+    end
+    methods(Static)
+        function [x,y,z] = classfunc1
+            [x, y, z] = func1();
+        end
+        function x = classfunc2()
+            x = func2(1);
+        end
+        function classfunc3;
+            func3();
+        end
+    end
+end
+
+function [x,y,z] = func1() % Silly function with multiple outputs
+    x = 1;
+    y = 2;
+    z = 3;
+end
+function x = func2(arg)
+    x = arg;
+end
+function func3()
+    % Silly function without any arguments
+    A = magic(4);
+    R = randn(3,4,5);
+
+    disp('A:');
+    disp(A);
+
+    disp('R:');
+    disp(R);
+end

parsers/matlab.c

@@ -19,13 +19,13 @@
 
 static tagRegexTable matlabTagRegexTable [] = {
 	/* function [x,y,z] = asdf */
-	{ "^[ \t]*function[ \t]*\\[.*\\][ \t]*=[ \t]*([a-zA-Z0-9_]+)",
+	{ "^[ \t]*function[ \t]*\\[.*\\][ \t]*=[ \t]*([.a-zA-Z0-9_]+)",
 	  "\\1", "f,function", NULL},
 	/* function x = asdf */
-	{"^[ \t]*function[ \t]*[a-zA-Z0-9_]+[ \t]*=[ \t]*([a-zA-Z0-9_]+)",
+	{"^[ \t]*function[ \t]*[a-zA-Z0-9_]+[ \t]*=[ \t]*([.a-zA-Z0-9_]+)",
 	 "\\1", "f,function", NULL},
 	/* function asdf */
-	{"^[ \t]*function[ \t]*([a-zA-Z0-9_]+)[^=]*$", "\\1",
+	{"^[ \t]*function[ \t]*([.a-zA-Z0-9_]+)[^=]*$", "\\1",
 	 "f,function", NULL},
 	/* variables */
 	{"^[ \t]*([a-zA-Z0-9_]+)[ \t]*=[ \t]", "\\1",