luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/qt6' into qt6-mac

This commit is contained in:
Kazunari Sekigawa 2021-12-12 06:46:26 +09:00
parent bf8793f41f b6a1d035de
commit a71a7613bd
68 changed files with 1695 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -1,4 +1,7 @@
0.27.6 (2021-xx-xx):
TODO
0.27.5 (2021-11-14):
* Enhancements: Better support for execution (also cross-interpreter) of macro code from scripts
- New methods for the Macro class like "run" and loading from file

20
scripts/mkqtdecl4/mkqtdecl.conf
View File

@ -165,10 +165,30 @@ drop_class "QtGlobal"
drop_class "QThreadStorage"
drop_class "QThreadStorageData"
drop_class "QtMsgHandler"
drop_class "QtMsgType"
drop_class "QtPlugin"
drop_class "QtPluginInstanceFunction"
drop_class "QtPrivate"
drop_class "QtSharedPointer"
drop_class "QtValidLicenseForActiveQtModule"
drop_class "QtValidLicenseForCoreModule"
drop_class "QtValidLicenseForDBusModule"
drop_class "QtValidLicenseForDeclarativeModule"
drop_class "QtValidLicenseForGuiModule"
drop_class "QtValidLicenseForHelpModule"
drop_class "QtValidLicenseForMultimediaModule"
drop_class "QtValidLicenseForNetworkModule"
drop_class "QtValidLicenseForOpenGLModule"
drop_class "QtValidLicenseForOpenVGModule"
drop_class "QtValidLicenseForQt3SupportLightModule"
drop_class "QtValidLicenseForQt3SupportModule"
drop_class "QtValidLicenseForScriptModule"
drop_class "QtValidLicenseForScriptToolsModule"
drop_class "QtValidLicenseForSqlModule"
drop_class "QtValidLicenseForSvgModule"
drop_class "QtValidLicenseForTestModule"
drop_class "QtValidLicenseForXmlModule"
drop_class "QtValidLicenseForXmlPatternsModule"
drop_class "QTypeInfo"
drop_class "QUuid"
drop_class "QUpdateLaterEvent"

1
scripts/mkqtdecl5/mkqtdecl.conf
View File

@ -204,6 +204,7 @@ drop_class "QtGlobal"
drop_class "QThreadStorage"
drop_class "QThreadStorageData"
drop_class "QtMsgHandler"
drop_class "QtMsgType"
drop_class "QtPlugin"
drop_class "QtPluginInstanceFunction"
drop_class "QtPrivate"

7
scripts/mkqtdecl6/mkqtdecl.conf
View File

@ -807,6 +807,13 @@ include "QVector4D", [ "<QVector4D>", "<QVector2D>", "<QMatrix4x4>" ]
include "QAction", [ "<QAction>", "<QActionGroup>", "<QGraphicsWidget>", "<QMenu>" ]
include "QCursor", [ "<QCursor>", "<QScreen>", "<QBitmap>" ]
include "QGraphicsItem", [ "<QGraphicsItem>", "<QGraphicsTransform>", "<QGraphicsScene>", "<QStyleOptionGraphicsItem>", "<QGraphicsEffect>", "<QGraphicsWidget>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>", "<QGraphicsSceneHoverEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>", "<QPainter>" ]
include "QGraphicsObject", [ "<QGraphicsObject>", "<QChildEvent>", "<QCursor>", "<QEvent>", "<QFocusEvent>", "<QGraphicsEffect>",
"<QGraphicsItem>", "<QGraphicsItemGroup>", "<QGraphicsScene>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>",
"<QGraphicsSceneHoverEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>", "<QGraphicsWidget>",
"<QInputMethodEvent>", "<QKeyEvent>", "<QMetaMethod>", "<QObject>", "<QPainter>", "<QPainterPath>", "<QPointF>",
"<QPolygonF>", "<QRectF>", "<QRegion>", "<QSize>", "<QStyleOptionGraphicsItem>", "<QThread>",
"<QTimerEvent>", "<QTransform>", "<QWidget>",
"<QGraphicsTransform>" ]
include "QGraphicsScene", [ "<QGraphicsScene>", "<QGraphicsView>", "<QGraphicsItem>", "<QGraphicsWidget>", "<QGraphicsEllipseItem>", "<QGraphicsLineItem>", "<QGraphicsPathItem>", "<QGraphicsPixmapItem>", "<QGraphicsPolygonItem>", "<QGraphicsRectItem>", "<QGraphicsSimpleTextItem>", "<QGraphicsTextItem>", "<QGraphicsProxyWidget>", "<QGraphicsItemGroup>", "<QStyle>", "<QGraphicsSceneContextMenuEvent>", "<QGraphicsSceneDragDropEvent>", "<QGraphicsSceneHelpEvent>", "<QGraphicsSceneMouseEvent>", "<QGraphicsSceneWheelEvent>" ]
include "QGuiApplication", [ "<QGuiApplication>", "<QScreen>", "<QSessionManager>", "<QClipboard>", "<QWindow>", "<QStyleHints>", "<QFont>", "<QPalette>" ]
include "QApplication", [ "<QApplication>", "<QSessionManager>", "<QStyle>", "<QWindow>", "<QScreen>", "<QFont>", "<QFontMetrics>", "<QWidget>" ]

97
scripts/mkqtdecl_common/produce.rb
View File

@ -265,7 +265,7 @@ class CPPStruct
cls = self.id.to_s
# collect enums from inner classes
# collect used enums from inner classes
(self.body_decl || []).each do |bd|
decl = nil
if bd.is_a?(CPPStructDeclaration) && bd.visibility == :public && bd.struct.body_decl && bd.myself != "" && !conf.is_class_dropped?(cls, bd.myself)
@ -273,6 +273,14 @@ class CPPStruct
end
end
# collect used enums from base classes
(self.base_classes || []).each do |bc|
bc_obj = self.parent.resolve_qid(bc.class_id)
if bc_obj.is_a?(CPPStructDeclaration) && bc_obj.visibility == :public && bc_obj.struct.body_decl && bc_obj.myself != "" && !conf.is_class_dropped?(cls, bc_obj.myself)
bc_obj.struct.collect_used_enums(map, conf)
end
end
methods = {}
self.collect_all_methods(methods, conf)
@ -315,7 +323,7 @@ class CPPStruct
end
def collect_methods(map)
def collect_methods(map, weak = false)
mmap = {}
@ -355,6 +363,7 @@ class CPPStruct
end
# take non-duplicates (by call signature) for the map
# weak ones do not redefine methods
mmap.each do |mn,decls|
seen = {}
@ -362,7 +371,9 @@ class CPPStruct
s = d.call_sig
if !seen[s]
seen[s] = true
(map[mn] ||= []) << d
if !weak || !map[mn]
(map[mn] ||= []) << d
end
end
end
@ -1096,9 +1107,9 @@ class Configurator
else
dc = (@dropped_classes[:all_classes] || []) + (@dropped_classes[cls] || [])
if sig != :whole_class
return dc.find { |d| sig =~ d } != nil
return dc.find { |d| d == :whole_class || sig =~ d } != nil
else
return dc.find { |d| sig == d } != nil
return dc.find { |d| d == :whole_class || sig == d } != nil
end
end
end
@ -1907,6 +1918,10 @@ END
base_cls = base_classes[0] && base_classes[0].class_id.to_s
base_clsn = base_cls && make_cls_name(base_cls)
# as we only support single base classes (a tribute to Ruby), we treat all other base classes as
# mixins
mixin_base_classes = base_classes[1..] || []
methods_by_name = {}
all_methods_by_name = {}
enum_decls_by_name = {}
@ -1918,8 +1933,8 @@ END
end
mmap = {}
struct.collect_methods(methods_by_name)
struct.collect_all_methods(all_methods_by_name, conf)
struct.collect_methods(methods_by_name)
struct.collect_enum_decls(enum_decls_by_name) { |bd| self.is_enum_used?(bd) || conf.is_enum_included?(cls, bd.myself) }
# if one method is abstract, omit ctors for example
@ -2365,35 +2380,35 @@ END
base_classes.each do |bc|
bc_name = bc.class_id.to_s
bc_name = bc.class_id.to_s
ofile.puts("// base class cast for #{bc_name}")
ofile.puts("")
ofile.puts("static void _init_f_#{clsn}_as_#{bc_name} (qt_gsi::GenericMethod *decl)")
ofile.puts("{")
ofile.puts(" decl->set_return<#{bc_name} *> ();")
ofile.puts("}")
ofile.puts("")
ofile.puts("static void _call_f_#{clsn}_as_#{bc_name} (const qt_gsi::GenericMethod *, void *cls, gsi::SerialArgs &, gsi::SerialArgs &ret) ")
ofile.puts("{")
ofile.puts(" ret.write<#{bc_name} *> ((#{bc_name} *)(#{cls} *)cls);")
ofile.puts("}")
ofile.puts("")
ofile.puts("// base class cast for #{bc_name}")
ofile.puts("")
ofile.puts("static void _init_f_#{clsn}_as_#{bc_name} (qt_gsi::GenericMethod *decl)")
ofile.puts("{")
ofile.puts(" decl->set_return<#{bc_name} *> ();")
ofile.puts("}")
ofile.puts("")
ofile.puts("static void _call_f_#{clsn}_as_#{bc_name} (const qt_gsi::GenericMethod *, void *cls, gsi::SerialArgs &, gsi::SerialArgs &ret) ")
ofile.puts("{")
ofile.puts(" ret.write<#{bc_name} *> ((#{bc_name} *)(#{cls} *)cls);")
ofile.puts("}")
ofile.puts("")
mdecl_bcc << "new qt_gsi::GenericMethod (\"as#{bc_name}\", \"@brief Delivers the base class interface #{bc_name} of #{cls}\\nClass #{cls} is derived from multiple base classes. This method delivers the #{bc_name} base class aspect.\", false, &_init_f_#{clsn}_as_#{bc_name}, &_call_f_#{clsn}_as_#{bc_name});"
mdecl_bcc << "new qt_gsi::GenericMethod (\"as#{bc_name}\", \"@brief Delivers the base class interface #{bc_name} of #{cls}\\nClass #{cls} is derived from multiple base classes. This method delivers the #{bc_name} base class aspect.\", false, &_init_f_#{clsn}_as_#{bc_name}, &_call_f_#{clsn}_as_#{bc_name});"
ofile.puts("static void _init_f_#{clsn}_as_const_#{bc_name} (qt_gsi::GenericMethod *decl)")
ofile.puts("{")
ofile.puts(" decl->set_return<const #{bc_name} *> ();")
ofile.puts("}")
ofile.puts("")
ofile.puts("static void _call_f_#{clsn}_as_const_#{bc_name} (const qt_gsi::GenericMethod *, void *cls, gsi::SerialArgs &, gsi::SerialArgs &ret) ")
ofile.puts("{")
ofile.puts(" ret.write<const #{bc_name} *> ((const #{bc_name} *)(const #{cls} *)cls);")
ofile.puts("}")
ofile.puts("")
ofile.puts("static void _init_f_#{clsn}_as_const_#{bc_name} (qt_gsi::GenericMethod *decl)")
ofile.puts("{")
ofile.puts(" decl->set_return<const #{bc_name} *> ();")
ofile.puts("}")
ofile.puts("")
ofile.puts("static void _call_f_#{clsn}_as_const_#{bc_name} (const qt_gsi::GenericMethod *, void *cls, gsi::SerialArgs &, gsi::SerialArgs &ret) ")
ofile.puts("{")
ofile.puts(" ret.write<const #{bc_name} *> ((const #{bc_name} *)(const #{cls} *)cls);")
ofile.puts("}")
ofile.puts("")
mdecl_bcc << "new qt_gsi::GenericMethod (\"asConst#{bc_name}\", \"@brief Delivers the base class interface #{bc_name} of #{cls}\\nClass #{cls} is derived from multiple base classes. This method delivers the #{bc_name} base class aspect.\\n\\nUse this version if you have a const reference.\", true, &_init_f_#{clsn}_as_const_#{bc_name}, &_call_f_#{clsn}_as_const_#{bc_name});"
mdecl_bcc << "new qt_gsi::GenericMethod (\"asConst#{bc_name}\", \"@brief Delivers the base class interface #{bc_name} of #{cls}\\nClass #{cls} is derived from multiple base classes. This method delivers the #{bc_name} base class aspect.\\n\\nUse this version if you have a const reference.\", true, &_init_f_#{clsn}_as_const_#{bc_name}, &_call_f_#{clsn}_as_const_#{bc_name});"
end
@ -2474,6 +2489,24 @@ END
end
# Produce the mixin base classes
if ! mixin_base_classes.empty?
ofile.puts("")
ofile.puts("// Additional base classes")
ofile.puts("")
mixin_base_classes.each do |bc|
bc_name = bc.class_id.to_s
ofile.puts("gsi::Class<#{bc_name}> &qtdecl_#{bc_name} ();")
end
ofile.puts("")
end
mixin_base_classes.each do |bc|
bc_name = bc.class_id.to_s
ofile.puts("gsi::ClassExt<#{cls}> base_class_#{bc_name}_in_#{clsn} (qtdecl_#{bc_name} ());")
end
ofile.puts("")
ofile.puts("GSI_#{modn.upcase}_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} () { return decl_#{clsn}; }")
ofile.puts("")
@ -3213,7 +3246,7 @@ bp.read(input_file)
puts("Collecting used enums ..")
l = bp.prod_list(conf)
l.each_with_index do |decl_obj,i|
puts "#{decl_obj.myself}: #{i+1}/#{l.size}"
decl_obj.myself && puts("#{decl_obj.myself}: #{i+1}/#{l.size}")
bp.collect_used_enums(conf, decl_obj)
end

