Commit Graph

456 Commits

Author SHA1 Message Date
Stephan Bergmann
07d3807e99 codemaker: sal_Bool -> bool
Change-Id: I2cacac2aa7e48b3b9d8d060137d5c6d6f1d06b3f
2014-02-17 17:55:17 +01:00
Norbert Thiebaud
2c8193137a coverity#707676 : Uninitialized scalar field
Change-Id: I546c3f497dc98c88a0d678622c20cced387a4ab2
2014-02-01 00:10:27 -06:00
Stephan Bergmann
9e77c2fb7c Remove UNOIDL "array" and "union" vaporware remnants
...and deprecate what cannot be removed for compatibility.

Change-Id: I1ea335af775b867b468b8285113631167729a92a
2014-01-31 10:15:47 +01:00
Matúš Kukan
fb92c8d6a4 copy&paste typo
Change-Id: I528a6a747e88fe2a4b4abfd9372daddf4e8aa502
2014-01-28 19:47:27 +01:00
Matúš Kukan
3774a6fd94 Support direct ctor calls for singletons too.
Change-Id: I6db797c950b8222b3ad95faff86adf5e7b41ff4b
2014-01-28 18:52:21 +01:00
Caolán McNamara
f5bcc7d91c coverity#440030 Logically dead code
Change-Id: I77428c6cf1f79dcc0e2c5e1d52f9b4b8c88130e3
2014-01-28 11:29:15 +00:00
Caolán McNamara
d09c534c98 coverity#440029 Logically dead code
Change-Id: Id071c8658b473b9d393a32e1da2c2474bb7361d3
2014-01-28 11:29:15 +00:00
Caolán McNamara
8bb41c67f0 coverity#1019407 Uninitialized scalar field
Change-Id: Icaa2062b00e0a68486bcbbc4a26b4089016bf2c8
2014-01-27 15:23:17 +00:00
Caolán McNamara
9f030d43ef coverity#1019406 Uninitialized scalar field
Change-Id: I9f5d48c5c5c0f76aa3386cfedcaf43ced162e4b0
2014-01-27 15:23:17 +00:00
Jan Holesovsky
68ba6ddef5 codemaker: Allow compiler to share these generated strings.
There is really no need to see tons of

component context fails to supply service <something long> of type <something else long>:

and

component context fails to supply service <something long> of type <something else long>

in the binary ;-) - let's split the strings to parts that the linker can
share easily.

Change-Id: I07f149a587c05985045028c3b6530c6efd081ff5
2014-01-27 11:41:15 +01:00
Matúš Kukan
22832569e1 Do not acquire again in direct constructor function calls.
Missing in c2c530da69 "Introduce static
inline cppu::acquire(), and make use of that."

Change-Id: I4a856eeaff1fce3f429c62c1897fe3898371d1ec
2014-01-23 11:41:29 +01:00
Jan Holesovsky
306efefe22 Minimize the constructor functions to a bare minimum.
Most of the constructors are supposed to be only a call of

  new TheInstance(arguments)

or an equivalent; so let's just change the constructor caller accordingly, to
accept unacquired new instance.

If there are exceptions that need to do more heavy lifting, they do not have
to use the constructor feature, or there can be a wrapper for the real
implementation, doing the additional work in their (C++) constructor.

Change-Id: I035c378778aeda60d15af4e56ca3761c586d5ded
2014-01-20 17:37:40 +01:00
Matúš Kukan
2dc9f1791a Fix declaration for ctor functions in generated headers.
Change-Id: I329ff80da68c629d7a82921253c4412563743b34
2014-01-20 09:27:20 +01:00
Matúš Kukan
a0ada918c1 Initialize also implementations created directly by generated function.
This was forgotten in commit bdeb57c239.

