206b5b2661
...warning about (for now only) functions and variables with external linkage
that likely don't need it.
The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
returns 1, both moving just the struct S2 into an nunnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
namespace { struct S2: S1 { int f() { return 1; } }; }
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
as well as moving just the function f overload into an unnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
namespace { int f(S2 s) { return s.f(); } }
}
int main() { return f(N::S2()); }
would each change the program to return 0 instead.
Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
313 lines
7.2 KiB
C++
313 lines
7.2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <cassert>
|
|
|
|
#include "pyuno_impl.hxx"
|
|
|
|
#include <com/sun/star/container/XEnumeration.hpp>
|
|
#include <com/sun/star/container/XIndexAccess.hpp>
|
|
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
|
#include <com/sun/star/lang/WrappedTargetException.hpp>
|
|
|
|
using com::sun::star::container::XEnumeration;
|
|
using com::sun::star::container::XIndexAccess;
|
|
using com::sun::star::lang::IndexOutOfBoundsException;
|
|
using com::sun::star::lang::WrappedTargetException;
|
|
using com::sun::star::uno::Any;
|
|
using com::sun::star::uno::Reference;
|
|
using com::sun::star::uno::RuntimeException;
|
|
|
|
|
|
namespace pyuno
|
|
{
|
|
|
|
static void PyUNO_iterator_del( PyObject* self )
|
|
{
|
|
PyUNO_iterator* me = reinterpret_cast<PyUNO_iterator*>(self);
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
delete me->members;
|
|
}
|
|
PyObject_Del( self );
|
|
}
|
|
|
|
static PyObject* PyUNO_iterator_iter( PyObject *self )
|
|
{
|
|
Py_INCREF( self );
|
|
return self;
|
|
}
|
|
|
|
static PyObject* PyUNO_iterator_next( PyObject *self )
|
|
{
|
|
PyUNO_iterator* me = reinterpret_cast<PyUNO_iterator*>(self);
|
|
|
|
Runtime runtime;
|
|
Any aRet;
|
|
|
|
try
|
|
{
|
|
bool hasMoreElements = false;
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
|
|
hasMoreElements = me->members->xEnumeration->hasMoreElements();
|
|
if ( hasMoreElements )
|
|
{
|
|
aRet = me->members->xEnumeration->nextElement();
|
|
}
|
|
}
|
|
|
|
if ( hasMoreElements )
|
|
{
|
|
PyRef rRet = runtime.any2PyObject( aRet );
|
|
return rRet.getAcquired();
|
|
}
|
|
|
|
PyErr_SetString( PyExc_StopIteration, "" );
|
|
return nullptr;
|
|
}
|
|
catch( css::container::NoSuchElementException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( css::script::CannotConvertException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( css::lang::IllegalArgumentException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( const css::lang::WrappedTargetException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( const css::uno::RuntimeException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
|
|
static PyTypeObject PyUNO_iterator_Type =
|
|
{
|
|
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
|
|
"PyUNO_iterator",
|
|
sizeof (PyUNO_iterator),
|
|
0,
|
|
PyUNO_iterator_del,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
Py_TPFLAGS_HAVE_ITER,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
PyUNO_iterator_iter, // Generic, reused between the iterator types
|
|
PyUNO_iterator_next,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0
|
|
#if PY_VERSION_HEX >= 0x03040000
|
|
, nullptr
|
|
#endif
|
|
};
|
|
|
|
PyObject* PyUNO_iterator_new( const Reference< XEnumeration >& xEnumeration )
|
|
{
|
|
PyUNO_iterator* self = PyObject_New( PyUNO_iterator, &PyUNO_iterator_Type );
|
|
if ( self == nullptr )
|
|
return nullptr; // == error
|
|
self->members = new PyUNO_iterator_Internals;
|
|
self->members->xEnumeration = xEnumeration;
|
|
return reinterpret_cast<PyObject*>(self);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
static void PyUNO_list_iterator_del( PyObject* self )
|
|
{
|
|
PyUNO_list_iterator* me = reinterpret_cast<PyUNO_list_iterator*>(self);
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
delete me->members;
|
|
}
|
|
PyObject_Del( self );
|
|
}
|
|
|
|
|
|
static PyObject* PyUNO_list_iterator_next( PyObject *self )
|
|
{
|
|
PyUNO_list_iterator* me = reinterpret_cast<PyUNO_list_iterator*>(self);
|
|
|
|
Runtime runtime;
|
|
Any aRet;
|
|
bool noMoreElements = false;
|
|
|
|
try
|
|
{
|
|
{
|
|
PyThreadDetach antiguard;
|
|
try {
|
|
aRet = me->members->xIndexAccess->getByIndex( me->members->index );
|
|
}
|
|
catch( css::lang::IndexOutOfBoundsException )
|
|
{
|
|
noMoreElements = true;
|
|
}
|
|
}
|
|
|
|
if ( noMoreElements )
|
|
{
|
|
PyErr_SetString( PyExc_StopIteration, "" );
|
|
return nullptr;
|
|
}
|
|
|
|
PyRef rRet = runtime.any2PyObject( aRet );
|
|
me->members->index++;
|
|
return rRet.getAcquired();
|
|
}
|
|
catch( css::script::CannotConvertException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( css::lang::IllegalArgumentException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( const css::lang::WrappedTargetException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
catch( const css::uno::RuntimeException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::makeAny( e ) );
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
|
|
static PyTypeObject PyUNO_list_iterator_Type =
|
|
{
|
|
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
|
|
"PyUNO_iterator",
|
|
sizeof (PyUNO_list_iterator),
|
|
0,
|
|
PyUNO_list_iterator_del,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
Py_TPFLAGS_HAVE_ITER,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
PyUNO_iterator_iter, // Generic, reused between the iterator types
|
|
PyUNO_list_iterator_next,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0
|
|
#if PY_VERSION_HEX >= 0x03040000
|
|
, nullptr
|
|
#endif
|
|
};
|
|
|
|
PyObject* PyUNO_list_iterator_new( const Reference<XIndexAccess> &xIndexAccess )
|
|
{
|
|
PyUNO_list_iterator* self = PyObject_New( PyUNO_list_iterator, &PyUNO_list_iterator_Type );
|
|
if ( self == nullptr )
|
|
return nullptr; // == error
|
|
self->members = new PyUNO_list_iterator_Internals;
|
|
self->members->xIndexAccess = xIndexAccess;
|
|
self->members->index = 0;
|
|
return reinterpret_cast<PyObject*>(self);
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|