42
scripts/mkqtdecl_common/reader_ext.rb
View File

@ -196,7 +196,7 @@ module QualifiedNameResolver
@id2obj && @id2obj[id]
end
def resolve_qid(qid)
def resolve_qid(qid, stop = nil, include_other = true)
qid.is_a?(CPPQualifiedId) || raise("Argument of resolve_qid must be a CPPQualifiedId object")
@ -206,22 +206,30 @@ module QualifiedNameResolver
while root.parent
root = root.parent
end
obj = root.resolve_qid(qid)
obj = root.resolve_qid(qid, nil, false)
else
obj = id2obj(qid.parts[0].id)
if obj && qid.parts.size > 1
# The part may be a typedef: resolve it in that case before we proceed
while obj && obj.is_a?(CPPTypedef)
obj = obj.type.concrete.is_a?(CPPQualifiedId) && self.resolve_qid(obj.type.concrete)
obj = obj.type.concrete.is_a?(CPPQualifiedId) && self.resolve_qid(obj.type.concrete, stop, include_other)
end
if obj
qid_new = qid.dup
qid_new.parts = qid.parts[1 .. -1]
obj = obj.respond_to?(:resolve_qid) && obj.resolve_qid(qid_new)
obj = obj.respond_to?(:resolve_qid) && obj.resolve_qid(qid_new, stop, include_other)
end
end
if ! obj && self.parent
obj = self.parent.resolve_qid(qid)
if ! obj && include_other
# try base classes
self.other_children.each do |bc|
if bc != self && bc.respond_to?(:resolve_qid)
(obj = bc.resolve_qid(qid, self, false)) && break
end
end
end
if ! obj && self.parent && self.parent != stop
obj = self.parent.resolve_qid(qid, stop, include_other)
end
end
@ -281,6 +289,10 @@ class CPPDeclaration
[]
end
def other_children
[]
end
def myself
self.type.name
end
@ -295,6 +307,10 @@ class CPPEnumDeclaration
[]
end
def other_children
[]
end
def myself
# exclude forward declarations
self.enum.specs && self.enum.name.to_s
@ -310,6 +326,10 @@ class CPPEnumSpec
[]
end
def other_children
[]
end
def myself
self.name.to_s
end
@ -353,6 +373,10 @@ class CPPTypedef
[]
end
def other_children
[]
end
end
class CPPStructDeclaration
@ -395,7 +419,7 @@ class CPPStructDeclaration
# The parent may be null for template base classes which are
# forward-declared .. we're not interested in this case.
if self.parent
bc_obj = self.parent.resolve_qid(bc.class_id)
bc_obj = self.parent.resolve_qid(bc.class_id, nil, false)
# NOTE: it may look strange to test whether the base class is the class itself but
# since we do a half-hearted job of resolving template variants, this may happen
# if we derive a template specialization from another one (specifically
@ -524,6 +548,10 @@ class CPPModule
end
def other_children
[]
end
def remove(d)
self.decls.delete(d)
end

2
src/gsi/gsi/gsiClass.h
View File