Change-Id: Idd339222e3c464abc2524f78f16c8fe0a02dcd5b
2014-01-18 17:02:35 +01:00
Stephan Bergmann
8471b35688 Be explicit when using bool as integral value
Change-Id: I22ee35d8c26ac119b35ba6c85c06199539b0c9d7
2014-01-10 17:11:43 +01:00
Stephan Bergmann
d320760dc1 codemaker: fix^2 invalid string index access
...originally the past-the-end checks in destination where always true, and thus
happend to work as intended for empty destionation, but
614e04019a broke that, so calling cppumaker w/o
-O was broken now.

Change-Id: I8d41dfe8d4c12e4a73a9782d4d5e7c9fa4d9df81
2014-01-10 10:16:48 +01:00
Stephan Bergmann
e500b25b08 ...and support direct calls of non-default ctors, too
Change-Id: I507a5664e642c75f6e9e9fe0c95c97ea76a8e5b3
2013-12-19 16:54:36 +01:00
Stephan Bergmann
15abebbde5 WIP: Direct service ctor calls at least on Android/iOS
Change-Id: I8a1907bc4b8f2134efb15d38a0fb5176b4384317
2013-12-19 14:42:10 +01:00
Caolán McNamara
944a086d92 if there is one typo, its guaranteed to duplicated somewhere
Change-Id: Ia81069afa47fa5790b973247c68bead7de87d718
2013-12-17 10:26:21 +00:00
Michael Stahl
614e04019a codemaker: fix invalid string index access
Change-Id: Icca819484e751864d146a893fe78e8ef2c36363b
2013-11-07 01:34:33 +01:00
Noel Grandin
0e6a2601b3 Convert code that calls OUString::getStr()[] to use the [] operator
This also means that this code now gets bounds checked in debug builds.

Change-Id: Id777f85eaee6a737bbcb84625e6e110abe0e0f27
2013-11-04 08:06:10 +02:00
Noel Grandin
e2451bd729 Convert indexOf->startsWith and lastIndexOf->endsWith
This is both an optimisation and a cleanup.

This converts code like
   aStr.indexOf("XX") == 0
to
  aStr.startsWith("XX")
and converts code like
  aStr.lastIndexOf("XXX") == aStr.getLength() - 3
to
  aStr.endsWith("XXX")

Note that in general
  aStr.lastIndexOf("X") == aStr.getLength() - 1
converts to
  aStr.isEmpty() || aStr.endsWith("X")
so I used the surrounding context to determine if aStr could be empty
when modifying the code.

Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
2013-10-31 08:34:21 +02:00
Stephan Bergmann
0bc89aac4c cppumaker: Allow UNO interface functions to throw std::exception
...so that exceptions like std::bad_alloc need not be treated in C++
implementations of UNO interfaces to not cause std::unexpected.  Of course, this
requires implementations to be adapted and actually mention std::exception in
their exception specifications.

Change-Id: Ie7f91e7ca47d8a81e3d0ba817e65d83c7823af75
2013-10-20 16:10:53 +02:00
Stephan Bergmann
eb37196aa7 Some more cppumaker "css" clean-up
...hopefully, all generated headers that use css (indirectly) include sal/types.h

Change-Id: Iaa40fa014d54b57b395eafda8b4f35ca395d55b0
2013-10-20 16:10:53 +02:00
Noel Grandin
44b96b1d76 fdo#70285 cleanup generated C++ code
Change-Id: Ic43628de53c5139ef43bb48723fb1e0788af1cd1
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-20 16:10:53 +02:00
Stephan Bergmann
254f59f623 rhbz#1014010: Missing dependencies in isBootstrapType list
...the list has been fixed now by copying its elements into an ENTRIES file and
running "unoidl-write udkapi/ @ENTITIES TEMP && unoidl-read TEMP >/dev/null" and
adding any reported unknown entities until it succeeds.

However, the updated list lead to deadlock when css.reflection.ParamInfo UnoType
resolves css.reflection.XIdlClass UnoType resolves css.reflection.XIdlMethod
UnoType resolves css.reflection.ParamInfo UnoType, so broke the circle by no
longer resolving the interface methods' return and parameter types in
InterfaceType::dumpMethodsCppuDecl (which is why those type infos are only
generated on demand anyway; looks like this had been a careless thinko in the
generation of comprehensive type info that had remained unnoticed all the time).

