haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract swig binding macros to their own header

This commit is contained in:
Marek Roszko 2020-10-23 23:33:04 -04:00
parent 304e5faf36
commit 4d5796fb9a
6 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/swig/kicad.i
View File

@ -81,7 +81,7 @@ principle should be easily implemented by adapting the current STL containers.
%{
#include <outline_mode.h>
#include <macros.h>
#include <macros_swig.h>
#include <cstddef>
#include <eda_item.h>
#include <eda_rect.h>
@ -109,7 +109,7 @@ principle should be easily implemented by adapting the current STL containers.
// header files that must be wrapped
%include <outline_mode.h>
%include macros.h
%include macros_swig.h
%include core/typeinfo.h
%include eda_item.h
%include eda_rect.h

1
include/common.h
View File

@ -52,6 +52,7 @@
#include <boost/uuid/uuid.hpp>
#include <core/kicad_algo.h>
#include <macros.h>
#include <macros_swig.h>
class PROJECT;
class SEARCH_STACK;

1
include/layers_id_colors_and_visibility.h
View File

@ -31,6 +31,7 @@
#ifndef LAYERS_ID_AND_VISIBILITY_H_
#define LAYERS_ID_AND_VISIBILITY_H_
#include <set>
#include <vector>
#include <bitset>
#include <wx/string.h>

23
include/macros.h
View File

@ -31,12 +31,6 @@
#ifndef MACROS_H
#define MACROS_H
#include <deque>
#include <vector>
#include <map>
#include <set>
#include <memory> // std::shared_ptr
#include <wx/string.h>
#if defined( __has_attribute )
@ -144,21 +138,4 @@ void MIRROR( T& aPoint, const T& aMirrorRef )
aPoint = Mirror( aPoint, aMirrorRef );
}
#ifdef SWIG
/// Declare a std::vector and also the swig %template in unison
#define DECL_VEC_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) vector<MemberType>; } typedef std::vector<MemberType> TypeName;
#define DECL_DEQ_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) deque<MemberType>; } typedef std::deque<MemberType> TypeName;
#define DECL_MAP_FOR_SWIG(TypeName, KeyType, ValueType) namespace std { %template(TypeName) map<KeyType, ValueType>; } typedef std::map<KeyType, ValueType> TypeName;
#define DECL_SPTR_FOR_SWIG(TypeName, MemberType) %shared_ptr(MemberType) namespace std { %template(TypeName) shared_ptr<MemberType>; } typedef std::shared_ptr<MemberType> TypeName;
#define DECL_SET_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) set<MemberType>; } typedef std::set<MemberType> TypeName;
#else
/// Declare a std::vector but no swig %template
#define DECL_VEC_FOR_SWIG(TypeName, MemberType) typedef std::vector<MemberType> TypeName;
#define DECL_DEQ_FOR_SWIG(TypeName, MemberType) typedef std::deque<MemberType> TypeName;
#define DECL_MAP_FOR_SWIG(TypeName, KeyType, ValueType) typedef std::map<KeyType, ValueType> TypeName;
#define DECL_SPTR_FOR_SWIG(TypeName, MemberType) typedef std::shared_ptr<MemberType> TypeName;
#define DECL_SET_FOR_SWIG(TypeName, MemberType) typedef std::set<MemberType> TypeName;
#endif
#endif // MACROS_H

57
include/macros_swig.h Normal file
View File

@ -0,0 +1,57 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 Ian McInerney <ian.s.mcinerney@ieee.org>
* Copyright (C) 2007-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2020 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file macros_swig.h
* @brief This file contains macros just for swig binding
*/
#ifndef MACROS_SWIG_H
#define MACROS_SWIG_H
#include <deque>
#include <vector>
#include <map>
#include <set>
#include <memory> // std::shared_ptr
#ifdef SWIG
/// Declare a std::vector and also the swig %template in unison
#define DECL_VEC_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) vector<MemberType>; } typedef std::vector<MemberType> TypeName;
#define DECL_DEQ_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) deque<MemberType>; } typedef std::deque<MemberType> TypeName;
#define DECL_MAP_FOR_SWIG(TypeName, KeyType, ValueType) namespace std { %template(TypeName) map<KeyType, ValueType>; } typedef std::map<KeyType, ValueType> TypeName;
#define DECL_SPTR_FOR_SWIG(TypeName, MemberType) %shared_ptr(MemberType) namespace std { %template(TypeName) shared_ptr<MemberType>; } typedef std::shared_ptr<MemberType> TypeName;
#define DECL_SET_FOR_SWIG(TypeName, MemberType) namespace std { %template(TypeName) set<MemberType>; } typedef std::set<MemberType> TypeName;
#else
/// Declare a std::vector but no swig %template
#define DECL_VEC_FOR_SWIG(TypeName, MemberType) typedef std::vector<MemberType> TypeName;
#define DECL_DEQ_FOR_SWIG(TypeName, MemberType) typedef std::deque<MemberType> TypeName;
#define DECL_MAP_FOR_SWIG(TypeName, KeyType, ValueType) typedef std::map<KeyType, ValueType> TypeName;
#define DECL_SPTR_FOR_SWIG(TypeName, MemberType) typedef std::shared_ptr<MemberType> TypeName;
#define DECL_SET_FOR_SWIG(TypeName, MemberType) typedef std::set<MemberType> TypeName;
#endif
#endif // MACROS2_H

2
include/netclass.h
View File

@ -27,9 +27,9 @@
#define CLASS_NETCLASS_H
#include <macros.h>
#include <gal/color4d.h>
#include <core/optional.h>
#include <macros_swig.h>
class LINE_READER;
class BOARD;