@ -316,7 +316,7 @@ public:
* This feature is not quite useful usually and is reserved for special use cases
* such as including enums into a declaration namespace.
*/
ClassExt (const ClassBase &import, const std::string &name, const std::string &doc = std::string ())
ClassExt (const ClassBase &import, const std::string &name = std::string (), const std::string &doc = std::string ())
: ClassBase (doc, Methods ()), mp_declaration (&import)
{
set_name (name);

108
src/gsi/gsi/gsiExpression.cc
View File

@ -106,6 +106,10 @@ public:
std::pair<bool, size_t> find (bool st, const std::string &name) const
{
std::map<std::pair<bool, std::string>, size_t>::const_iterator t = m_name_map.find (std::make_pair (st, name));
if (! st && t == m_name_map.end ()) {
// can also use static methods for instances
t = m_name_map.find (std::make_pair (true, name));
}
if (t != m_name_map.end ()) {
return std::make_pair (true, t->second);
} else {
@ -1088,11 +1092,7 @@ initialize_expressions ()
// skip external classes
continue;
} else if ((*c)->declaration () != *c) {
// we might encounter a child class which is a reference to a top-level class (e.g.
// duplication of enums into child classes). In this case we should create a reference inside the
// target class.
tl_assert ((*c)->parent () != 0); // top-level classes should be merged
// TODO: implement (see rba.cc:1544 for example)
continue;
}
@ -1360,6 +1360,65 @@ special_method_impl (gsi::MethodBase::special_method_type smt, tl::Variant &self
return tl::Variant ();
}
static std::pair<const ExpressionMethodTable *, size_t> find_method (const gsi::ClassBase *cls, bool as_static, const std::string &method)
{
const ExpressionMethodTable *mt = 0;
size_t mid = 0;
while (cls) {
mt = ExpressionMethodTable::method_table_by_class (cls);
std::pair<bool, size_t> t = mt->find (as_static, method);
if (t.first) {
mid = t.second;
return std::make_pair (mt, mid);
}
// try unnamed child classes as static
for (auto cc = cls->begin_child_classes (); cc != cls->end_child_classes (); ++cc) {
if (cc->name ().empty ()) {
std::pair<const ExpressionMethodTable *, size_t> m = find_method (cc->declaration (), true, method);
if (m.first) {
return m;
}
}
}
cls = cls->base ();
}
return std::make_pair ((const ExpressionMethodTable *) 0, size_t (0));
}
static const gsi::ClassBase *find_class_scope (const gsi::ClassBase *cls, const std::string &name)
{
while (cls) {
// try named child classes
for (auto cc = cls->begin_child_classes (); cc != cls->end_child_classes (); ++cc) {
if (cc->name () == name) {
return cc->declaration ();
}
}
// try unnamed child classes as additional bases
for (auto cc = cls->begin_child_classes (); cc != cls->end_child_classes (); ++cc) {
if (cc->name ().empty ()) {
const gsi::ClassBase *scope = find_class_scope (cc->declaration (), name);
if (scope) {
return scope;
}
}
}
cls = cls->base ();
}
return 0;
}
void
VariantUserClassImpl::execute_gsi (const tl::ExpressionParserContext & /*context*/, tl::Variant &out, tl::Variant &object, const std::string &method, const std::vector<tl::Variant> &args) const
{
@ -1374,25 +1433,34 @@ VariantUserClassImpl::execute_gsi (const tl::ExpressionParserContext & /*context
}
}
const ExpressionMethodTable *mt = 0;
size_t mid = 0;
const gsi::ClassBase *cls = clsact;
while (cls) {
auto m = find_method (clsact, mp_object_cls != 0 /*static*/, method);
mt = ExpressionMethodTable::method_table_by_class (cls);
std::pair<bool, size_t> t = mt->find (mp_object_cls != 0 /*static*/, method);
if (t.first) {
mid = t.second;
break;
const ExpressionMethodTable *mt = m.first;
size_t mid = m.second;
if (! mt) {
// try class scope
const gsi::ClassBase *scope = find_class_scope (clsact, method);
if (scope) {
if (! args.empty ()) {
throw tl::Exception (tl::to_string (tr ("'%s' is not a function and cannot have parameters")), method);
}
// we found a class scope: return a reference to that
const tl::VariantUserClassBase *scope_var_cls = scope->var_cls_cls ();
if (scope_var_cls) {
out = tl::Variant ((void *) 0, scope_var_cls, false);
} else {
out = tl::Variant ();
}
return;
} else {
throw tl::Exception (tl::to_string (tr ("Unknown method '%s' of class '%s'")), method, clsact->name ());
}
cls = cls->base ();
}
if (cls == 0) {
throw tl::Exception (tl::to_string (tr ("Unknown method")) + " '" + method + "' of class '" + clsact->name () + "'");
}
const gsi::MethodBase *meth = 0;

27
src/gsi/gsi_test/gsiTest.cc
View File

@ -1664,5 +1664,32 @@ static gsi::Class<GFactory_P> decl_gfactory (decl_gfactory_base, "", "GFactory",
gsi::factory_callback ("f", &GFactory_P::f, &GFactory_P::f_cb)
);
static gsi::Class<B1> decl_b1 ("", "B1",
gsi::method ("get1", &B1::get1) +
gsi::method ("set1", &B1::set1) +
gsi::constant ("C1", 42)
);
static gsi::Class<B2> decl_b2 ("", "B2",
gsi::constant ("C2", 17)
);
static gsi::Class<B3> decl_b3 ("", "B3",
gsi::constant ("C3", -1)
);
gsi::EnumIn<B3, B3::E> enum_in_b3 ("", "E",
gsi::enum_const ("E3A", B3::E3A) +
gsi::enum_const ("E3B", B3::E3B) +
gsi::enum_const ("E3C", B3::E3C)
);
// 3 base classes
static gsi::Class<BB> decl_bb (decl_b1, "", "BB",
gsi::method ("d3", &BB::d3)
);
gsi::ClassExt<BB> b2_in_bb (decl_b2);
gsi::ClassExt<BB> b3_in_bb (decl_b3);
}

31
src/gsi/gsi_test/gsiTest.h
View File

@ -1397,6 +1397,37 @@ private:
int m_tag;
};
class B1
{
public:
B1 () : m_value (0) {}
int get1 () { return m_value; }
void set1 (int v) { m_value = v; }
private:
int m_value;
};
class B2
{
public:
B2 () {}
};
class B3
{
public:
B3 () {}
enum E { E3A = 100, E3B = 101, E3C = 102 };
};
class BB
: public B1, public B2, public B3
{
public:
int d3 (B3::E a, B3::E b) { return b - a; }
};
}
#endif

24
src/gsi/unit_tests/gsiExpression.cc → src/gsi/unit_tests/gsiExpressionTests.cc
View File

@ -565,3 +565,27 @@ TEST(9)
EXPECT_EQ (collect_func->values[1], 14400);
EXPECT_EQ (collect_func->values[2], 19600);
}
TEST(10)
{
tl::Eval e;
tl::Variant v;
v = e.parse ("var b3 = B3.new(); b3.E.E3B").execute ();
EXPECT_EQ (v.to_string (), std::string ("E3B"));
v = e.parse ("B3.E.E3B").execute ();
EXPECT_EQ (v.to_string (), std::string ("E3B"));
v = e.parse ("var bb = BB.new(); bb.C1").execute ();
EXPECT_EQ (v.to_string (), std::string ("42"));
v = e.parse ("var bb = BB.new(); bb.C2").execute ();
EXPECT_EQ (v.to_string (), std::string ("17"));
v = e.parse ("var bb = BB.new(); bb.C3").execute ();
EXPECT_EQ (v.to_string (), std::string ("-1"));
v = e.parse ("var bb = BB.new(); bb.E.E3A").execute ();
EXPECT_EQ (v.to_string (), std::string ("E3A"));
v = e.parse ("BB.E.E3C").execute ();
EXPECT_EQ (v.to_string (), std::string ("E3C"));
v = e.parse ("var bb = BB.new(); bb.d3(BB.E.E3A, BB.E.E3C)").execute ();
EXPECT_EQ (v.to_string (), std::string ("2"));
}

2
src/gsi/unit_tests/unit_tests.pro
View File

@ -7,7 +7,7 @@ TARGET = gsi_tests
include($$PWD/../../lib_ut.pri)
SOURCES = \
gsiExpression.cc \
gsiExpressionTests.cc
HEADERS += \

6
src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc
View File

@ -327,6 +327,12 @@ gsi::Class<QDropEvent> decl_QDropEvent (qtdecl_QEvent (), "QtGui", "QDropEvent_N
methods_QDropEvent (),
"@hide\n@alias QDropEvent");
// Additional base classes
gsi::Class<QMimeSource> &qtdecl_QMimeSource ();
gsi::ClassExt<QDropEvent> base_class_QMimeSource_in_QDropEvent (qtdecl_QMimeSource ());
GSI_QTGUI_PUBLIC gsi::Class<QDropEvent> &qtdecl_QDropEvent () { return decl_QDropEvent; }
}

6
src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc
View File

@ -311,6 +311,12 @@ qt_gsi::QtNativeClass<QGraphicsObject> decl_QGraphicsObject (qtdecl_QObject (),
methods_QGraphicsObject (),
"@hide\n@alias QGraphicsObject");
// Additional base classes
gsi::Class<QGraphicsItem> &qtdecl_QGraphicsItem ();
gsi::ClassExt<QGraphicsObject> base_class_QGraphicsItem_in_QGraphicsObject (qtdecl_QGraphicsItem ());
GSI_QTGUI_PUBLIC gsi::Class<QGraphicsObject> &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; }
}

6
src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc
View File

@ -1361,6 +1361,12 @@ qt_gsi::QtNativeClass<QGraphicsWidget> decl_QGraphicsWidget (qtdecl_QGraphicsObj
methods_QGraphicsWidget (),
"@hide\n@alias QGraphicsWidget");
// Additional base classes
gsi::Class<QGraphicsLayoutItem> &qtdecl_QGraphicsLayoutItem ();
gsi::ClassExt<QGraphicsWidget> base_class_QGraphicsLayoutItem_in_QGraphicsWidget (qtdecl_QGraphicsLayoutItem ());
GSI_QTGUI_PUBLIC gsi::Class<QGraphicsWidget> &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; }
}

6
src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc
View File

@ -1022,6 +1022,12 @@ qt_gsi::QtNativeClass<QLayout> decl_QLayout (qtdecl_QObject (), "QtGui", "QLayou
methods_QLayout (),
"@hide\n@alias QLayout");
// Additional base classes
gsi::Class<QLayoutItem> &qtdecl_QLayoutItem ();
gsi::ClassExt<QLayout> base_class_QLayoutItem_in_QLayout (qtdecl_QLayoutItem ());
GSI_QTGUI_PUBLIC gsi::Class<QLayout> &qtdecl_QLayout () { return decl_QLayout; }
}

5
src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc
View File

@ -27,11 +27,8 @@
* This file has been created automatically
*/
#include <QPolygon>
#include <QPoint>
#include <QRect>
#include <QMatrix>
#include <QTransform>
#include <QMatrix>
#include "gsiQt.h"
#include "gsiQtGuiCommon.h"
#include <memory>

6
src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc
View File

@ -27,12 +27,8 @@
* This file has been created automatically
*/
#include <QPolygonF>
#include <QPointF>
#include <QPolygon>
#include <QRectF>
#include <QMatrix>
#include <QTransform>
#include <QMatrix>
#include "gsiQt.h"
#include "gsiQtGuiCommon.h"
#include <memory>

6
src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc
View File

@ -4793,6 +4793,12 @@ qt_gsi::QtNativeClass<QWidget> decl_QWidget (qtdecl_QObject (), "QtGui", "QWidge
methods_QWidget (),
"@hide\n@alias QWidget");
// Additional base classes
gsi::Class<QPaintDevice> &qtdecl_QPaintDevice ();
gsi::ClassExt<QWidget> base_class_QPaintDevice_in_QWidget (qtdecl_QPaintDevice ());
GSI_QTGUI_PUBLIC gsi::Class<QWidget> &qtdecl_QWidget () { return decl_QWidget; }
}

14
src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc
View File

@ -777,6 +777,20 @@ gsi::Class<QXmlDefaultHandler> decl_QXmlDefaultHandler (qtdecl_QXmlContentHandle
methods_QXmlDefaultHandler (),
"@hide\n@alias QXmlDefaultHandler");
// Additional base classes
gsi::Class<QXmlErrorHandler> &qtdecl_QXmlErrorHandler ();
gsi::Class<QXmlDTDHandler> &qtdecl_QXmlDTDHandler ();
gsi::Class<QXmlEntityResolver> &qtdecl_QXmlEntityResolver ();
gsi::Class<QXmlLexicalHandler> &qtdecl_QXmlLexicalHandler ();
gsi::Class<QXmlDeclHandler> &qtdecl_QXmlDeclHandler ();
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlErrorHandler_in_QXmlDefaultHandler (qtdecl_QXmlErrorHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDTDHandler_in_QXmlDefaultHandler (qtdecl_QXmlDTDHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlEntityResolver_in_QXmlDefaultHandler (qtdecl_QXmlEntityResolver ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlLexicalHandler_in_QXmlDefaultHandler (qtdecl_QXmlLexicalHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDeclHandler_in_QXmlDefaultHandler (qtdecl_QXmlDeclHandler ());
GSI_QTXML_PUBLIC gsi::Class<QXmlDefaultHandler> &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; }
}

6
src/gsiqt/qt5/QtGui/gsiDeclQOffscreenSurface.cc
View File

@ -340,6 +340,12 @@ qt_gsi::QtNativeClass<QOffscreenSurface> decl_QOffscreenSurface (qtdecl_QObject
methods_QOffscreenSurface (),
"@hide\n@alias QOffscreenSurface");
// Additional base classes
gsi::Class<QSurface> &qtdecl_QSurface ();
gsi::ClassExt<QOffscreenSurface> base_class_QSurface_in_QOffscreenSurface (qtdecl_QSurface ());
GSI_QTGUI_PUBLIC gsi::Class<QOffscreenSurface> &qtdecl_QOffscreenSurface () { return decl_QOffscreenSurface; }
}

6
src/gsiqt/qt5/QtGui/gsiDeclQPaintDeviceWindow.cc
View File

@ -322,6 +322,12 @@ qt_gsi::QtNativeClass<QPaintDeviceWindow> decl_QPaintDeviceWindow (qtdecl_QWindo
methods_QPaintDeviceWindow (),
"@hide\n@alias QPaintDeviceWindow");
// Additional base classes
gsi::Class<QPaintDevice> &qtdecl_QPaintDevice ();
gsi::ClassExt<QPaintDeviceWindow> base_class_QPaintDevice_in_QPaintDeviceWindow (qtdecl_QPaintDevice ());
GSI_QTGUI_PUBLIC gsi::Class<QPaintDeviceWindow> &qtdecl_QPaintDeviceWindow () { return decl_QPaintDeviceWindow; }
}