Change-Id: I50ef2fde16242298e055c6fa5971e70fad1a2b68
2013-10-01 14:44:44 +02:00
Stephan Bergmann
04a002491b Fail for unkonwn entities
Change-Id: I13d668e92ea762e9888f8c1c4615eccad6a1ff1b
2013-09-17 06:55:41 +02:00
Stephan Bergmann
a80fb45fe4 Revert "WIP: add cppumaker -U to directly read from .idl files"
This reverts commit c4113906d7, which is not
necessary after all with recent "Hook SourceProvider into unoidl::loadProvider."
2013-09-16 13:29:49 +02:00
Stephan Bergmann
c4113906d7 WIP: add cppumaker -U to directly read from .idl files
Change-Id: I420847515b6b691ae81a249a8820cf9a3d132372
2013-09-12 17:45:12 +02:00
Stephan Bergmann
54dd4ae0dd Add cppumaker -nD "no dependent types are generated"
...just like javamaker.

Change-Id: I7634a65a948ca7abdb7ad75d0aeca8becb38ab87
2013-09-12 15:28:11 +02:00
Stephan Bergmann
4b0a692668 Stray space at end of usage text line
Change-Id: I886c543d9de63595a9183f4e5f108f08b2ba25ef
2013-09-10 15:48:03 +02:00
Stephan Bergmann
2618ff4734 UNO interface UIKs are unused for a very long time
...so mark them as @deprecated more thoroughly and always force them to zero.

Change-Id: I5db2dab924fc5a4145a0e5dd055b654985ce2ef9
2013-09-04 14:37:54 +02:00
Stephan Bergmann
ea7ce8cf08 Write integers as signed sal_Int32
...this was a regression introduced with
64b993e046 "finish deprecation of
O(U)String::valueOf()" and it caused e.g. the value -0x100 of the enum member
css.i18n.TranliterationModules.IGNORE_MASK to be written as 4294967040 rather
than as -256.  (Though the relevant code is dead ugly, for sure.)

Change-Id: Icb3d3365135bc2a07e438317b70abdf9d74d6d7a
2013-09-03 11:04:28 +02:00
Luboš Luňák
64b993e046 finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.

Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-21 15:10:35 +02:00
Jelle van der Waa
2f731e7a19 fdo#43460 startmath,codemaker: use isEmpty()
Change-Id: I55d3f4546f40a321ebf4b08db33536592f451944
Reviewed-on: https://gerrit.libreoffice.org/4318
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
2013-06-17 19:34:45 +00:00
Mark Wielaard
e39e9e4cd8 Source files shouldn't have executable bit set.
Change-Id: Iafad6249a7998d7c749c1ca2979a606078cfcb5e
Reviewed-on: https://gerrit.libreoffice.org/4070
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-28 12:09:27 +00:00
Stephan Bergmann
a1dff2901e Support for annotations in the new UNOIDL format
...used for now to transport @deprecated information.

Also, improve Idx-String (formerly Idx-Name, but also used for UTF-8 annotations
now) format, using the 0x80000000 for the indirection rather than the base case.
(And the README erroneously used "Offset of" Idx-String all over the place.)

Change-Id: I7003b1558ab536a11a9af308f9b16a7ef8840792
2013-05-16 16:12:45 +02:00
Tor Lillqvist
cb6d67c21f Spelling "separate" (etc) correctly is hard 2013-05-15 11:14:28 +03:00
Julien Nabet
53d7ae8c6b cppcheck: unusedVariable (parameters)
Change-Id: I0a7f230cb7e36857079de20a535cd883e30fd46f
2013-05-12 22:53:28 +02:00
Stephan Bergmann
bab43b23d5 Allow for (relative) pathname args for codemakers again
Change-Id: I503d88b7d6fc44ef70d5071fddcec465e3fba856
2013-04-24 12:42:01 +02:00
Stephan Bergmann
048e591819 Further codemaker, unodevtools clean-up
...getting rid of now dangling references to module registry.

