12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed incorrect void, which fixed old problems and even improves on generated code.

release/4.3a0
dellaert 2014-12-01 10:30:47 +01:00
parent 9bebedc684
commit 0e5332ed3e
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wrap/Module.cpp
View File

@ -119,7 +119,6 @@ void Module::parseMarkup(const std::string& data) {
vector<Qualified> templateArgValues; vector<Qualified> templateArgValues;
TypeGrammar templateArgValue_g(templateArgValue); TypeGrammar templateArgValue_g(templateArgValue);
Rule templateArgValue_p = templateArgValue_g Rule templateArgValue_p = templateArgValue_g
[assign_a(templateArgValue.category, Qualified::VOID)] // TODO: why ?
[push_back_a(templateArgValues, templateArgValue)] [push_back_a(templateArgValues, templateArgValue)]
[clear_a(templateArgValue)]; [clear_a(templateArgValue)];

12
wrap/tests/expected2/MyTemplatePoint2.m
View File

@ -83,7 +83,7 @@ classdef MyTemplatePoint2 < MyBase
% RETURN_T usage: return_T(Point2 value) : returns gtsam::Point2 % RETURN_T usage: return_T(Point2 value) : returns gtsam::Point2
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2')
geometry_wrapper(52, this, varargin{:}); varargout{1} = geometry_wrapper(52, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.return_T'); error('Arguments do not match any overload of function MyTemplatePoint2.return_T');
end end
@ -93,7 +93,7 @@ classdef MyTemplatePoint2 < MyBase
% RETURN_TPTR usage: return_Tptr(Point2 value) : returns gtsam::Point2 % RETURN_TPTR usage: return_Tptr(Point2 value) : returns gtsam::Point2
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2')
geometry_wrapper(53, this, varargin{:}); varargout{1} = geometry_wrapper(53, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.return_Tptr'); error('Arguments do not match any overload of function MyTemplatePoint2.return_Tptr');
end end
@ -113,7 +113,7 @@ classdef MyTemplatePoint2 < MyBase
% TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'double') if length(varargin) == 1 && isa(varargin{1},'double')
geometry_wrapper(55, this, varargin{:}); varargout{1} = geometry_wrapper(55, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod');
end end
@ -123,7 +123,7 @@ classdef MyTemplatePoint2 < MyBase
% TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns gtsam::Point2 % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns gtsam::Point2
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2')
geometry_wrapper(56, this, varargin{:}); varargout{1} = geometry_wrapper(56, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod');
end end
@ -133,7 +133,7 @@ classdef MyTemplatePoint2 < MyBase
% TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns gtsam::Point3 % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns gtsam::Point3
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3')
geometry_wrapper(57, this, varargin{:}); varargout{1} = geometry_wrapper(57, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod');
end end
@ -143,7 +143,7 @@ classdef MyTemplatePoint2 < MyBase
% TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1
geometry_wrapper(58, this, varargin{:}); varargout{1} = geometry_wrapper(58, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod');
end end

12
wrap/tests/expected2/MyTemplatePoint3.m
View File

@ -83,7 +83,7 @@ classdef MyTemplatePoint3 < MyBase
% RETURN_T usage: return_T(Point3 value) : returns gtsam::Point3 % RETURN_T usage: return_T(Point3 value) : returns gtsam::Point3
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3')
geometry_wrapper(67, this, varargin{:}); varargout{1} = geometry_wrapper(67, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.return_T'); error('Arguments do not match any overload of function MyTemplatePoint3.return_T');
end end
@ -93,7 +93,7 @@ classdef MyTemplatePoint3 < MyBase
% RETURN_TPTR usage: return_Tptr(Point3 value) : returns gtsam::Point3 % RETURN_TPTR usage: return_Tptr(Point3 value) : returns gtsam::Point3
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3')
geometry_wrapper(68, this, varargin{:}); varargout{1} = geometry_wrapper(68, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.return_Tptr'); error('Arguments do not match any overload of function MyTemplatePoint3.return_Tptr');
end end
@ -113,7 +113,7 @@ classdef MyTemplatePoint3 < MyBase
% TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'double') if length(varargin) == 1 && isa(varargin{1},'double')
geometry_wrapper(70, this, varargin{:}); varargout{1} = geometry_wrapper(70, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod');
end end
@ -123,7 +123,7 @@ classdef MyTemplatePoint3 < MyBase
% TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns gtsam::Point2 % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns gtsam::Point2
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2')
geometry_wrapper(71, this, varargin{:}); varargout{1} = geometry_wrapper(71, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod');
end end
@ -133,7 +133,7 @@ classdef MyTemplatePoint3 < MyBase
% TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns gtsam::Point3 % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns gtsam::Point3
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3')
geometry_wrapper(72, this, varargin{:}); varargout{1} = geometry_wrapper(72, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod');
end end
@ -143,7 +143,7 @@ classdef MyTemplatePoint3 < MyBase
% TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector
% Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html
if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1
geometry_wrapper(73, this, varargin{:}); varargout{1} = geometry_wrapper(73, this, varargin{:});
else else
error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod');
end end

12
wrap/tests/expected2/geometry_wrapper.cpp
View File

@ -685,20 +685,22 @@ void MyTemplatePoint2_templatedMethod_55(int nargout, mxArray *out[], int nargin
void MyTemplatePoint2_templatedMethod_56(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint2_templatedMethod_56(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<gtsam::Point2> SharedPoint2;
typedef boost::shared_ptr<MyTemplatePoint2> Shared; typedef boost::shared_ptr<MyTemplatePoint2> Shared;
checkArguments("templatedMethodPoint2",nargout,nargin-1,1); checkArguments("templatedMethodPoint2",nargout,nargin-1,1);
Shared obj = unwrap_shared_ptr<MyTemplatePoint2>(in[0], "ptr_MyTemplatePoint2"); Shared obj = unwrap_shared_ptr<MyTemplatePoint2>(in[0], "ptr_MyTemplatePoint2");
gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2");
out[0] = wrap< gtsam::Point2 >(obj->templatedMethod<gtsam::Point2>(t)); out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->templatedMethod<gtsam::Point2>(t))),"gtsam.Point2", false);
} }
void MyTemplatePoint2_templatedMethod_57(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint2_templatedMethod_57(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<gtsam::Point3> SharedPoint3;
typedef boost::shared_ptr<MyTemplatePoint2> Shared; typedef boost::shared_ptr<MyTemplatePoint2> Shared;
checkArguments("templatedMethodPoint3",nargout,nargin-1,1); checkArguments("templatedMethodPoint3",nargout,nargin-1,1);
Shared obj = unwrap_shared_ptr<MyTemplatePoint2>(in[0], "ptr_MyTemplatePoint2"); Shared obj = unwrap_shared_ptr<MyTemplatePoint2>(in[0], "ptr_MyTemplatePoint2");
gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3");
out[0] = wrap< gtsam::Point3 >(obj->templatedMethod<gtsam::Point3>(t)); out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(obj->templatedMethod<gtsam::Point3>(t))),"gtsam.Point3", false);
} }
void MyTemplatePoint2_templatedMethod_58(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint2_templatedMethod_58(int nargout, mxArray *out[], int nargin, const mxArray *in[])
@ -847,20 +849,22 @@ void MyTemplatePoint3_templatedMethod_70(int nargout, mxArray *out[], int nargin
void MyTemplatePoint3_templatedMethod_71(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint3_templatedMethod_71(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<gtsam::Point2> SharedPoint2;
typedef boost::shared_ptr<MyTemplatePoint3> Shared; typedef boost::shared_ptr<MyTemplatePoint3> Shared;
checkArguments("templatedMethodPoint2",nargout,nargin-1,1); checkArguments("templatedMethodPoint2",nargout,nargin-1,1);
Shared obj = unwrap_shared_ptr<MyTemplatePoint3>(in[0], "ptr_MyTemplatePoint3"); Shared obj = unwrap_shared_ptr<MyTemplatePoint3>(in[0], "ptr_MyTemplatePoint3");
gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2");
out[0] = wrap< gtsam::Point2 >(obj->templatedMethod<gtsam::Point2>(t)); out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->templatedMethod<gtsam::Point2>(t))),"gtsam.Point2", false);
} }
void MyTemplatePoint3_templatedMethod_72(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint3_templatedMethod_72(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<gtsam::Point3> SharedPoint3;
typedef boost::shared_ptr<MyTemplatePoint3> Shared; typedef boost::shared_ptr<MyTemplatePoint3> Shared;
checkArguments("templatedMethodPoint3",nargout,nargin-1,1); checkArguments("templatedMethodPoint3",nargout,nargin-1,1);
Shared obj = unwrap_shared_ptr<MyTemplatePoint3>(in[0], "ptr_MyTemplatePoint3"); Shared obj = unwrap_shared_ptr<MyTemplatePoint3>(in[0], "ptr_MyTemplatePoint3");
gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3");
out[0] = wrap< gtsam::Point3 >(obj->templatedMethod<gtsam::Point3>(t)); out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(obj->templatedMethod<gtsam::Point3>(t))),"gtsam.Point3", false);
} }
void MyTemplatePoint3_templatedMethod_73(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint3_templatedMethod_73(int nargout, mxArray *out[], int nargin, const mxArray *in[])