6
src/gsiqt/qt5/QtGui/gsiDeclQPdfWriter.cc
View File

@ -370,6 +370,12 @@ qt_gsi::QtNativeClass<QPdfWriter> decl_QPdfWriter (qtdecl_QObject (), "QtGui", "
methods_QPdfWriter (),
"@hide\n@alias QPdfWriter");
// Additional base classes
gsi::Class<QPagedPaintDevice> &qtdecl_QPagedPaintDevice ();
gsi::ClassExt<QPdfWriter> base_class_QPagedPaintDevice_in_QPdfWriter (qtdecl_QPagedPaintDevice ());
GSI_QTGUI_PUBLIC gsi::Class<QPdfWriter> &qtdecl_QPdfWriter () { return decl_QPdfWriter; }
}

6
src/gsiqt/qt5/QtGui/gsiDeclQWindow.cc
View File

@ -2058,6 +2058,12 @@ qt_gsi::QtNativeClass<QWindow> decl_QWindow (qtdecl_QObject (), "QtGui", "QWindo
methods_QWindow (),
"@hide\n@alias QWindow");
// Additional base classes
gsi::Class<QSurface> &qtdecl_QSurface ();
gsi::ClassExt<QWindow> base_class_QSurface_in_QWindow (qtdecl_QSurface ());
GSI_QTGUI_PUBLIC gsi::Class<QWindow> &qtdecl_QWindow () { return decl_QWindow; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQAudioSystemPlugin.cc
View File

@ -256,6 +256,12 @@ qt_gsi::QtNativeClass<QAudioSystemPlugin> decl_QAudioSystemPlugin (qtdecl_QObjec
methods_QAudioSystemPlugin (),
"@hide\n@alias QAudioSystemPlugin");
// Additional base classes
gsi::Class<QAudioSystemFactoryInterface> &qtdecl_QAudioSystemFactoryInterface ();
gsi::ClassExt<QAudioSystemPlugin> base_class_QAudioSystemFactoryInterface_in_QAudioSystemPlugin (qtdecl_QAudioSystemFactoryInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QAudioSystemPlugin> &qtdecl_QAudioSystemPlugin () { return decl_QAudioSystemPlugin; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQCameraImageCapture.cc
View File

@ -724,6 +724,12 @@ qt_gsi::QtNativeClass<QCameraImageCapture> decl_QCameraImageCapture (qtdecl_QObj
methods_QCameraImageCapture (),
"@hide\n@alias QCameraImageCapture");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QCameraImageCapture> base_class_QMediaBindableInterface_in_QCameraImageCapture (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QCameraImageCapture> &qtdecl_QCameraImageCapture () { return decl_QCameraImageCapture; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQGraphicsVideoItem.cc
View File

@ -405,6 +405,12 @@ qt_gsi::QtNativeClass<QGraphicsVideoItem> decl_QGraphicsVideoItem (qtdecl_QGraph
methods_QGraphicsVideoItem (),
"@hide\n@alias QGraphicsVideoItem");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QGraphicsVideoItem> base_class_QMediaBindableInterface_in_QGraphicsVideoItem (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QGraphicsVideoItem> &qtdecl_QGraphicsVideoItem () { return decl_QGraphicsVideoItem; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaPlaylist.cc
View File

@ -952,6 +952,12 @@ qt_gsi::QtNativeClass<QMediaPlaylist> decl_QMediaPlaylist (qtdecl_QObject (), "Q
methods_QMediaPlaylist (),
"@hide\n@alias QMediaPlaylist");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QMediaPlaylist> base_class_QMediaBindableInterface_in_QMediaPlaylist (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QMediaPlaylist> &qtdecl_QMediaPlaylist () { return decl_QMediaPlaylist; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaRecorder.cc
View File

@ -1159,6 +1159,12 @@ qt_gsi::QtNativeClass<QMediaRecorder> decl_QMediaRecorder (qtdecl_QObject (), "Q
methods_QMediaRecorder (),
"@hide\n@alias QMediaRecorder");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QMediaRecorder> base_class_QMediaBindableInterface_in_QMediaRecorder (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QMediaRecorder> &qtdecl_QMediaRecorder () { return decl_QMediaRecorder; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQMediaServiceProviderPlugin.cc
View File

@ -212,6 +212,12 @@ qt_gsi::QtNativeClass<QMediaServiceProviderPlugin> decl_QMediaServiceProviderPlu
methods_QMediaServiceProviderPlugin (),
"@hide\n@alias QMediaServiceProviderPlugin");
// Additional base classes
gsi::Class<QMediaServiceProviderFactoryInterface> &qtdecl_QMediaServiceProviderFactoryInterface ();
gsi::ClassExt<QMediaServiceProviderPlugin> base_class_QMediaServiceProviderFactoryInterface_in_QMediaServiceProviderPlugin (qtdecl_QMediaServiceProviderFactoryInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QMediaServiceProviderPlugin> &qtdecl_QMediaServiceProviderPlugin () { return decl_QMediaServiceProviderPlugin; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQRadioData.cc
View File

@ -499,6 +499,12 @@ qt_gsi::QtNativeClass<QRadioData> decl_QRadioData (qtdecl_QObject (), "QtMultime
methods_QRadioData (),
"@hide\n@alias QRadioData");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QRadioData> base_class_QMediaBindableInterface_in_QRadioData (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QRadioData> &qtdecl_QRadioData () { return decl_QRadioData; }
}

6
src/gsiqt/qt5/QtMultimedia/gsiDeclQVideoWidget.cc
View File

@ -559,6 +559,12 @@ qt_gsi::QtNativeClass<QVideoWidget> decl_QVideoWidget (qtdecl_QWidget (), "QtMul
methods_QVideoWidget (),
"@hide\n@alias QVideoWidget");
// Additional base classes
gsi::Class<QMediaBindableInterface> &qtdecl_QMediaBindableInterface ();
gsi::ClassExt<QVideoWidget> base_class_QMediaBindableInterface_in_QVideoWidget (qtdecl_QMediaBindableInterface ());
GSI_QTMULTIMEDIA_PUBLIC gsi::Class<QVideoWidget> &qtdecl_QVideoWidget () { return decl_QVideoWidget; }
}

6
src/gsiqt/qt5/QtWidgets/gsiDeclQAccessibleWidget.cc
View File

@ -450,6 +450,12 @@ gsi::Class<QAccessibleWidget> decl_QAccessibleWidget (qtdecl_QAccessibleObject (
"@qt\n@brief Binding of QAccessibleWidget");
// Additional base classes
gsi::Class<QAccessibleActionInterface> &qtdecl_QAccessibleActionInterface ();
gsi::ClassExt<QAccessibleWidget> base_class_QAccessibleActionInterface_in_QAccessibleWidget (qtdecl_QAccessibleActionInterface ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QAccessibleWidget> &qtdecl_QAccessibleWidget () { return decl_QAccessibleWidget; }
}

6
src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsObject.cc
View File

@ -270,6 +270,12 @@ qt_gsi::QtNativeClass<QGraphicsObject> decl_QGraphicsObject (qtdecl_QObject (),
methods_QGraphicsObject (),
"@hide\n@alias QGraphicsObject");
// Additional base classes
gsi::Class<QGraphicsItem> &qtdecl_QGraphicsItem ();
gsi::ClassExt<QGraphicsObject> base_class_QGraphicsItem_in_QGraphicsObject (qtdecl_QGraphicsItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QGraphicsObject> &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; }
}

6
src/gsiqt/qt5/QtWidgets/gsiDeclQGraphicsWidget.cc
View File

@ -1359,6 +1359,12 @@ qt_gsi::QtNativeClass<QGraphicsWidget> decl_QGraphicsWidget (qtdecl_QGraphicsObj
methods_QGraphicsWidget (),
"@hide\n@alias QGraphicsWidget");
// Additional base classes
gsi::Class<QGraphicsLayoutItem> &qtdecl_QGraphicsLayoutItem ();
gsi::ClassExt<QGraphicsWidget> base_class_QGraphicsLayoutItem_in_QGraphicsWidget (qtdecl_QGraphicsLayoutItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QGraphicsWidget> &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; }
}

6
src/gsiqt/qt5/QtWidgets/gsiDeclQLayout.cc
View File

@ -1020,6 +1020,12 @@ qt_gsi::QtNativeClass<QLayout> decl_QLayout (qtdecl_QObject (), "QtWidgets", "QL
methods_QLayout (),
"@hide\n@alias QLayout");
// Additional base classes
gsi::Class<QLayoutItem> &qtdecl_QLayoutItem ();
gsi::ClassExt<QLayout> base_class_QLayoutItem_in_QLayout (qtdecl_QLayoutItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QLayout> &qtdecl_QLayout () { return decl_QLayout; }
}

6
src/gsiqt/qt5/QtWidgets/gsiDeclQWidget.cc
View File

@ -4827,6 +4827,12 @@ qt_gsi::QtNativeClass<QWidget> decl_QWidget (qtdecl_QObject (), "QtWidgets", "QW
methods_QWidget (),
"@hide\n@alias QWidget");
// Additional base classes
gsi::Class<QPaintDevice> &qtdecl_QPaintDevice ();
gsi::ClassExt<QWidget> base_class_QPaintDevice_in_QWidget (qtdecl_QPaintDevice ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QWidget> &qtdecl_QWidget () { return decl_QWidget; }
}

14
src/gsiqt/qt5/QtXml/gsiDeclQXmlDefaultHandler.cc
View File

@ -777,6 +777,20 @@ gsi::Class<QXmlDefaultHandler> decl_QXmlDefaultHandler (qtdecl_QXmlContentHandle
methods_QXmlDefaultHandler (),
"@hide\n@alias QXmlDefaultHandler");
// Additional base classes
gsi::Class<QXmlErrorHandler> &qtdecl_QXmlErrorHandler ();
gsi::Class<QXmlDTDHandler> &qtdecl_QXmlDTDHandler ();
gsi::Class<QXmlEntityResolver> &qtdecl_QXmlEntityResolver ();
gsi::Class<QXmlLexicalHandler> &qtdecl_QXmlLexicalHandler ();
gsi::Class<QXmlDeclHandler> &qtdecl_QXmlDeclHandler ();
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlErrorHandler_in_QXmlDefaultHandler (qtdecl_QXmlErrorHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDTDHandler_in_QXmlDefaultHandler (qtdecl_QXmlDTDHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlEntityResolver_in_QXmlDefaultHandler (qtdecl_QXmlEntityResolver ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlLexicalHandler_in_QXmlDefaultHandler (qtdecl_QXmlLexicalHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDeclHandler_in_QXmlDefaultHandler (qtdecl_QXmlDeclHandler ());
GSI_QTXML_PUBLIC gsi::Class<QXmlDefaultHandler> &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; }
}

6
src/gsiqt/qt6/QtCore/gsiDeclQIODevice.cc
View File

@ -847,6 +847,12 @@ qt_gsi::QtNativeClass<QIODevice> decl_QIODevice (qtdecl_QObject (), "QtCore", "Q
"@qt\n@brief Binding of QIODevice");
// Additional base classes
gsi::Class<QIODeviceBase> &qtdecl_QIODeviceBase ();
gsi::ClassExt<QIODevice> base_class_QIODeviceBase_in_QIODevice (qtdecl_QIODeviceBase ());
GSI_QTCORE_PUBLIC gsi::Class<QIODevice> &qtdecl_QIODevice () { return decl_QIODevice; }
}

2
src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro
View File

@ -13,6 +13,8 @@ DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic
LIBS += -lklayout_QtCore
SOURCES += \
HEADERS += \

14
src/gsiqt/qt6/QtCore5Compat/gsiDeclQXmlDefaultHandler.cc
View File

@ -777,6 +777,20 @@ gsi::Class<QXmlDefaultHandler> decl_QXmlDefaultHandler (qtdecl_QXmlContentHandle
methods_QXmlDefaultHandler (),
"@hide\n@alias QXmlDefaultHandler");
// Additional base classes
gsi::Class<QXmlErrorHandler> &qtdecl_QXmlErrorHandler ();
gsi::Class<QXmlDTDHandler> &qtdecl_QXmlDTDHandler ();
gsi::Class<QXmlEntityResolver> &qtdecl_QXmlEntityResolver ();
gsi::Class<QXmlLexicalHandler> &qtdecl_QXmlLexicalHandler ();
gsi::Class<QXmlDeclHandler> &qtdecl_QXmlDeclHandler ();
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlErrorHandler_in_QXmlDefaultHandler (qtdecl_QXmlErrorHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDTDHandler_in_QXmlDefaultHandler (qtdecl_QXmlDTDHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlEntityResolver_in_QXmlDefaultHandler (qtdecl_QXmlEntityResolver ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlLexicalHandler_in_QXmlDefaultHandler (qtdecl_QXmlLexicalHandler ());
gsi::ClassExt<QXmlDefaultHandler> base_class_QXmlDeclHandler_in_QXmlDefaultHandler (qtdecl_QXmlDeclHandler ());
GSI_QTCORE5COMPAT_PUBLIC gsi::Class<QXmlDefaultHandler> &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; }
}

6
src/gsiqt/qt6/QtGui/gsiDeclQOffscreenSurface.cc
View File

@ -314,6 +314,12 @@ qt_gsi::QtNativeClass<QOffscreenSurface> decl_QOffscreenSurface (qtdecl_QObject
methods_QOffscreenSurface (),
"@hide\n@alias QOffscreenSurface");
// Additional base classes
gsi::Class<QSurface> &qtdecl_QSurface ();
gsi::ClassExt<QOffscreenSurface> base_class_QSurface_in_QOffscreenSurface (qtdecl_QSurface ());
GSI_QTGUI_PUBLIC gsi::Class<QOffscreenSurface> &qtdecl_QOffscreenSurface () { return decl_QOffscreenSurface; }
}

6
src/gsiqt/qt6/QtGui/gsiDeclQPaintDeviceWindow.cc
View File

@ -298,6 +298,12 @@ qt_gsi::QtNativeClass<QPaintDeviceWindow> decl_QPaintDeviceWindow (qtdecl_QWindo
methods_QPaintDeviceWindow (),
"@hide\n@alias QPaintDeviceWindow");
// Additional base classes
gsi::Class<QPaintDevice> &qtdecl_QPaintDevice ();
gsi::ClassExt<QPaintDeviceWindow> base_class_QPaintDevice_in_QPaintDeviceWindow (qtdecl_QPaintDevice ());
GSI_QTGUI_PUBLIC gsi::Class<QPaintDeviceWindow> &qtdecl_QPaintDeviceWindow () { return decl_QPaintDeviceWindow; }
}

6
src/gsiqt/qt6/QtGui/gsiDeclQPdfWriter.cc
View File

@ -383,6 +383,12 @@ qt_gsi::QtNativeClass<QPdfWriter> decl_QPdfWriter (qtdecl_QObject (), "QtGui", "
methods_QPdfWriter (),
"@hide\n@alias QPdfWriter");
// Additional base classes
gsi::Class<QPagedPaintDevice> &qtdecl_QPagedPaintDevice ();
gsi::ClassExt<QPdfWriter> base_class_QPagedPaintDevice_in_QPdfWriter (qtdecl_QPagedPaintDevice ());
GSI_QTGUI_PUBLIC gsi::Class<QPdfWriter> &qtdecl_QPdfWriter () { return decl_QPdfWriter; }
}

6
src/gsiqt/qt6/QtGui/gsiDeclQWindow.cc
View File

@ -2207,6 +2207,12 @@ qt_gsi::QtNativeClass<QWindow> decl_QWindow (qtdecl_QObject (), "QtGui", "QWindo
methods_QWindow (),
"@hide\n@alias QWindow");
// Additional base classes
gsi::Class<QSurface> &qtdecl_QSurface ();
gsi::ClassExt<QWindow> base_class_QSurface_in_QWindow (qtdecl_QSurface ());
GSI_QTGUI_PUBLIC gsi::Class<QWindow> &qtdecl_QWindow () { return decl_QWindow; }
}

6
src/gsiqt/qt6/QtWidgets/gsiDeclQAccessibleWidget.cc
View File

@ -451,6 +451,12 @@ gsi::Class<QAccessibleWidget> decl_QAccessibleWidget (qtdecl_QAccessibleObject (
"@qt\n@brief Binding of QAccessibleWidget");
// Additional base classes
gsi::Class<QAccessibleActionInterface> &qtdecl_QAccessibleActionInterface ();
gsi::ClassExt<QAccessibleWidget> base_class_QAccessibleActionInterface_in_QAccessibleWidget (qtdecl_QAccessibleActionInterface ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QAccessibleWidget> &qtdecl_QAccessibleWidget () { return decl_QAccessibleWidget; }
}

7
src/gsiqt/qt6/QtWidgets/gsiDeclQGraphicsObject.cc
View File

@ -58,6 +58,7 @@
#include <QTimerEvent>
#include <QTransform>
#include <QWidget>
#include <QGraphicsTransform>
#include "gsiQt.h"
#include "gsiQtWidgetsCommon.h"
#include <memory>
@ -243,6 +244,12 @@ qt_gsi::QtNativeClass<QGraphicsObject> decl_QGraphicsObject (qtdecl_QObject (),
methods_QGraphicsObject (),
"@hide\n@alias QGraphicsObject");
// Additional base classes
gsi::Class<QGraphicsItem> &qtdecl_QGraphicsItem ();
gsi::ClassExt<QGraphicsObject> base_class_QGraphicsItem_in_QGraphicsObject (qtdecl_QGraphicsItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QGraphicsObject> &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; }
}

6
src/gsiqt/qt6/QtWidgets/gsiDeclQGraphicsWidget.cc
View File

@ -1375,6 +1375,12 @@ qt_gsi::QtNativeClass<QGraphicsWidget> decl_QGraphicsWidget (qtdecl_QGraphicsObj
methods_QGraphicsWidget (),
"@hide\n@alias QGraphicsWidget");
// Additional base classes
gsi::Class<QGraphicsLayoutItem> &qtdecl_QGraphicsLayoutItem ();
gsi::ClassExt<QGraphicsWidget> base_class_QGraphicsLayoutItem_in_QGraphicsWidget (qtdecl_QGraphicsLayoutItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QGraphicsWidget> &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; }
}

6
src/gsiqt/qt6/QtWidgets/gsiDeclQLayout.cc
View File

@ -1014,6 +1014,12 @@ qt_gsi::QtNativeClass<QLayout> decl_QLayout (qtdecl_QObject (), "QtWidgets", "QL
methods_QLayout (),
"@hide\n@alias QLayout");
// Additional base classes
gsi::Class<QLayoutItem> &qtdecl_QLayoutItem ();
gsi::ClassExt<QLayout> base_class_QLayoutItem_in_QLayout (qtdecl_QLayoutItem ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QLayout> &qtdecl_QLayout () { return decl_QLayout; }
}

6
src/gsiqt/qt6/QtWidgets/gsiDeclQWidget.cc
View File

@ -4982,6 +4982,12 @@ qt_gsi::QtNativeClass<QWidget> decl_QWidget (qtdecl_QObject (), "QtWidgets", "QW
methods_QWidget (),
"@hide\n@alias QWidget");
// Additional base classes
gsi::Class<QPaintDevice> &qtdecl_QPaintDevice ();
gsi::ClassExt<QWidget> base_class_QPaintDevice_in_QWidget (qtdecl_QPaintDevice ());
GSI_QTWIDGETS_PUBLIC gsi::Class<QWidget> &qtdecl_QWidget () { return decl_QWidget; }
}

2
src/klayout.pri
View File

@ -152,7 +152,7 @@ msvc {
-Wno-reserved-user-defined-literal \
# because we use unordered_map/unordered_set:
QMAKE_CXXFLAGS += -std=c++0x
QMAKE_CXXFLAGS += -std=c++11
win32 {
QMAKE_LFLAGS += -Wl,--exclude-all-symbols

1145
src/pya/pya/pyaModule.cc
View File

File diff suppressed because it is too large Load Diff

55
src/pya/pya/pyaModule.h
View File

@ -108,13 +108,56 @@ public:
*/
PyObject *take_module ();
private:
void add_python_doc (const gsi::ClassBase &cls, const MethodTable *mt, int mid, const std::string &doc);
PyMethodDef *make_method_def ();
PyGetSetDef *make_getset_def ();
char *make_string (const std::string &s);
static void check (const char *mod_name);
/**
* @brief Gets the module name
*/
const std::string &mod_name () const
{
return m_mod_name;
}
/**
* @brief Adds the given documentation for the given class and method
*/
void add_python_doc (const gsi::ClassBase &cls, const MethodTable *mt, int mid, const std::string &doc);
/**
* @brief Adds the given documentation for the given class
*/
void add_python_doc (const gsi::MethodBase *m, const std::string &doc);
/**
* @brief Creates a method definition
*/
PyMethodDef *make_method_def ();
/**
* @brief Creates a property getter/setter pair
*/
PyGetSetDef *make_getset_def ();
/**
* @brief Creates a string with backup storage
*/
char *make_string (const std::string &s);
/**
* @brief Gets the next available class ID
*/
size_t next_class_id () const
{
return m_classes.size ();
}
/**
* @brief Register the class
*/
void register_class (const gsi::ClassBase *cls)
{
m_classes.push_back (cls);
}
private:
std::list<std::string> m_string_heap;
std::vector<PyMethodDef *> m_methods_heap;
std::vector<PyGetSetDef *> m_getseters_heap;

12
src/pya/pya/pyaObject.cc
View File

@ -586,5 +586,17 @@ PYAObjectBase::obj ()
return m_obj;
}
PYAObjectBase *
PYAObjectBase::from_pyobject (PyObject *py_object)
{
if (Py_TYPE (py_object)->tp_init == NULL) {
throw tl::Exception (tl::to_string (tr ("Extension classes do not support instance methods or properties")));
}
PYAObjectBase *pya_object = from_pyobject_unsafe (py_object);
tl_assert (pya_object->py_object () == py_object);
return pya_object;
}
}

16
src/pya/pya/pyaObject.h
View File

@ -70,25 +70,21 @@ public:
*/
~PYAObjectBase ();
/**
* @brief Gets the PYAObjectBase pointer from a PyObject pointer
*/
static PYAObjectBase *from_pyobject (PyObject *py_object)
{
PYAObjectBase *pya_object = (PYAObjectBase *)((char *) py_object + Py_TYPE (py_object)->tp_basicsize - sizeof (PYAObjectBase));
tl_assert (pya_object->py_object () == py_object);
return pya_object;
}
/**
* @brief Gets the PYAObjectBase pointer from a PyObject pointer
* This version doesn't check anything.
*/
static PYAObjectBase *from_pyobject_unsafe (PyObject *py_object)
{
// the objects must not be a pure static extension
return (PYAObjectBase *)((char *) py_object + Py_TYPE (py_object)->tp_basicsize - sizeof (PYAObjectBase));
}
/**
* @brief Gets the PYAObjectBase pointer from a PyObject pointer
*/
static PYAObjectBase *from_pyobject (PyObject *py_object);
/**
* @brief Indicates that a C++ object is present
*/

2
src/pymod/bridge_sample/bridge_sample.pro
View File

@ -92,7 +92,7 @@ LIBS += -L$$LIBDIR -lklayout_db
-Wno-reserved-user-defined-literal \
# because we use unordered_map/unordered_set:
QMAKE_CXXFLAGS += -std=c++0x
QMAKE_CXXFLAGS += -std=c++11
# Python is somewhat sloppy and relies on the compiler initializing fields
# of strucs to 0:

20
src/pymod/unit_tests/pymod_tests.cc
View File

@ -93,7 +93,11 @@ PYMODTEST (import_rdb, "import_rdb.py")
PYMODTEST (import_lay, "import_lay.py")
PYMODTEST (import_QtCore, "import_QtCore.py")
#if QT_VERSION >= 0x60000
PYMODTEST (import_QtGui, "import_QtGui_Qt6.py")
#else
PYMODTEST (import_QtGui, "import_QtGui.py")
#endif
#if defined(HAVE_QT_XML)
PYMODTEST (import_QtXml, "import_QtXml.py")
#endif
@ -103,7 +107,7 @@ PYMODTEST (import_QtSql, "import_QtSql.py")
#if defined(HAVE_QT_NETWORK)
PYMODTEST (import_QtNetwork, "import_QtNetwork.py")
#endif
#if defined(HAVE_QT_DESIGNER)
#if defined(HAVE_QT_DESIGNER) && QT_VERSION < 0x60000
PYMODTEST (import_QtDesigner, "import_QtDesigner.py")
#endif
#if defined(HAVE_QT_UITOOLS)
@ -112,7 +116,11 @@ PYMODTEST (import_QtUiTools, "import_QtUiTools.py")
#if QT_VERSION >= 0x50000
#if QT_VERSION >= 0x60000
PYMODTEST (import_QtWidgets, "import_QtWidgets_Qt6.py")
#else
PYMODTEST (import_QtWidgets, "import_QtWidgets.py")
#endif
#if defined(HAVE_QT_MULTIMEDIA)
PYMODTEST (import_QtMultimedia, "import_QtMultimedia.py")
#endif
@ -120,12 +128,20 @@ PYMODTEST (import_QtMultimedia, "import_QtMultimedia.py")
PYMODTEST (import_QtPrintSupport, "import_QtPrintSupport.py")
#endif
#if defined(HAVE_QT_SVG)
#if QT_VERSION >= 0x60000
PYMODTEST (import_QtSvg, "import_QtSvg_Qt6.py")
#else
PYMODTEST (import_QtSvg, "import_QtSvg.py")
#endif
#if defined(HAVE_QT_XML)
#endif
#if defined(HAVE_QT_XML) && QT_VERSION < 0x60000
PYMODTEST (import_QtXmlPatterns, "import_QtXmlPatterns.py")
#endif
#if QT_VERSION >= 0x60000
PYMODTEST (import_QtCore5Compat, "import_QtCore5Compat.py")
#endif
#endif
PYMODTEST (import_pya, "pya_tests.py")

313
src/rba/rba/rba.cc
View File

@ -1111,7 +1111,7 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
}
} catch (tl::CancelException) {
} catch (tl::CancelException &) {
// break encountered
}
@ -1521,52 +1521,100 @@ rba_add_path (const std::string &path)
}
}
static void
rba_init (RubyInterpreterPrivateData *d)
namespace
{
VALUE module = rb_define_module ("RBA");
// initialize the locked object vault as a fast replacement for rb_gc_register_address/rb_gc_unregister_address.
rba::make_locked_object_vault (module);
class RubyClassGenerator
{
public:
RubyClassGenerator (VALUE module)
: m_module (module)
{
// .. nothing yet ..
}
// save all constants for later (we cannot declare them while we are still producing classes
// because of the enum representative classes and enum constants are important)
std::vector <RubyConstDescriptor> constants;
// needs to be called before for each extension before the classes are made
void register_extension (const gsi::ClassBase *cls)
{
if (cls->name ().empty ()) {
// got an extension
tl_assert (cls->parent ());
m_extensions_for [cls->parent ()->declaration ()].push_back (cls->declaration ());
}
}
std::list<const gsi::ClassBase *> sorted_classes = gsi::ClassBase::classes_in_definition_order ();
for (std::list<const gsi::ClassBase *>::const_iterator c = sorted_classes.begin (); c != sorted_classes.end (); ++c) {
// we might encounter a child class which is a reference to a top-level class (e.g.
// duplication of enums into child classes). In this case we create a constant inside the
// target class.
if ((*c)->declaration () != *c) {
tl_assert ((*c)->parent () != 0); // top-level classes should be merged
rb_define_const (ruby_cls ((*c)->parent ()->declaration ()), (*c)->name ().c_str (), ruby_cls ((*c)->declaration ()));
continue;
VALUE make_class (const gsi::ClassBase *cls, bool as_static, VALUE parent_class = (VALUE) 0, const gsi::ClassBase *parent = 0)
{
if (is_registered (cls, as_static)) {
return ruby_cls (cls, as_static);
}
VALUE super = rb_cObject;
if ((*c)->base () != 0) {
tl_assert (is_registered ((*c)->base ()));
super = ruby_cls ((*c)->base ());
if (cls->base () != 0) {
super = make_class (cls->base (), as_static);
}
VALUE klass;
if ((*c)->parent ()) {
tl_assert (is_registered ((*c)->parent ()->declaration ()));
VALUE parent_class = ruby_cls ((*c)->parent ()->declaration ());
klass = rb_define_class_under (parent_class, (*c)->name ().c_str (), super);
if (as_static) {
if (tl::verbosity () >= 20) {
tl::log << tl::to_string (tr ("Registering class as Ruby module:) ")) << cls->name ();
}
std::string mixin_name = cls->name () + "_Mixin";
if (parent) {
klass = rb_define_module_under (parent_class, mixin_name.c_str ());
} else {
klass = rb_define_module_under (m_module, mixin_name.c_str ());
}
// if the base class is an extension (mixin), we cannot use it as superclass because it's a module
if (cls->base () != 0) {
rb_include_module (klass, super);
}
} else {
klass = rb_define_class_under (module, (*c)->name ().c_str (), super);
if (parent) {
klass = rb_define_class_under (parent_class, cls->name ().c_str (), super);
} else {
klass = rb_define_class_under (m_module, cls->name ().c_str (), super);
}
rb_define_alloc_func (klass, alloc_proxy);
}
register_class (klass, *c);
register_class (klass, cls, as_static);
rb_define_alloc_func (klass, alloc_proxy);
// mix-in unnamed extensions
MethodTable *mt = MethodTable::method_table_by_class (*c, true /*force init*/);
auto exts = m_extensions_for.find (cls);
if (exts != m_extensions_for.end ()) {
for (auto ie = exts->second.begin (); ie != exts->second.end (); ++ie) {
VALUE ext_module = make_class (*ie, true);
rb_include_module (klass, ext_module);
rb_extend_object (klass, ext_module);
}
}
for (gsi::ClassBase::method_iterator m = (*c)->begin_methods (); m != (*c)->end_methods (); ++m) {
// produce the child classes
for (auto cc = cls->begin_child_classes (); cc != cls->end_child_classes (); ++cc) {
if (! cc->name ().empty ()) {
if (! is_registered (cc->declaration (), false)) {
make_class (cc->declaration (), false, klass, cc->declaration ());
} else {
VALUE child_class = ruby_cls (cc->declaration (), false);
rb_define_const (klass, cc->name ().c_str (), child_class);
}
}
}
MethodTable *mt = MethodTable::method_table_by_class (cls, true /*force init*/);
for (auto m = (cls)->begin_methods (); m != (cls)->end_methods (); ++m) {
if (! (*m)->is_callback ()) {
@ -1582,7 +1630,7 @@ rba_init (RubyInterpreterPrivateData *d)
if (! drop_method) {
for (gsi::MethodBase::synonym_iterator syn = (*m)->begin_synonyms (); syn != (*m)->end_synonyms (); ++syn) {
for (auto syn = (*m)->begin_synonyms (); syn != (*m)->end_synonyms (); ++syn) {
if (syn->is_predicate) {
mt->add_method (syn->name, *m);
mt->add_method (syn->name + "?", *m);
@ -1597,17 +1645,17 @@ rba_init (RubyInterpreterPrivateData *d)
} else {
for (gsi::MethodBase::synonym_iterator syn = (*m)->begin_synonyms (); syn != (*m)->end_synonyms (); ++syn) {
for (auto syn = (*m)->begin_synonyms (); syn != (*m)->end_synonyms (); ++syn) {
if (isupper (syn->name [0]) && (*m)->begin_arguments () == (*m)->end_arguments ()) {
// Static const methods are constants.
// Methods without arguments which start with a capital letter are treated as constants
// for backward compatibility
constants.push_back (RubyConstDescriptor ());
constants.back ().klass = klass;
constants.back ().meth = *m;
constants.back ().name = (*m)->begin_synonyms ()->name;
m_constants.push_back (RubyConstDescriptor ());
m_constants.back ().klass = klass;
m_constants.back ().meth = *m;
m_constants.back ().name = (*m)->begin_synonyms ()->name;
} else if ((*m)->ret_type ().type () == gsi::T_object && (*m)->ret_type ().pass_obj () && syn->name == "new") {
@ -1640,96 +1688,149 @@ rba_init (RubyInterpreterPrivateData *d)
// clean up the method table
mt->finish ();
// Hint: we need to do static methods before the non-static ones because
// rb_define_module_function creates an private instance method.
// If we do the non-static methods afterwards we will make it a public once again.
// The order of the names will be "name(non-static), name(static), ..." because
// the static flag is the second member of the key (string, bool) pair.
for (size_t mid = mt->bottom_mid (); mid < mt->top_mid (); ++mid) {
// NOTE: extensions can't carry methods - this is due to the method numbering scheme
// which can only handle direct base classes. So only constants are carried forward.
if (! as_static) {
if (mt->is_static (mid)) {
// Hint: we need to do static methods before the non-static ones because
// rb_define_module_function creates an private instance method.
// If we do the non-static methods afterwards we will make it a public once again.
// The order of the names will be "name(non-static), name(static), ..." because
// the static flag is the second member of the key (string, bool) pair.
for (size_t mid = mt->bottom_mid (); mid < mt->top_mid (); ++mid) {
tl_assert (mid < size_t (sizeof (method_adaptors) / sizeof (method_adaptors [0])));
if (mt->is_static (mid)) {
tl_assert (mid < size_t (sizeof (method_adaptors) / sizeof (method_adaptors [0])));
/* Note: Ruby does not support static protected functions, hence we have them (i.e. QThread::usleep).
* Do we silently create public ones from them:
if (mt->is_protected (mid)) {
tl::warn << "static '" << mt->name (mid) << "' method cannot be protected in class " << c->name ();
}
*/
rb_define_module_function (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
/* Note: Ruby does not support static protected functions, hence we have them (i.e. QThread::usleep).
* Do we silently create public ones from them:
if (mt->is_protected (mid)) {
tl::warn << "static '" << mt->name (mid) << "' method cannot be protected in class " << c->name ();
}
*/
rb_define_module_function (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
}
for (size_t mid = mt->bottom_mid (); mid < mt->top_mid (); ++mid) {
if (mt->is_ctor (mid)) {
tl_assert (mid < size_t (sizeof (method_adaptors_ctor) / sizeof (method_adaptors_ctor [0])));
if (! mt->is_protected (mid)) {
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
} else {
// a protected constructor needs to be provided in both protected and non-protected mode
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
rb_define_protected_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
}
} else if (! mt->is_static (mid)) {
tl_assert (mid < size_t (sizeof (method_adaptors) / sizeof (method_adaptors [0])));
if (! mt->is_protected (mid)) {
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
} else {
rb_define_protected_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
}
}
if (mt->is_signal (mid)) {
// We alias the signal name to an assignment, so the following can be done:
// x = object with signal "signal"
// x.signal = proc
// this will basically map to
// x.signal(proc)
// which will make proc the only receiver for the signal
rb_define_alias (klass, (mt->name (mid) + "=").c_str (), mt->name (mid).c_str ());
}
if (mt->name (mid) == "to_s") {
#if HAVE_RUBY_VERSION_CODE>=20000 && defined(GSI_ALIAS_INSPECT)
// Ruby 2.x does no longer alias "inspect" to "to_s" automatically, so we have to do this:
rb_define_alias (klass, "inspect", "to_s");
#endif
} else if (mt->name (mid) == "==") {
rb_define_alias (klass, "eql?", "==");
}
}
}
for (size_t mid = mt->bottom_mid (); mid < mt->top_mid (); ++mid) {
return klass;
}
if (mt->is_ctor (mid)) {
void make_constants ()
{
for (auto c = m_constants.begin (); c != m_constants.end (); ++c) {
tl_assert (mid < size_t (sizeof (method_adaptors_ctor) / sizeof (method_adaptors_ctor [0])));
try {
if (! mt->is_protected (mid)) {
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
} else {
// a protected constructor needs to be provided in both protected and non-protected mode
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
rb_define_protected_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors_ctor[mid], -1);
}
gsi::SerialArgs retlist (c->meth->retsize ());
gsi::SerialArgs arglist (c->meth->argsize ());
c->meth->call (0, arglist, retlist);
tl::Heap heap;
VALUE ret = pop_arg (c->meth->ret_type (), 0, retlist, heap);
rb_define_const (c->klass, c->name.c_str (), ret);
} else if (! mt->is_static (mid)) {
tl_assert (mid < size_t (sizeof (method_adaptors) / sizeof (method_adaptors [0])));
if (! mt->is_protected (mid)) {
rb_define_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
} else {
rb_define_protected_method (klass, mt->name (mid).c_str (), (ruby_func) method_adaptors[mid], -1);
}
}
if (mt->is_signal (mid)) {
// We alias the signal name to an assignment, so the following can be done:
// x = object with signal "signal"
// x.signal = proc
// this will basically map to
// x.signal(proc)
// which will make proc the only receiver for the signal
rb_define_alias (klass, (mt->name (mid) + "=").c_str (), mt->name (mid).c_str ());
}
if (mt->name (mid) == "to_s") {
#if HAVE_RUBY_VERSION_CODE>=20000 && defined(GSI_ALIAS_INSPECT)
// Ruby 2.x does no longer alias "inspect" to "to_s" automatically, so we have to do this:
rb_define_alias (klass, "inspect", "to_s");
#endif
} else if (mt->name (mid) == "==") {
rb_define_alias (klass, "eql?", "==");
} catch (tl::Exception &ex) {
tl::warn << "Got exception '" << ex.msg () << "' while defining constant " << c->name;
}
}
}
private:
VALUE m_module;
std::vector <RubyConstDescriptor> m_constants;
std::map<const gsi::ClassBase *, std::vector<const gsi::ClassBase *> > m_extensions_for;
std::set<const gsi::ClassBase *> m_extensions;
};
}
static void
rba_init (RubyInterpreterPrivateData *d)
{
VALUE module = rb_define_module ("RBA");
// initialize the locked object vault as a fast replacement for rb_gc_register_address/rb_gc_unregister_address.
rba::make_locked_object_vault (module);
// save all constants for later (we cannot declare them while we are still producing classes
// because of the enum representative classes and enum constants are important)
std::vector <RubyConstDescriptor> constants;
std::list<const gsi::ClassBase *> sorted_classes = gsi::ClassBase::classes_in_definition_order ();
RubyClassGenerator gen (module);
// first pass: register the extensions
for (auto c = sorted_classes.begin (); c != sorted_classes.end (); ++c) {
if ((*c)->declaration () != *c) {
gen.register_extension (*c);
}
}
// second pass: make the classes
for (auto c = sorted_classes.begin (); c != sorted_classes.end (); ++c) {
if ((*c)->declaration () == *c) {
gen.make_class (*c, false);
}
}
// now make the constants
for (std::vector <RubyConstDescriptor>::const_iterator c = constants.begin (); c != constants.end (); ++c) {
try {
gsi::SerialArgs retlist (c->meth->retsize ());
gsi::SerialArgs arglist (c->meth->argsize ());
c->meth->call (0, arglist, retlist);
tl::Heap heap;
VALUE ret = pop_arg (c->meth->ret_type (), 0, retlist, heap);
rb_define_const (c->klass, c->name.c_str (), ret);
} catch (tl::Exception &ex) {
tl::warn << "Got exception '" << ex.msg () << "' while defining constant " << c->name;
}
}
gen.make_constants ();
// define a signal representative class RBASignal
SignalHandler::define_class (module, "RBASignal");

4
src/rba/rba/rbaConvert.cc
View File

@ -213,7 +213,7 @@ object_to_ruby (void *obj, Proxy *self, const gsi::ClassBase *cls, bool pass_obj
// of the exposed property. Hence copying is safer.
// create a instance and copy the value
ret = rb_obj_alloc (ruby_cls (clsact));
ret = rb_obj_alloc (ruby_cls (clsact, false));
Proxy *p = 0;
Data_Get_Struct (ret, Proxy, p);
clsact->assign (p->obj (), obj);
@ -243,7 +243,7 @@ object_to_ruby (void *obj, Proxy *self, const gsi::ClassBase *cls, bool pass_obj
// TODO: we will create a fresh object here, delete it again and link the
// reference to the existing object to the Ruby object. This is not quite
// efficient - we should avoid creating and deleting a dummy object first.
ret = rb_obj_alloc (ruby_cls (clsact));
ret = rb_obj_alloc (ruby_cls (clsact, false));
Proxy *p = 0;
Data_Get_Struct (ret, Proxy, p);
p->set (obj, pass_obj, is_const /*const*/, can_destroy /*can_destroy*/, ret);

14
src/rba/rba/rbaInternal.cc
View File

@ -919,24 +919,24 @@ void SignalHandler::call (const gsi::MethodBase *meth, gsi::SerialArgs &args, gs
// Class map management
static std::map <VALUE, const gsi::ClassBase *> cls_map;
static std::map <const gsi::ClassBase *, VALUE> rev_cls_map;
static std::map <std::pair<const gsi::ClassBase *, bool>, VALUE> rev_cls_map;
void register_class (VALUE ruby_cls, const gsi::ClassBase *gsi_cls)
void register_class (VALUE ruby_cls, const gsi::ClassBase *gsi_cls, bool as_static)
{
cls_map.insert (std::make_pair (ruby_cls, gsi_cls));
rev_cls_map.insert (std::make_pair (gsi_cls, ruby_cls));
rev_cls_map.insert (std::make_pair (std::make_pair (gsi_cls, as_static), ruby_cls));
}
VALUE ruby_cls (const gsi::ClassBase *cls)
VALUE ruby_cls (const gsi::ClassBase *cls, bool as_static)
{
std::map <const gsi::ClassBase *, VALUE>::const_iterator c = rev_cls_map.find (cls);
auto c = rev_cls_map.find (std::make_pair (cls, as_static));
tl_assert (c != rev_cls_map.end ());
return c->second;
}
bool is_registered (const gsi::ClassBase *cls)
bool is_registered (const gsi::ClassBase *cls, bool as_static)
{
return rev_cls_map.find (cls) != rev_cls_map.end ();
return rev_cls_map.find (std::make_pair (cls, as_static)) != rev_cls_map.end ();
}
const gsi::ClassBase *find_cclass (VALUE k)

6
src/rba/rba/rbaInternal.h
View File

@ -211,7 +211,7 @@ private:
/**
* @brief Registers a Ruby class for a gsi class
*/
void register_class (VALUE ruby_cls, const gsi::ClassBase *gsi_cls);
void register_class (VALUE ruby_cls, const gsi::ClassBase *gsi_cls, bool as_static);
/**
* @brief Find the class declaration from the Ruby object
@ -226,12 +226,12 @@ const gsi::ClassBase *find_cclass_maybe_null (VALUE k);
/**
* @brief Finds the Ruby class for a gsi class
*/
VALUE ruby_cls (const gsi::ClassBase *cls);
VALUE ruby_cls (const gsi::ClassBase *cls, bool as_static);
/**
* @brief Gets a value indicating whether a Ruby class is registered for a GSI class
*/
bool is_registered (const gsi::ClassBase *gsi_cls);
bool is_registered (const gsi::ClassBase *gsi_cls, bool as_static);
/**
* @brief Locks the Ruby object against destruction by the GC

6
src/tl/tl/tlReuseVector.h
View File

@ -27,6 +27,7 @@
#include <stdlib.h>
#include <iterator>
#include <type_traits>
#include <vector>
#include <cstring>
@ -491,7 +492,12 @@ private:
* One requirement is that sizeof(C) >= sizeof(void *).
*/
#if __GNUC__ >= 5
template <class Value, bool trivial_relocate = std::is_trivially_copy_constructible<Value>::value>
#else
// no support for extended type traits in gcc 4.x
template <class Value, bool trivial_relocate = false>
#endif
class reuse_vector
{
public:

43
testdata/pymod/import_QtCore5Compat.py vendored Executable file
View File

@ -0,0 +1,43 @@
# KLayout Layout Viewer
# Copyright (C) 2006-2021 Matthias Koefferlein
#
# 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, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import testprep
import klayout.QtCore5Compat as QtCore5Compat
import unittest
import sys
# Tests the basic abilities of the module
class BasicTest(unittest.TestCase):
def test_1(self):
self.assertEqual("QRegExp" in QtCore5Compat.__all__, True)
def test_2(self):
# Some smoke test
re = QtCore5Compat.QRegExp("a.*b")
self.assertEqual(re.indexIn("xauby"), 1)
# run unit tests
if __name__ == '__main__':
suite = unittest.TestSuite()
suite = unittest.TestLoader().loadTestsFromTestCase(BasicTest)
if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful():
sys.exit(1)

67
testdata/pymod/import_QtGui_Qt6.py vendored Executable file
View File

@ -0,0 +1,67 @@
# KLayout Layout Viewer
# Copyright (C) 2006-2021 Matthias Koefferlein
#
# 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, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import testprep
import klayout.QtCore as QtCore
import klayout.QtWidgets as QtWidgets
import klayout.QtGui as QtGui
import unittest
import sys
# Tests the basic abilities of the module
class BasicTest(unittest.TestCase):
def test_1(self):
self.assertEqual("QColor" in QtGui.__all__, True)
self.assertEqual("QAction" in QtGui.__all__, True)
def test_2(self):
# Some smoke test
v = QtGui.QColor(12, 34, 68)
self.assertEqual(v.red, 12)
v.red = 17
self.assertEqual(v.red, 17)
self.assertEqual(v.green, 34)
self.assertEqual(v.blue, 68)
trg = 0
def onTrigger(self):
self.trg += 17
def test_3(self):
app = QtWidgets.QApplication([ "progname" ])
a = QtGui.QAction(None)
a.text = "myaction"
self.assertEqual(a.text, "myaction")
self.trg = 0
a.triggered = self.onTrigger
a.trigger()
self.assertEqual(self.trg, 17)
a.trigger()
self.assertEqual(self.trg, 34)
# run unit tests
if __name__ == '__main__':
suite = unittest.TestSuite()
suite = unittest.TestLoader().loadTestsFromTestCase(BasicTest)
if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful():
sys.exit(1)

45
testdata/pymod/import_QtSvg_Qt6.py vendored Executable file
View File

@ -0,0 +1,45 @@
# KLayout Layout Viewer
# Copyright (C) 2006-2021 Matthias Koefferlein
#
# 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, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import testprep
import klayout.QtCore as QtCore
import klayout.QtGui as QtGui
import klayout.QtWidgets as QtWidgets
import klayout.QtSvg as QtSvg
import unittest
import sys
# Tests the basic abilities of the module
class BasicTest(unittest.TestCase):
def test_1(self):
self.assertEqual("QSvgRenderer" in QtSvg.__all__, True)
def test_2(self):
# Smoke test
q = QtSvg.QSvgRenderer()
# run unit tests
if __name__ == '__main__':
suite = unittest.TestSuite()
suite = unittest.TestLoader().loadTestsFromTestCase(BasicTest)
if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful():
sys.exit(1)

48
testdata/pymod/import_QtWidgets_Qt6.py vendored Executable file
View File

@ -0,0 +1,48 @@
# KLayout Layout Viewer
# Copyright (C) 2006-2021 Matthias Koefferlein
#
# 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, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import testprep
import klayout.QtCore as QtCore
import klayout.QtGui as QtGui
import klayout.QtWidgets as QtWidgets
import unittest
import sys
# Tests the basic abilities of the module
class BasicTest(unittest.TestCase):
def test_1(self):
self.assertEqual("QGraphicsLineItem" in QtWidgets.__all__, True)
def test_2(self):
i = QtWidgets.QGraphicsLineItem()
i.line = QtCore.QLineF(1, 2, 3, 4)
self.assertEqual(i.line.x1(), 1)
self.assertEqual(i.line.y1(), 2)
self.assertEqual(i.line.x2(), 3)
self.assertEqual(i.line.y2(), 4)
# run unit tests
if __name__ == '__main__':
suite = unittest.TestSuite()
suite = unittest.TestLoader().loadTestsFromTestCase(BasicTest)
if not unittest.TextTestRunner(verbosity = 1).run(suite).wasSuccessful():
sys.exit(1)

17
testdata/python/basic.py vendored
View File

@ -3045,8 +3045,23 @@ class BasicTest(unittest.TestCase):
self.assertEqual(pya.A.ba_to_ia(b'\x00\x01\x02'), [ 0, 1, 2 ])
# Tests multi-base mixins (only constants and enums available)
def test_multiBaseMixins(self):
bb = pya.BB() # base classes B1,B2,B3
bb.set1(17) # B1
self.assertEqual(bb.get1(), 17) # B1
bb.set1(21) # B1
self.assertEqual(bb.get1(), 21) # B1
self.assertEqual(pya.BB.C2, 17) # B2
self.assertEqual(pya.BB.C3, -1) # B3
self.assertEqual(pya.BB.E.E3B.to_i(), 101) # B3
self.assertEqual(bb.d3(pya.BB.E.E3C, pya.BB.E.E3A), -2) # BB with B3 enums
self.assertEqual(bb.d3(pya.BB.E.E3A, pya.BB.E.E3C), 2) # BB with B3 enums
# Custom factory implemented in Python
#
def test_80(self):
gc = pya.GObject.g_inst_count()

18
testdata/ruby/basic_testcore.rb vendored
View File

@ -3012,6 +3012,24 @@ class Basic_TestClass < TestBase
end
# Tests multi-base mixins (only constants and enums available)
def test_multiBaseMixins
bb = RBA::BB::new # base classes B1,B2,B3
bb.set1(17) # B1
assert_equal(bb.get1, 17) # B1
bb.set1(21) # B1
assert_equal(RBA::B3::E::E3B.to_i, 101) # B3
assert_equal(bb.get1, 21) # B1
assert_equal(RBA::BB::C2, 17) # B2
assert_equal(RBA::BB::C3, -1) # B3
assert_equal(RBA::BB::E::E3B.to_i, 101) # B3
assert_equal(bb.d3(RBA::BB::E::E3C, RBA::BB::E::E3A), -2) # BB with B3 enums
assert_equal(bb.d3(RBA::BB::E::E3A, RBA::BB::E::E3C), 2) # BB with B3 enums
end
# Custom factory implemented in Ruby
def test_80