Change-Id: Iccad7ff5dc0e79bf91b7b7dae03b73f16adeb121
2013-04-16 17:38:44 +02:00
Tor Lillqvist
6127d765e3 WaE: unused function 'checkNoTypeArguments'
Change-Id: I112e6ac263bb673b5ad553742d3fa77af50bdf03
2013-04-16 15:51:03 +03:00
Stephan Bergmann
30a7c6ba6b WIP: Experimental new binary type.rdb format
Make uno-skeletonmaker work on top of unoidl/ instead of registry/.

These changes have only been tested so far rather lightly.  Basic
uno-skeletonmaker still works, but more thorough testing of the various input
flags is needed.

Change-Id: Id7f3aee863a10f8c649325db2d6f34a4057f70ff
2013-04-16 13:52:29 +02:00
Stephan Bergmann
4b73d334a9 Further adapt CppuType::dumpCppuGetType to using unoidl/ instead of registry/
Change-Id: Ib46d7b8934f63d88ea953707fa1fbfb51c524efd
2013-04-15 10:38:33 +02:00
Stephan Bergmann
0557453a35 Combine getSortResolve...() into one decompose()
Change-Id: Ie1c1311d1df14d5639b7642d2b9a1588605c31fc
2013-04-12 15:22:11 +02:00
Stephan Bergmann
fc02ae8f82 [API CHANGE] WIP: Experimental new binary type.rdb format
Make javamaker work on top of unoidl/ instead of registry/.

API CHANGE: javamaker no longer supports the -B switch, as that is meaningless
with the new format.  When reading from an old-format .rdb file, /UCR is hard-
coded as the prefix now.

Change-Id: I8cca39f8ebacd0476934f7bd493d206928d063a9
2013-04-11 09:29:44 +02:00
Stephan Bergmann
358b60b3b1 Minor terminology clean-up
Change-Id: I4fa4431978f049a7b5b201d89743f909bc120ff4
2013-04-11 09:29:44 +02:00
Tor Lillqvist
f0aecebe20 WaE: unused variable
Change-Id: I64ac7b45722e4147091068e71e9ceedea3d73010
2013-04-09 13:17:37 +03:00
Stephan Bergmann
02a8e8acd1 [API CHANGE] WIP: Experimental new binary type.rdb format
Make cppumaker work on top of unoidl/ instead of registry/, as a first step to
change all the various codemakers.

* API CHANGE: cppumaker no longer supports the -B switch, as that is meaningless
  with the new format.  When reading from an old-format .rdb file, /UCR is
  hard-coded as the prefix now.

* TODO: The new format does not yet support deprecation annotations, so the
  generated .hdl/.hpp files lack any SAL_DEPRECATED_INTERNALs for now.

* codemaker/typemanager.hxx is extended with access to unoidl/ functionality, so
  the various codemakers can use registry/ and unoidl/ in parallel for now.
  The access to registry/ functionality will be removed.  (Added small throwaway
  helper functions u2b/b2u to easily map between OString and OUString at the
  remaining seams for now.)

* Includes a selective revert of ba044b1e96
  "remove needless forward rtl::OUString declarations" in those parts of
  codemaker, unodevtools, unoidl that were covered by this local
  work-in-progress patch; I would otherwise have hard a hard time re-applying
  it.

* The generated .hdl/.hpp files are mostly unchanged, except for a few minor
  things:

** Any SAL_DEPRECATED_INTERNALs are missing (see above).

** In comprehensive getCppuType definitions, some members were erroneously
   classified as TypeCalss_UNKNOWN.

** In comprehensive getCppuType definitions, some unnecessary calls like

     ::cppu::UnoType< ::sal_Int32 >::get();

   can be removed.

** For typedef sequence<X>, the .hdl file need not include X.hdl, but only needs
   to forward-declare it.

** Unnecessary includes for optional bases of interfaces can be removed.

** Some numbering of local variable names (sMethodName1, ...) has changed.

Change-Id: Icad98f248ac15177337f1b4ab709a755a8af6238
2013-04-09 09:44:33 +02:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00