Merge with default feature/update-test-suite
authorArturo <arturo@pep-project.org>
Tue, 29 Nov 2016 12:02:29 +0100
branchfeature/update-test-suite
changeset 259a226b9d37e51
parent 258 d7315f2677c8
parent 256 b264893d3878
child 260 253e38faee5e
Merge with default
     1.1 --- a/LICENSE.txt	Tue Nov 29 11:49:18 2016 +0100
     1.2 +++ b/LICENSE.txt	Tue Nov 29 12:02:29 2016 +0100
     1.3 @@ -1,674 +1,661 @@
     1.4 -                    GNU GENERAL PUBLIC LICENSE
     1.5 -                       Version 3, 29 June 2007
     1.6 -
     1.7 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
     1.8 - Everyone is permitted to copy and distribute verbatim copies
     1.9 - of this license document, but changing it is not allowed.
    1.10 -
    1.11 -                            Preamble
    1.12 -
    1.13 -  The GNU General Public License is a free, copyleft license for
    1.14 -software and other kinds of works.
    1.15 -
    1.16 -  The licenses for most software and other practical works are designed
    1.17 -to take away your freedom to share and change the works.  By contrast,
    1.18 -the GNU General Public License is intended to guarantee your freedom to
    1.19 -share and change all versions of a program--to make sure it remains free
    1.20 -software for all its users.  We, the Free Software Foundation, use the
    1.21 -GNU General Public License for most of our software; it applies also to
    1.22 -any other work released this way by its authors.  You can apply it to
    1.23 -your programs, too.
    1.24 -
    1.25 -  When we speak of free software, we are referring to freedom, not
    1.26 -price.  Our General Public Licenses are designed to make sure that you
    1.27 -have the freedom to distribute copies of free software (and charge for
    1.28 -them if you wish), that you receive source code or can get it if you
    1.29 -want it, that you can change the software or use pieces of it in new
    1.30 -free programs, and that you know you can do these things.
    1.31 -
    1.32 -  To protect your rights, we need to prevent others from denying you
    1.33 -these rights or asking you to surrender the rights.  Therefore, you have
    1.34 -certain responsibilities if you distribute copies of the software, or if
    1.35 -you modify it: responsibilities to respect the freedom of others.
    1.36 -
    1.37 -  For example, if you distribute copies of such a program, whether
    1.38 -gratis or for a fee, you must pass on to the recipients the same
    1.39 -freedoms that you received.  You must make sure that they, too, receive
    1.40 -or can get the source code.  And you must show them these terms so they
    1.41 -know their rights.
    1.42 -
    1.43 -  Developers that use the GNU GPL protect your rights with two steps:
    1.44 -(1) assert copyright on the software, and (2) offer you this License
    1.45 -giving you legal permission to copy, distribute and/or modify it.
    1.46 -
    1.47 -  For the developers' and authors' protection, the GPL clearly explains
    1.48 -that there is no warranty for this free software.  For both users' and
    1.49 -authors' sake, the GPL requires that modified versions be marked as
    1.50 -changed, so that their problems will not be attributed erroneously to
    1.51 -authors of previous versions.
    1.52 -
    1.53 -  Some devices are designed to deny users access to install or run
    1.54 -modified versions of the software inside them, although the manufacturer
    1.55 -can do so.  This is fundamentally incompatible with the aim of
    1.56 -protecting users' freedom to change the software.  The systematic
    1.57 -pattern of such abuse occurs in the area of products for individuals to
    1.58 -use, which is precisely where it is most unacceptable.  Therefore, we
    1.59 -have designed this version of the GPL to prohibit the practice for those
    1.60 -products.  If such problems arise substantially in other domains, we
    1.61 -stand ready to extend this provision to those domains in future versions
    1.62 -of the GPL, as needed to protect the freedom of users.
    1.63 -
    1.64 -  Finally, every program is threatened constantly by software patents.
    1.65 -States should not allow patents to restrict development and use of
    1.66 -software on general-purpose computers, but in those that do, we wish to
    1.67 -avoid the special danger that patents applied to a free program could
    1.68 -make it effectively proprietary.  To prevent this, the GPL assures that
    1.69 -patents cannot be used to render the program non-free.
    1.70 -
    1.71 -  The precise terms and conditions for copying, distribution and
    1.72 -modification follow.
    1.73 -
    1.74 -                       TERMS AND CONDITIONS
    1.75 -
    1.76 -  0. Definitions.
    1.77 -
    1.78 -  "This License" refers to version 3 of the GNU General Public License.
    1.79 -
    1.80 -  "Copyright" also means copyright-like laws that apply to other kinds of
    1.81 -works, such as semiconductor masks.
    1.82 -
    1.83 -  "The Program" refers to any copyrightable work licensed under this
    1.84 -License.  Each licensee is addressed as "you".  "Licensees" and
    1.85 -"recipients" may be individuals or organizations.
    1.86 -
    1.87 -  To "modify" a work means to copy from or adapt all or part of the work
    1.88 -in a fashion requiring copyright permission, other than the making of an
    1.89 -exact copy.  The resulting work is called a "modified version" of the
    1.90 -earlier work or a work "based on" the earlier work.
    1.91 -
    1.92 -  A "covered work" means either the unmodified Program or a work based
    1.93 -on the Program.
    1.94 -
    1.95 -  To "propagate" a work means to do anything with it that, without
    1.96 -permission, would make you directly or secondarily liable for
    1.97 -infringement under applicable copyright law, except executing it on a
    1.98 -computer or modifying a private copy.  Propagation includes copying,
    1.99 -distribution (with or without modification), making available to the
   1.100 -public, and in some countries other activities as well.
   1.101 -
   1.102 -  To "convey" a work means any kind of propagation that enables other
   1.103 -parties to make or receive copies.  Mere interaction with a user through
   1.104 -a computer network, with no transfer of a copy, is not conveying.
   1.105 -
   1.106 -  An interactive user interface displays "Appropriate Legal Notices"
   1.107 -to the extent that it includes a convenient and prominently visible
   1.108 -feature that (1) displays an appropriate copyright notice, and (2)
   1.109 -tells the user that there is no warranty for the work (except to the
   1.110 -extent that warranties are provided), that licensees may convey the
   1.111 -work under this License, and how to view a copy of this License.  If
   1.112 -the interface presents a list of user commands or options, such as a
   1.113 -menu, a prominent item in the list meets this criterion.
   1.114 -
   1.115 -  1. Source Code.
   1.116 -
   1.117 -  The "source code" for a work means the preferred form of the work
   1.118 -for making modifications to it.  "Object code" means any non-source
   1.119 -form of a work.
   1.120 -
   1.121 -  A "Standard Interface" means an interface that either is an official
   1.122 -standard defined by a recognized standards body, or, in the case of
   1.123 -interfaces specified for a particular programming language, one that
   1.124 -is widely used among developers working in that language.
   1.125 -
   1.126 -  The "System Libraries" of an executable work include anything, other
   1.127 -than the work as a whole, that (a) is included in the normal form of
   1.128 -packaging a Major Component, but which is not part of that Major
   1.129 -Component, and (b) serves only to enable use of the work with that
   1.130 -Major Component, or to implement a Standard Interface for which an
   1.131 -implementation is available to the public in source code form.  A
   1.132 -"Major Component", in this context, means a major essential component
   1.133 -(kernel, window system, and so on) of the specific operating system
   1.134 -(if any) on which the executable work runs, or a compiler used to
   1.135 -produce the work, or an object code interpreter used to run it.
   1.136 -
   1.137 -  The "Corresponding Source" for a work in object code form means all
   1.138 -the source code needed to generate, install, and (for an executable
   1.139 -work) run the object code and to modify the work, including scripts to
   1.140 -control those activities.  However, it does not include the work's
   1.141 -System Libraries, or general-purpose tools or generally available free
   1.142 -programs which are used unmodified in performing those activities but
   1.143 -which are not part of the work.  For example, Corresponding Source
   1.144 -includes interface definition files associated with source files for
   1.145 -the work, and the source code for shared libraries and dynamically
   1.146 -linked subprograms that the work is specifically designed to require,
   1.147 -such as by intimate data communication or control flow between those
   1.148 -subprograms and other parts of the work.
   1.149 -
   1.150 -  The Corresponding Source need not include anything that users
   1.151 -can regenerate automatically from other parts of the Corresponding
   1.152 -Source.
   1.153 -
   1.154 -  The Corresponding Source for a work in source code form is that
   1.155 -same work.
   1.156 -
   1.157 -  2. Basic Permissions.
   1.158 -
   1.159 -  All rights granted under this License are granted for the term of
   1.160 -copyright on the Program, and are irrevocable provided the stated
   1.161 -conditions are met.  This License explicitly affirms your unlimited
   1.162 -permission to run the unmodified Program.  The output from running a
   1.163 -covered work is covered by this License only if the output, given its
   1.164 -content, constitutes a covered work.  This License acknowledges your
   1.165 -rights of fair use or other equivalent, as provided by copyright law.
   1.166 -
   1.167 -  You may make, run and propagate covered works that you do not
   1.168 -convey, without conditions so long as your license otherwise remains
   1.169 -in force.  You may convey covered works to others for the sole purpose
   1.170 -of having them make modifications exclusively for you, or provide you
   1.171 -with facilities for running those works, provided that you comply with
   1.172 -the terms of this License in conveying all material for which you do
   1.173 -not control copyright.  Those thus making or running the covered works
   1.174 -for you must do so exclusively on your behalf, under your direction
   1.175 -and control, on terms that prohibit them from making any copies of
   1.176 -your copyrighted material outside their relationship with you.
   1.177 -
   1.178 -  Conveying under any other circumstances is permitted solely under
   1.179 -the conditions stated below.  Sublicensing is not allowed; section 10
   1.180 -makes it unnecessary.
   1.181 -
   1.182 -  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
   1.183 -
   1.184 -  No covered work shall be deemed part of an effective technological
   1.185 -measure under any applicable law fulfilling obligations under article
   1.186 -11 of the WIPO copyright treaty adopted on 20 December 1996, or
   1.187 -similar laws prohibiting or restricting circumvention of such
   1.188 -measures.
   1.189 -
   1.190 -  When you convey a covered work, you waive any legal power to forbid
   1.191 -circumvention of technological measures to the extent such circumvention
   1.192 -is effected by exercising rights under this License with respect to
   1.193 -the covered work, and you disclaim any intention to limit operation or
   1.194 -modification of the work as a means of enforcing, against the work's
   1.195 -users, your or third parties' legal rights to forbid circumvention of
   1.196 -technological measures.
   1.197 -
   1.198 -  4. Conveying Verbatim Copies.
   1.199 -
   1.200 -  You may convey verbatim copies of the Program's source code as you
   1.201 -receive it, in any medium, provided that you conspicuously and
   1.202 -appropriately publish on each copy an appropriate copyright notice;
   1.203 -keep intact all notices stating that this License and any
   1.204 -non-permissive terms added in accord with section 7 apply to the code;
   1.205 -keep intact all notices of the absence of any warranty; and give all
   1.206 -recipients a copy of this License along with the Program.
   1.207 -
   1.208 -  You may charge any price or no price for each copy that you convey,
   1.209 -and you may offer support or warranty protection for a fee.
   1.210 -
   1.211 -  5. Conveying Modified Source Versions.
   1.212 -
   1.213 -  You may convey a work based on the Program, or the modifications to
   1.214 -produce it from the Program, in the form of source code under the
   1.215 -terms of section 4, provided that you also meet all of these conditions:
   1.216 -
   1.217 -    a) The work must carry prominent notices stating that you modified
   1.218 -    it, and giving a relevant date.
   1.219 -
   1.220 -    b) The work must carry prominent notices stating that it is
   1.221 -    released under this License and any conditions added under section
   1.222 -    7.  This requirement modifies the requirement in section 4 to
   1.223 -    "keep intact all notices".
   1.224 -
   1.225 -    c) You must license the entire work, as a whole, under this
   1.226 -    License to anyone who comes into possession of a copy.  This
   1.227 -    License will therefore apply, along with any applicable section 7
   1.228 -    additional terms, to the whole of the work, and all its parts,
   1.229 -    regardless of how they are packaged.  This License gives no
   1.230 -    permission to license the work in any other way, but it does not
   1.231 -    invalidate such permission if you have separately received it.
   1.232 -
   1.233 -    d) If the work has interactive user interfaces, each must display
   1.234 -    Appropriate Legal Notices; however, if the Program has interactive
   1.235 -    interfaces that do not display Appropriate Legal Notices, your
   1.236 -    work need not make them do so.
   1.237 -
   1.238 -  A compilation of a covered work with other separate and independent
   1.239 -works, which are not by their nature extensions of the covered work,
   1.240 -and which are not combined with it such as to form a larger program,
   1.241 -in or on a volume of a storage or distribution medium, is called an
   1.242 -"aggregate" if the compilation and its resulting copyright are not
   1.243 -used to limit the access or legal rights of the compilation's users
   1.244 -beyond what the individual works permit.  Inclusion of a covered work
   1.245 -in an aggregate does not cause this License to apply to the other
   1.246 -parts of the aggregate.
   1.247 -
   1.248 -  6. Conveying Non-Source Forms.
   1.249 -
   1.250 -  You may convey a covered work in object code form under the terms
   1.251 -of sections 4 and 5, provided that you also convey the
   1.252 -machine-readable Corresponding Source under the terms of this License,
   1.253 -in one of these ways:
   1.254 -
   1.255 -    a) Convey the object code in, or embodied in, a physical product
   1.256 -    (including a physical distribution medium), accompanied by the
   1.257 -    Corresponding Source fixed on a durable physical medium
   1.258 -    customarily used for software interchange.
   1.259 -
   1.260 -    b) Convey the object code in, or embodied in, a physical product
   1.261 -    (including a physical distribution medium), accompanied by a
   1.262 -    written offer, valid for at least three years and valid for as
   1.263 -    long as you offer spare parts or customer support for that product
   1.264 -    model, to give anyone who possesses the object code either (1) a
   1.265 -    copy of the Corresponding Source for all the software in the
   1.266 -    product that is covered by this License, on a durable physical
   1.267 -    medium customarily used for software interchange, for a price no
   1.268 -    more than your reasonable cost of physically performing this
   1.269 -    conveying of source, or (2) access to copy the
   1.270 -    Corresponding Source from a network server at no charge.
   1.271 -
   1.272 -    c) Convey individual copies of the object code with a copy of the
   1.273 -    written offer to provide the Corresponding Source.  This
   1.274 -    alternative is allowed only occasionally and noncommercially, and
   1.275 -    only if you received the object code with such an offer, in accord
   1.276 -    with subsection 6b.
   1.277 -
   1.278 -    d) Convey the object code by offering access from a designated
   1.279 -    place (gratis or for a charge), and offer equivalent access to the
   1.280 -    Corresponding Source in the same way through the same place at no
   1.281 -    further charge.  You need not require recipients to copy the
   1.282 -    Corresponding Source along with the object code.  If the place to
   1.283 -    copy the object code is a network server, the Corresponding Source
   1.284 -    may be on a different server (operated by you or a third party)
   1.285 -    that supports equivalent copying facilities, provided you maintain
   1.286 -    clear directions next to the object code saying where to find the
   1.287 -    Corresponding Source.  Regardless of what server hosts the
   1.288 -    Corresponding Source, you remain obligated to ensure that it is
   1.289 -    available for as long as needed to satisfy these requirements.
   1.290 -
   1.291 -    e) Convey the object code using peer-to-peer transmission, provided
   1.292 -    you inform other peers where the object code and Corresponding
   1.293 -    Source of the work are being offered to the general public at no
   1.294 -    charge under subsection 6d.
   1.295 -
   1.296 -  A separable portion of the object code, whose source code is excluded
   1.297 -from the Corresponding Source as a System Library, need not be
   1.298 -included in conveying the object code work.
   1.299 -
   1.300 -  A "User Product" is either (1) a "consumer product", which means any
   1.301 -tangible personal property which is normally used for personal, family,
   1.302 -or household purposes, or (2) anything designed or sold for incorporation
   1.303 -into a dwelling.  In determining whether a product is a consumer product,
   1.304 -doubtful cases shall be resolved in favor of coverage.  For a particular
   1.305 -product received by a particular user, "normally used" refers to a
   1.306 -typical or common use of that class of product, regardless of the status
   1.307 -of the particular user or of the way in which the particular user
   1.308 -actually uses, or expects or is expected to use, the product.  A product
   1.309 -is a consumer product regardless of whether the product has substantial
   1.310 -commercial, industrial or non-consumer uses, unless such uses represent
   1.311 -the only significant mode of use of the product.
   1.312 -
   1.313 -  "Installation Information" for a User Product means any methods,
   1.314 -procedures, authorization keys, or other information required to install
   1.315 -and execute modified versions of a covered work in that User Product from
   1.316 -a modified version of its Corresponding Source.  The information must
   1.317 -suffice to ensure that the continued functioning of the modified object
   1.318 -code is in no case prevented or interfered with solely because
   1.319 -modification has been made.
   1.320 -
   1.321 -  If you convey an object code work under this section in, or with, or
   1.322 -specifically for use in, a User Product, and the conveying occurs as
   1.323 -part of a transaction in which the right of possession and use of the
   1.324 -User Product is transferred to the recipient in perpetuity or for a
   1.325 -fixed term (regardless of how the transaction is characterized), the
   1.326 -Corresponding Source conveyed under this section must be accompanied
   1.327 -by the Installation Information.  But this requirement does not apply
   1.328 -if neither you nor any third party retains the ability to install
   1.329 -modified object code on the User Product (for example, the work has
   1.330 -been installed in ROM).
   1.331 -
   1.332 -  The requirement to provide Installation Information does not include a
   1.333 -requirement to continue to provide support service, warranty, or updates
   1.334 -for a work that has been modified or installed by the recipient, or for
   1.335 -the User Product in which it has been modified or installed.  Access to a
   1.336 -network may be denied when the modification itself materially and
   1.337 -adversely affects the operation of the network or violates the rules and
   1.338 -protocols for communication across the network.
   1.339 -
   1.340 -  Corresponding Source conveyed, and Installation Information provided,
   1.341 -in accord with this section must be in a format that is publicly
   1.342 -documented (and with an implementation available to the public in
   1.343 -source code form), and must require no special password or key for
   1.344 -unpacking, reading or copying.
   1.345 -
   1.346 -  7. Additional Terms.
   1.347 -
   1.348 -  "Additional permissions" are terms that supplement the terms of this
   1.349 -License by making exceptions from one or more of its conditions.
   1.350 -Additional permissions that are applicable to the entire Program shall
   1.351 -be treated as though they were included in this License, to the extent
   1.352 -that they are valid under applicable law.  If additional permissions
   1.353 -apply only to part of the Program, that part may be used separately
   1.354 -under those permissions, but the entire Program remains governed by
   1.355 -this License without regard to the additional permissions.
   1.356 -
   1.357 -  When you convey a copy of a covered work, you may at your option
   1.358 -remove any additional permissions from that copy, or from any part of
   1.359 -it.  (Additional permissions may be written to require their own
   1.360 -removal in certain cases when you modify the work.)  You may place
   1.361 -additional permissions on material, added by you to a covered work,
   1.362 -for which you have or can give appropriate copyright permission.
   1.363 -
   1.364 -  Notwithstanding any other provision of this License, for material you
   1.365 -add to a covered work, you may (if authorized by the copyright holders of
   1.366 -that material) supplement the terms of this License with terms:
   1.367 -
   1.368 -    a) Disclaiming warranty or limiting liability differently from the
   1.369 -    terms of sections 15 and 16 of this License; or
   1.370 -
   1.371 -    b) Requiring preservation of specified reasonable legal notices or
   1.372 -    author attributions in that material or in the Appropriate Legal
   1.373 -    Notices displayed by works containing it; or
   1.374 -
   1.375 -    c) Prohibiting misrepresentation of the origin of that material, or
   1.376 -    requiring that modified versions of such material be marked in
   1.377 -    reasonable ways as different from the original version; or
   1.378 -
   1.379 -    d) Limiting the use for publicity purposes of names of licensors or
   1.380 -    authors of the material; or
   1.381 -
   1.382 -    e) Declining to grant rights under trademark law for use of some
   1.383 -    trade names, trademarks, or service marks; or
   1.384 -
   1.385 -    f) Requiring indemnification of licensors and authors of that
   1.386 -    material by anyone who conveys the material (or modified versions of
   1.387 -    it) with contractual assumptions of liability to the recipient, for
   1.388 -    any liability that these contractual assumptions directly impose on
   1.389 -    those licensors and authors.
   1.390 -
   1.391 -  All other non-permissive additional terms are considered "further
   1.392 -restrictions" within the meaning of section 10.  If the Program as you
   1.393 -received it, or any part of it, contains a notice stating that it is
   1.394 -governed by this License along with a term that is a further
   1.395 -restriction, you may remove that term.  If a license document contains
   1.396 -a further restriction but permits relicensing or conveying under this
   1.397 -License, you may add to a covered work material governed by the terms
   1.398 -of that license document, provided that the further restriction does
   1.399 -not survive such relicensing or conveying.
   1.400 -
   1.401 -  If you add terms to a covered work in accord with this section, you
   1.402 -must place, in the relevant source files, a statement of the
   1.403 -additional terms that apply to those files, or a notice indicating
   1.404 -where to find the applicable terms.
   1.405 -
   1.406 -  Additional terms, permissive or non-permissive, may be stated in the
   1.407 -form of a separately written license, or stated as exceptions;
   1.408 -the above requirements apply either way.
   1.409 -
   1.410 -  8. Termination.
   1.411 -
   1.412 -  You may not propagate or modify a covered work except as expressly
   1.413 -provided under this License.  Any attempt otherwise to propagate or
   1.414 -modify it is void, and will automatically terminate your rights under
   1.415 -this License (including any patent licenses granted under the third
   1.416 -paragraph of section 11).
   1.417 -
   1.418 -  However, if you cease all violation of this License, then your
   1.419 -license from a particular copyright holder is reinstated (a)
   1.420 -provisionally, unless and until the copyright holder explicitly and
   1.421 -finally terminates your license, and (b) permanently, if the copyright
   1.422 -holder fails to notify you of the violation by some reasonable means
   1.423 -prior to 60 days after the cessation.
   1.424 -
   1.425 -  Moreover, your license from a particular copyright holder is
   1.426 -reinstated permanently if the copyright holder notifies you of the
   1.427 -violation by some reasonable means, this is the first time you have
   1.428 -received notice of violation of this License (for any work) from that
   1.429 -copyright holder, and you cure the violation prior to 30 days after
   1.430 -your receipt of the notice.
   1.431 -
   1.432 -  Termination of your rights under this section does not terminate the
   1.433 -licenses of parties who have received copies or rights from you under
   1.434 -this License.  If your rights have been terminated and not permanently
   1.435 -reinstated, you do not qualify to receive new licenses for the same
   1.436 -material under section 10.
   1.437 -
   1.438 -  9. Acceptance Not Required for Having Copies.
   1.439 -
   1.440 -  You are not required to accept this License in order to receive or
   1.441 -run a copy of the Program.  Ancillary propagation of a covered work
   1.442 -occurring solely as a consequence of using peer-to-peer transmission
   1.443 -to receive a copy likewise does not require acceptance.  However,
   1.444 -nothing other than this License grants you permission to propagate or
   1.445 -modify any covered work.  These actions infringe copyright if you do
   1.446 -not accept this License.  Therefore, by modifying or propagating a
   1.447 -covered work, you indicate your acceptance of this License to do so.
   1.448 -
   1.449 -  10. Automatic Licensing of Downstream Recipients.
   1.450 -
   1.451 -  Each time you convey a covered work, the recipient automatically
   1.452 -receives a license from the original licensors, to run, modify and
   1.453 -propagate that work, subject to this License.  You are not responsible
   1.454 -for enforcing compliance by third parties with this License.
   1.455 -
   1.456 -  An "entity transaction" is a transaction transferring control of an
   1.457 -organization, or substantially all assets of one, or subdividing an
   1.458 -organization, or merging organizations.  If propagation of a covered
   1.459 -work results from an entity transaction, each party to that
   1.460 -transaction who receives a copy of the work also receives whatever
   1.461 -licenses to the work the party's predecessor in interest had or could
   1.462 -give under the previous paragraph, plus a right to possession of the
   1.463 -Corresponding Source of the work from the predecessor in interest, if
   1.464 -the predecessor has it or can get it with reasonable efforts.
   1.465 -
   1.466 -  You may not impose any further restrictions on the exercise of the
   1.467 -rights granted or affirmed under this License.  For example, you may
   1.468 -not impose a license fee, royalty, or other charge for exercise of
   1.469 -rights granted under this License, and you may not initiate litigation
   1.470 -(including a cross-claim or counterclaim in a lawsuit) alleging that
   1.471 -any patent claim is infringed by making, using, selling, offering for
   1.472 -sale, or importing the Program or any portion of it.
   1.473 -
   1.474 -  11. Patents.
   1.475 -
   1.476 -  A "contributor" is a copyright holder who authorizes use under this
   1.477 -License of the Program or a work on which the Program is based.  The
   1.478 -work thus licensed is called the contributor's "contributor version".
   1.479 -
   1.480 -  A contributor's "essential patent claims" are all patent claims
   1.481 -owned or controlled by the contributor, whether already acquired or
   1.482 -hereafter acquired, that would be infringed by some manner, permitted
   1.483 -by this License, of making, using, or selling its contributor version,
   1.484 -but do not include claims that would be infringed only as a
   1.485 -consequence of further modification of the contributor version.  For
   1.486 -purposes of this definition, "control" includes the right to grant
   1.487 -patent sublicenses in a manner consistent with the requirements of
   1.488 -this License.
   1.489 -
   1.490 -  Each contributor grants you a non-exclusive, worldwide, royalty-free
   1.491 -patent license under the contributor's essential patent claims, to
   1.492 -make, use, sell, offer for sale, import and otherwise run, modify and
   1.493 -propagate the contents of its contributor version.
   1.494 -
   1.495 -  In the following three paragraphs, a "patent license" is any express
   1.496 -agreement or commitment, however denominated, not to enforce a patent
   1.497 -(such as an express permission to practice a patent or covenant not to
   1.498 -sue for patent infringement).  To "grant" such a patent license to a
   1.499 -party means to make such an agreement or commitment not to enforce a
   1.500 -patent against the party.
   1.501 -
   1.502 -  If you convey a covered work, knowingly relying on a patent license,
   1.503 -and the Corresponding Source of the work is not available for anyone
   1.504 -to copy, free of charge and under the terms of this License, through a
   1.505 -publicly available network server or other readily accessible means,
   1.506 -then you must either (1) cause the Corresponding Source to be so
   1.507 -available, or (2) arrange to deprive yourself of the benefit of the
   1.508 -patent license for this particular work, or (3) arrange, in a manner
   1.509 -consistent with the requirements of this License, to extend the patent
   1.510 -license to downstream recipients.  "Knowingly relying" means you have
   1.511 -actual knowledge that, but for the patent license, your conveying the
   1.512 -covered work in a country, or your recipient's use of the covered work
   1.513 -in a country, would infringe one or more identifiable patents in that
   1.514 -country that you have reason to believe are valid.
   1.515 -
   1.516 -  If, pursuant to or in connection with a single transaction or
   1.517 -arrangement, you convey, or propagate by procuring conveyance of, a
   1.518 -covered work, and grant a patent license to some of the parties
   1.519 -receiving the covered work authorizing them to use, propagate, modify
   1.520 -or convey a specific copy of the covered work, then the patent license
   1.521 -you grant is automatically extended to all recipients of the covered
   1.522 -work and works based on it.
   1.523 -
   1.524 -  A patent license is "discriminatory" if it does not include within
   1.525 -the scope of its coverage, prohibits the exercise of, or is
   1.526 -conditioned on the non-exercise of one or more of the rights that are
   1.527 -specifically granted under this License.  You may not convey a covered
   1.528 -work if you are a party to an arrangement with a third party that is
   1.529 -in the business of distributing software, under which you make payment
   1.530 -to the third party based on the extent of your activity of conveying
   1.531 -the work, and under which the third party grants, to any of the
   1.532 -parties who would receive the covered work from you, a discriminatory
   1.533 -patent license (a) in connection with copies of the covered work
   1.534 -conveyed by you (or copies made from those copies), or (b) primarily
   1.535 -for and in connection with specific products or compilations that
   1.536 -contain the covered work, unless you entered into that arrangement,
   1.537 -or that patent license was granted, prior to 28 March 2007.
   1.538 -
   1.539 -  Nothing in this License shall be construed as excluding or limiting
   1.540 -any implied license or other defenses to infringement that may
   1.541 -otherwise be available to you under applicable patent law.
   1.542 -
   1.543 -  12. No Surrender of Others' Freedom.
   1.544 -
   1.545 -  If conditions are imposed on you (whether by court order, agreement or
   1.546 -otherwise) that contradict the conditions of this License, they do not
   1.547 -excuse you from the conditions of this License.  If you cannot convey a
   1.548 -covered work so as to satisfy simultaneously your obligations under this
   1.549 -License and any other pertinent obligations, then as a consequence you may
   1.550 -not convey it at all.  For example, if you agree to terms that obligate you
   1.551 -to collect a royalty for further conveying from those to whom you convey
   1.552 -the Program, the only way you could satisfy both those terms and this
   1.553 -License would be to refrain entirely from conveying the Program.
   1.554 -
   1.555 -  13. Use with the GNU Affero General Public License.
   1.556 -
   1.557 -  Notwithstanding any other provision of this License, you have
   1.558 -permission to link or combine any covered work with a work licensed
   1.559 -under version 3 of the GNU Affero General Public License into a single
   1.560 -combined work, and to convey the resulting work.  The terms of this
   1.561 -License will continue to apply to the part which is the covered work,
   1.562 -but the special requirements of the GNU Affero General Public License,
   1.563 -section 13, concerning interaction through a network will apply to the
   1.564 -combination as such.
   1.565 -
   1.566 -  14. Revised Versions of this License.
   1.567 -
   1.568 -  The Free Software Foundation may publish revised and/or new versions of
   1.569 -the GNU General Public License from time to time.  Such new versions will
   1.570 -be similar in spirit to the present version, but may differ in detail to
   1.571 -address new problems or concerns.
   1.572 -
   1.573 -  Each version is given a distinguishing version number.  If the
   1.574 -Program specifies that a certain numbered version of the GNU General
   1.575 -Public License "or any later version" applies to it, you have the
   1.576 -option of following the terms and conditions either of that numbered
   1.577 -version or of any later version published by the Free Software
   1.578 -Foundation.  If the Program does not specify a version number of the
   1.579 -GNU General Public License, you may choose any version ever published
   1.580 -by the Free Software Foundation.
   1.581 -
   1.582 -  If the Program specifies that a proxy can decide which future
   1.583 -versions of the GNU General Public License can be used, that proxy's
   1.584 -public statement of acceptance of a version permanently authorizes you
   1.585 -to choose that version for the Program.
   1.586 -
   1.587 -  Later license versions may give you additional or different
   1.588 -permissions.  However, no additional obligations are imposed on any
   1.589 -author or copyright holder as a result of your choosing to follow a
   1.590 -later version.
   1.591 -
   1.592 -  15. Disclaimer of Warranty.
   1.593 -
   1.594 -  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
   1.595 -APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
   1.596 -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
   1.597 -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
   1.598 -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   1.599 -PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
   1.600 -IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
   1.601 -ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
   1.602 -
   1.603 -  16. Limitation of Liability.
   1.604 -
   1.605 -  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
   1.606 -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
   1.607 -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
   1.608 -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
   1.609 -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
   1.610 -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
   1.611 -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
   1.612 -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
   1.613 -SUCH DAMAGES.
   1.614 -
   1.615 -  17. Interpretation of Sections 15 and 16.
   1.616 -
   1.617 -  If the disclaimer of warranty and limitation of liability provided
   1.618 -above cannot be given local legal effect according to their terms,
   1.619 -reviewing courts shall apply local law that most closely approximates
   1.620 -an absolute waiver of all civil liability in connection with the
   1.621 -Program, unless a warranty or assumption of liability accompanies a
   1.622 -copy of the Program in return for a fee.
   1.623 -
   1.624 -                     END OF TERMS AND CONDITIONS
   1.625 -
   1.626 -            How to Apply These Terms to Your New Programs
   1.627 -
   1.628 -  If you develop a new program, and you want it to be of the greatest
   1.629 -possible use to the public, the best way to achieve this is to make it
   1.630 -free software which everyone can redistribute and change under these terms.
   1.631 -
   1.632 -  To do so, attach the following notices to the program.  It is safest
   1.633 -to attach them to the start of each source file to most effectively
   1.634 -state the exclusion of warranty; and each file should have at least
   1.635 -the "copyright" line and a pointer to where the full notice is found.
   1.636 -
   1.637 -    <one line to give the program's name and a brief idea of what it does.>
   1.638 -    Copyright (C) <year>  <name of author>
   1.639 -
   1.640 -    This program is free software: you can redistribute it and/or modify
   1.641 -    it under the terms of the GNU General Public License as published by
   1.642 -    the Free Software Foundation, either version 3 of the License, or
   1.643 -    (at your option) any later version.
   1.644 -
   1.645 -    This program is distributed in the hope that it will be useful,
   1.646 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   1.647 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   1.648 -    GNU General Public License for more details.
   1.649 -
   1.650 -    You should have received a copy of the GNU General Public License
   1.651 -    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   1.652 -
   1.653 -Also add information on how to contact you by electronic and paper mail.
   1.654 -
   1.655 -  If the program does terminal interaction, make it output a short
   1.656 -notice like this when it starts in an interactive mode:
   1.657 -
   1.658 -    <program>  Copyright (C) <year>  <name of author>
   1.659 -    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
   1.660 -    This is free software, and you are welcome to redistribute it
   1.661 -    under certain conditions; type `show c' for details.
   1.662 -
   1.663 -The hypothetical commands `show w' and `show c' should show the appropriate
   1.664 -parts of the General Public License.  Of course, your program's commands
   1.665 -might be different; for a GUI interface, you would use an "about box".
   1.666 -
   1.667 -  You should also get your employer (if you work as a programmer) or school,
   1.668 -if any, to sign a "copyright disclaimer" for the program, if necessary.
   1.669 -For more information on this, and how to apply and follow the GNU GPL, see
   1.670 -<http://www.gnu.org/licenses/>.
   1.671 -
   1.672 -  The GNU General Public License does not permit incorporating your program
   1.673 -into proprietary programs.  If your program is a subroutine library, you
   1.674 -may consider it more useful to permit linking proprietary applications with
   1.675 -the library.  If this is what you want to do, use the GNU Lesser General
   1.676 -Public License instead of this License.  But first, please read
   1.677 -<http://www.gnu.org/philosophy/why-not-lgpl.html>.
   1.678 +                    GNU AFFERO GENERAL PUBLIC LICENSE
   1.679 +                       Version 3, 19 November 2007
   1.680 +
   1.681 + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
   1.682 + Everyone is permitted to copy and distribute verbatim copies
   1.683 + of this license document, but changing it is not allowed.
   1.684 +
   1.685 +                            Preamble
   1.686 +
   1.687 +  The GNU Affero General Public License is a free, copyleft license for
   1.688 +software and other kinds of works, specifically designed to ensure
   1.689 +cooperation with the community in the case of network server software.
   1.690 +
   1.691 +  The licenses for most software and other practical works are designed
   1.692 +to take away your freedom to share and change the works.  By contrast,
   1.693 +our General Public Licenses are intended to guarantee your freedom to
   1.694 +share and change all versions of a program--to make sure it remains free
   1.695 +software for all its users.
   1.696 +
   1.697 +  When we speak of free software, we are referring to freedom, not
   1.698 +price.  Our General Public Licenses are designed to make sure that you
   1.699 +have the freedom to distribute copies of free software (and charge for
   1.700 +them if you wish), that you receive source code or can get it if you
   1.701 +want it, that you can change the software or use pieces of it in new
   1.702 +free programs, and that you know you can do these things.
   1.703 +
   1.704 +  Developers that use our General Public Licenses protect your rights
   1.705 +with two steps: (1) assert copyright on the software, and (2) offer
   1.706 +you this License which gives you legal permission to copy, distribute
   1.707 +and/or modify the software.
   1.708 +
   1.709 +  A secondary benefit of defending all users' freedom is that
   1.710 +improvements made in alternate versions of the program, if they
   1.711 +receive widespread use, become available for other developers to
   1.712 +incorporate.  Many developers of free software are heartened and
   1.713 +encouraged by the resulting cooperation.  However, in the case of
   1.714 +software used on network servers, this result may fail to come about.
   1.715 +The GNU General Public License permits making a modified version and
   1.716 +letting the public access it on a server without ever releasing its
   1.717 +source code to the public.
   1.718 +
   1.719 +  The GNU Affero General Public License is designed specifically to
   1.720 +ensure that, in such cases, the modified source code becomes available
   1.721 +to the community.  It requires the operator of a network server to
   1.722 +provide the source code of the modified version running there to the
   1.723 +users of that server.  Therefore, public use of a modified version, on
   1.724 +a publicly accessible server, gives the public access to the source
   1.725 +code of the modified version.
   1.726 +
   1.727 +  An older license, called the Affero General Public License and
   1.728 +published by Affero, was designed to accomplish similar goals.  This is
   1.729 +a different license, not a version of the Affero GPL, but Affero has
   1.730 +released a new version of the Affero GPL which permits relicensing under
   1.731 +this license.
   1.732 +
   1.733 +  The precise terms and conditions for copying, distribution and
   1.734 +modification follow.
   1.735 +
   1.736 +                       TERMS AND CONDITIONS
   1.737 +
   1.738 +  0. Definitions.
   1.739 +
   1.740 +  "This License" refers to version 3 of the GNU Affero General Public License.
   1.741 +
   1.742 +  "Copyright" also means copyright-like laws that apply to other kinds of
   1.743 +works, such as semiconductor masks.
   1.744 +
   1.745 +  "The Program" refers to any copyrightable work licensed under this
   1.746 +License.  Each licensee is addressed as "you".  "Licensees" and
   1.747 +"recipients" may be individuals or organizations.
   1.748 +
   1.749 +  To "modify" a work means to copy from or adapt all or part of the work
   1.750 +in a fashion requiring copyright permission, other than the making of an
   1.751 +exact copy.  The resulting work is called a "modified version" of the
   1.752 +earlier work or a work "based on" the earlier work.
   1.753 +
   1.754 +  A "covered work" means either the unmodified Program or a work based
   1.755 +on the Program.
   1.756 +
   1.757 +  To "propagate" a work means to do anything with it that, without
   1.758 +permission, would make you directly or secondarily liable for
   1.759 +infringement under applicable copyright law, except executing it on a
   1.760 +computer or modifying a private copy.  Propagation includes copying,
   1.761 +distribution (with or without modification), making available to the
   1.762 +public, and in some countries other activities as well.
   1.763 +
   1.764 +  To "convey" a work means any kind of propagation that enables other
   1.765 +parties to make or receive copies.  Mere interaction with a user through
   1.766 +a computer network, with no transfer of a copy, is not conveying.
   1.767 +
   1.768 +  An interactive user interface displays "Appropriate Legal Notices"
   1.769 +to the extent that it includes a convenient and prominently visible
   1.770 +feature that (1) displays an appropriate copyright notice, and (2)
   1.771 +tells the user that there is no warranty for the work (except to the
   1.772 +extent that warranties are provided), that licensees may convey the
   1.773 +work under this License, and how to view a copy of this License.  If
   1.774 +the interface presents a list of user commands or options, such as a
   1.775 +menu, a prominent item in the list meets this criterion.
   1.776 +
   1.777 +  1. Source Code.
   1.778 +
   1.779 +  The "source code" for a work means the preferred form of the work
   1.780 +for making modifications to it.  "Object code" means any non-source
   1.781 +form of a work.
   1.782 +
   1.783 +  A "Standard Interface" means an interface that either is an official
   1.784 +standard defined by a recognized standards body, or, in the case of
   1.785 +interfaces specified for a particular programming language, one that
   1.786 +is widely used among developers working in that language.
   1.787 +
   1.788 +  The "System Libraries" of an executable work include anything, other
   1.789 +than the work as a whole, that (a) is included in the normal form of
   1.790 +packaging a Major Component, but which is not part of that Major
   1.791 +Component, and (b) serves only to enable use of the work with that
   1.792 +Major Component, or to implement a Standard Interface for which an
   1.793 +implementation is available to the public in source code form.  A
   1.794 +"Major Component", in this context, means a major essential component
   1.795 +(kernel, window system, and so on) of the specific operating system
   1.796 +(if any) on which the executable work runs, or a compiler used to
   1.797 +produce the work, or an object code interpreter used to run it.
   1.798 +
   1.799 +  The "Corresponding Source" for a work in object code form means all
   1.800 +the source code needed to generate, install, and (for an executable
   1.801 +work) run the object code and to modify the work, including scripts to
   1.802 +control those activities.  However, it does not include the work's
   1.803 +System Libraries, or general-purpose tools or generally available free
   1.804 +programs which are used unmodified in performing those activities but
   1.805 +which are not part of the work.  For example, Corresponding Source
   1.806 +includes interface definition files associated with source files for
   1.807 +the work, and the source code for shared libraries and dynamically
   1.808 +linked subprograms that the work is specifically designed to require,
   1.809 +such as by intimate data communication or control flow between those
   1.810 +subprograms and other parts of the work.
   1.811 +
   1.812 +  The Corresponding Source need not include anything that users
   1.813 +can regenerate automatically from other parts of the Corresponding
   1.814 +Source.
   1.815 +
   1.816 +  The Corresponding Source for a work in source code form is that
   1.817 +same work.
   1.818 +
   1.819 +  2. Basic Permissions.
   1.820 +
   1.821 +  All rights granted under this License are granted for the term of
   1.822 +copyright on the Program, and are irrevocable provided the stated
   1.823 +conditions are met.  This License explicitly affirms your unlimited
   1.824 +permission to run the unmodified Program.  The output from running a
   1.825 +covered work is covered by this License only if the output, given its
   1.826 +content, constitutes a covered work.  This License acknowledges your
   1.827 +rights of fair use or other equivalent, as provided by copyright law.
   1.828 +
   1.829 +  You may make, run and propagate covered works that you do not
   1.830 +convey, without conditions so long as your license otherwise remains
   1.831 +in force.  You may convey covered works to others for the sole purpose
   1.832 +of having them make modifications exclusively for you, or provide you
   1.833 +with facilities for running those works, provided that you comply with
   1.834 +the terms of this License in conveying all material for which you do
   1.835 +not control copyright.  Those thus making or running the covered works
   1.836 +for you must do so exclusively on your behalf, under your direction
   1.837 +and control, on terms that prohibit them from making any copies of
   1.838 +your copyrighted material outside their relationship with you.
   1.839 +
   1.840 +  Conveying under any other circumstances is permitted solely under
   1.841 +the conditions stated below.  Sublicensing is not allowed; section 10
   1.842 +makes it unnecessary.
   1.843 +
   1.844 +  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
   1.845 +
   1.846 +  No covered work shall be deemed part of an effective technological
   1.847 +measure under any applicable law fulfilling obligations under article
   1.848 +11 of the WIPO copyright treaty adopted on 20 December 1996, or
   1.849 +similar laws prohibiting or restricting circumvention of such
   1.850 +measures.
   1.851 +
   1.852 +  When you convey a covered work, you waive any legal power to forbid
   1.853 +circumvention of technological measures to the extent such circumvention
   1.854 +is effected by exercising rights under this License with respect to
   1.855 +the covered work, and you disclaim any intention to limit operation or
   1.856 +modification of the work as a means of enforcing, against the work's
   1.857 +users, your or third parties' legal rights to forbid circumvention of
   1.858 +technological measures.
   1.859 +
   1.860 +  4. Conveying Verbatim Copies.
   1.861 +
   1.862 +  You may convey verbatim copies of the Program's source code as you
   1.863 +receive it, in any medium, provided that you conspicuously and
   1.864 +appropriately publish on each copy an appropriate copyright notice;
   1.865 +keep intact all notices stating that this License and any
   1.866 +non-permissive terms added in accord with section 7 apply to the code;
   1.867 +keep intact all notices of the absence of any warranty; and give all
   1.868 +recipients a copy of this License along with the Program.
   1.869 +
   1.870 +  You may charge any price or no price for each copy that you convey,
   1.871 +and you may offer support or warranty protection for a fee.
   1.872 +
   1.873 +  5. Conveying Modified Source Versions.
   1.874 +
   1.875 +  You may convey a work based on the Program, or the modifications to
   1.876 +produce it from the Program, in the form of source code under the
   1.877 +terms of section 4, provided that you also meet all of these conditions:
   1.878 +
   1.879 +    a) The work must carry prominent notices stating that you modified
   1.880 +    it, and giving a relevant date.
   1.881 +
   1.882 +    b) The work must carry prominent notices stating that it is
   1.883 +    released under this License and any conditions added under section
   1.884 +    7.  This requirement modifies the requirement in section 4 to
   1.885 +    "keep intact all notices".
   1.886 +
   1.887 +    c) You must license the entire work, as a whole, under this
   1.888 +    License to anyone who comes into possession of a copy.  This
   1.889 +    License will therefore apply, along with any applicable section 7
   1.890 +    additional terms, to the whole of the work, and all its parts,
   1.891 +    regardless of how they are packaged.  This License gives no
   1.892 +    permission to license the work in any other way, but it does not
   1.893 +    invalidate such permission if you have separately received it.
   1.894 +
   1.895 +    d) If the work has interactive user interfaces, each must display
   1.896 +    Appropriate Legal Notices; however, if the Program has interactive
   1.897 +    interfaces that do not display Appropriate Legal Notices, your
   1.898 +    work need not make them do so.
   1.899 +
   1.900 +  A compilation of a covered work with other separate and independent
   1.901 +works, which are not by their nature extensions of the covered work,
   1.902 +and which are not combined with it such as to form a larger program,
   1.903 +in or on a volume of a storage or distribution medium, is called an
   1.904 +"aggregate" if the compilation and its resulting copyright are not
   1.905 +used to limit the access or legal rights of the compilation's users
   1.906 +beyond what the individual works permit.  Inclusion of a covered work
   1.907 +in an aggregate does not cause this License to apply to the other
   1.908 +parts of the aggregate.
   1.909 +
   1.910 +  6. Conveying Non-Source Forms.
   1.911 +
   1.912 +  You may convey a covered work in object code form under the terms
   1.913 +of sections 4 and 5, provided that you also convey the
   1.914 +machine-readable Corresponding Source under the terms of this License,
   1.915 +in one of these ways:
   1.916 +
   1.917 +    a) Convey the object code in, or embodied in, a physical product
   1.918 +    (including a physical distribution medium), accompanied by the
   1.919 +    Corresponding Source fixed on a durable physical medium
   1.920 +    customarily used for software interchange.
   1.921 +
   1.922 +    b) Convey the object code in, or embodied in, a physical product
   1.923 +    (including a physical distribution medium), accompanied by a
   1.924 +    written offer, valid for at least three years and valid for as
   1.925 +    long as you offer spare parts or customer support for that product
   1.926 +    model, to give anyone who possesses the object code either (1) a
   1.927 +    copy of the Corresponding Source for all the software in the
   1.928 +    product that is covered by this License, on a durable physical
   1.929 +    medium customarily used for software interchange, for a price no
   1.930 +    more than your reasonable cost of physically performing this
   1.931 +    conveying of source, or (2) access to copy the
   1.932 +    Corresponding Source from a network server at no charge.
   1.933 +
   1.934 +    c) Convey individual copies of the object code with a copy of the
   1.935 +    written offer to provide the Corresponding Source.  This
   1.936 +    alternative is allowed only occasionally and noncommercially, and
   1.937 +    only if you received the object code with such an offer, in accord
   1.938 +    with subsection 6b.
   1.939 +
   1.940 +    d) Convey the object code by offering access from a designated
   1.941 +    place (gratis or for a charge), and offer equivalent access to the
   1.942 +    Corresponding Source in the same way through the same place at no
   1.943 +    further charge.  You need not require recipients to copy the
   1.944 +    Corresponding Source along with the object code.  If the place to
   1.945 +    copy the object code is a network server, the Corresponding Source
   1.946 +    may be on a different server (operated by you or a third party)
   1.947 +    that supports equivalent copying facilities, provided you maintain
   1.948 +    clear directions next to the object code saying where to find the
   1.949 +    Corresponding Source.  Regardless of what server hosts the
   1.950 +    Corresponding Source, you remain obligated to ensure that it is
   1.951 +    available for as long as needed to satisfy these requirements.
   1.952 +
   1.953 +    e) Convey the object code using peer-to-peer transmission, provided
   1.954 +    you inform other peers where the object code and Corresponding
   1.955 +    Source of the work are being offered to the general public at no
   1.956 +    charge under subsection 6d.
   1.957 +
   1.958 +  A separable portion of the object code, whose source code is excluded
   1.959 +from the Corresponding Source as a System Library, need not be
   1.960 +included in conveying the object code work.
   1.961 +
   1.962 +  A "User Product" is either (1) a "consumer product", which means any
   1.963 +tangible personal property which is normally used for personal, family,
   1.964 +or household purposes, or (2) anything designed or sold for incorporation
   1.965 +into a dwelling.  In determining whether a product is a consumer product,
   1.966 +doubtful cases shall be resolved in favor of coverage.  For a particular
   1.967 +product received by a particular user, "normally used" refers to a
   1.968 +typical or common use of that class of product, regardless of the status
   1.969 +of the particular user or of the way in which the particular user
   1.970 +actually uses, or expects or is expected to use, the product.  A product
   1.971 +is a consumer product regardless of whether the product has substantial
   1.972 +commercial, industrial or non-consumer uses, unless such uses represent
   1.973 +the only significant mode of use of the product.
   1.974 +
   1.975 +  "Installation Information" for a User Product means any methods,
   1.976 +procedures, authorization keys, or other information required to install
   1.977 +and execute modified versions of a covered work in that User Product from
   1.978 +a modified version of its Corresponding Source.  The information must
   1.979 +suffice to ensure that the continued functioning of the modified object
   1.980 +code is in no case prevented or interfered with solely because
   1.981 +modification has been made.
   1.982 +
   1.983 +  If you convey an object code work under this section in, or with, or
   1.984 +specifically for use in, a User Product, and the conveying occurs as
   1.985 +part of a transaction in which the right of possession and use of the
   1.986 +User Product is transferred to the recipient in perpetuity or for a
   1.987 +fixed term (regardless of how the transaction is characterized), the
   1.988 +Corresponding Source conveyed under this section must be accompanied
   1.989 +by the Installation Information.  But this requirement does not apply
   1.990 +if neither you nor any third party retains the ability to install
   1.991 +modified object code on the User Product (for example, the work has
   1.992 +been installed in ROM).
   1.993 +
   1.994 +  The requirement to provide Installation Information does not include a
   1.995 +requirement to continue to provide support service, warranty, or updates
   1.996 +for a work that has been modified or installed by the recipient, or for
   1.997 +the User Product in which it has been modified or installed.  Access to a
   1.998 +network may be denied when the modification itself materially and
   1.999 +adversely affects the operation of the network or violates the rules and
  1.1000 +protocols for communication across the network.
  1.1001 +
  1.1002 +  Corresponding Source conveyed, and Installation Information provided,
  1.1003 +in accord with this section must be in a format that is publicly
  1.1004 +documented (and with an implementation available to the public in
  1.1005 +source code form), and must require no special password or key for
  1.1006 +unpacking, reading or copying.
  1.1007 +
  1.1008 +  7. Additional Terms.
  1.1009 +
  1.1010 +  "Additional permissions" are terms that supplement the terms of this
  1.1011 +License by making exceptions from one or more of its conditions.
  1.1012 +Additional permissions that are applicable to the entire Program shall
  1.1013 +be treated as though they were included in this License, to the extent
  1.1014 +that they are valid under applicable law.  If additional permissions
  1.1015 +apply only to part of the Program, that part may be used separately
  1.1016 +under those permissions, but the entire Program remains governed by
  1.1017 +this License without regard to the additional permissions.
  1.1018 +
  1.1019 +  When you convey a copy of a covered work, you may at your option
  1.1020 +remove any additional permissions from that copy, or from any part of
  1.1021 +it.  (Additional permissions may be written to require their own
  1.1022 +removal in certain cases when you modify the work.)  You may place
  1.1023 +additional permissions on material, added by you to a covered work,
  1.1024 +for which you have or can give appropriate copyright permission.
  1.1025 +
  1.1026 +  Notwithstanding any other provision of this License, for material you
  1.1027 +add to a covered work, you may (if authorized by the copyright holders of
  1.1028 +that material) supplement the terms of this License with terms:
  1.1029 +
  1.1030 +    a) Disclaiming warranty or limiting liability differently from the
  1.1031 +    terms of sections 15 and 16 of this License; or
  1.1032 +
  1.1033 +    b) Requiring preservation of specified reasonable legal notices or
  1.1034 +    author attributions in that material or in the Appropriate Legal
  1.1035 +    Notices displayed by works containing it; or
  1.1036 +
  1.1037 +    c) Prohibiting misrepresentation of the origin of that material, or
  1.1038 +    requiring that modified versions of such material be marked in
  1.1039 +    reasonable ways as different from the original version; or
  1.1040 +
  1.1041 +    d) Limiting the use for publicity purposes of names of licensors or
  1.1042 +    authors of the material; or
  1.1043 +
  1.1044 +    e) Declining to grant rights under trademark law for use of some
  1.1045 +    trade names, trademarks, or service marks; or
  1.1046 +
  1.1047 +    f) Requiring indemnification of licensors and authors of that
  1.1048 +    material by anyone who conveys the material (or modified versions of
  1.1049 +    it) with contractual assumptions of liability to the recipient, for
  1.1050 +    any liability that these contractual assumptions directly impose on
  1.1051 +    those licensors and authors.
  1.1052 +
  1.1053 +  All other non-permissive additional terms are considered "further
  1.1054 +restrictions" within the meaning of section 10.  If the Program as you
  1.1055 +received it, or any part of it, contains a notice stating that it is
  1.1056 +governed by this License along with a term that is a further
  1.1057 +restriction, you may remove that term.  If a license document contains
  1.1058 +a further restriction but permits relicensing or conveying under this
  1.1059 +License, you may add to a covered work material governed by the terms
  1.1060 +of that license document, provided that the further restriction does
  1.1061 +not survive such relicensing or conveying.
  1.1062 +
  1.1063 +  If you add terms to a covered work in accord with this section, you
  1.1064 +must place, in the relevant source files, a statement of the
  1.1065 +additional terms that apply to those files, or a notice indicating
  1.1066 +where to find the applicable terms.
  1.1067 +
  1.1068 +  Additional terms, permissive or non-permissive, may be stated in the
  1.1069 +form of a separately written license, or stated as exceptions;
  1.1070 +the above requirements apply either way.
  1.1071 +
  1.1072 +  8. Termination.
  1.1073 +
  1.1074 +  You may not propagate or modify a covered work except as expressly
  1.1075 +provided under this License.  Any attempt otherwise to propagate or
  1.1076 +modify it is void, and will automatically terminate your rights under
  1.1077 +this License (including any patent licenses granted under the third
  1.1078 +paragraph of section 11).
  1.1079 +
  1.1080 +  However, if you cease all violation of this License, then your
  1.1081 +license from a particular copyright holder is reinstated (a)
  1.1082 +provisionally, unless and until the copyright holder explicitly and
  1.1083 +finally terminates your license, and (b) permanently, if the copyright
  1.1084 +holder fails to notify you of the violation by some reasonable means
  1.1085 +prior to 60 days after the cessation.
  1.1086 +
  1.1087 +  Moreover, your license from a particular copyright holder is
  1.1088 +reinstated permanently if the copyright holder notifies you of the
  1.1089 +violation by some reasonable means, this is the first time you have
  1.1090 +received notice of violation of this License (for any work) from that
  1.1091 +copyright holder, and you cure the violation prior to 30 days after
  1.1092 +your receipt of the notice.
  1.1093 +
  1.1094 +  Termination of your rights under this section does not terminate the
  1.1095 +licenses of parties who have received copies or rights from you under
  1.1096 +this License.  If your rights have been terminated and not permanently
  1.1097 +reinstated, you do not qualify to receive new licenses for the same
  1.1098 +material under section 10.
  1.1099 +
  1.1100 +  9. Acceptance Not Required for Having Copies.
  1.1101 +
  1.1102 +  You are not required to accept this License in order to receive or
  1.1103 +run a copy of the Program.  Ancillary propagation of a covered work
  1.1104 +occurring solely as a consequence of using peer-to-peer transmission
  1.1105 +to receive a copy likewise does not require acceptance.  However,
  1.1106 +nothing other than this License grants you permission to propagate or
  1.1107 +modify any covered work.  These actions infringe copyright if you do
  1.1108 +not accept this License.  Therefore, by modifying or propagating a
  1.1109 +covered work, you indicate your acceptance of this License to do so.
  1.1110 +
  1.1111 +  10. Automatic Licensing of Downstream Recipients.
  1.1112 +
  1.1113 +  Each time you convey a covered work, the recipient automatically
  1.1114 +receives a license from the original licensors, to run, modify and
  1.1115 +propagate that work, subject to this License.  You are not responsible
  1.1116 +for enforcing compliance by third parties with this License.
  1.1117 +
  1.1118 +  An "entity transaction" is a transaction transferring control of an
  1.1119 +organization, or substantially all assets of one, or subdividing an
  1.1120 +organization, or merging organizations.  If propagation of a covered
  1.1121 +work results from an entity transaction, each party to that
  1.1122 +transaction who receives a copy of the work also receives whatever
  1.1123 +licenses to the work the party's predecessor in interest had or could
  1.1124 +give under the previous paragraph, plus a right to possession of the
  1.1125 +Corresponding Source of the work from the predecessor in interest, if
  1.1126 +the predecessor has it or can get it with reasonable efforts.
  1.1127 +
  1.1128 +  You may not impose any further restrictions on the exercise of the
  1.1129 +rights granted or affirmed under this License.  For example, you may
  1.1130 +not impose a license fee, royalty, or other charge for exercise of
  1.1131 +rights granted under this License, and you may not initiate litigation
  1.1132 +(including a cross-claim or counterclaim in a lawsuit) alleging that
  1.1133 +any patent claim is infringed by making, using, selling, offering for
  1.1134 +sale, or importing the Program or any portion of it.
  1.1135 +
  1.1136 +  11. Patents.
  1.1137 +
  1.1138 +  A "contributor" is a copyright holder who authorizes use under this
  1.1139 +License of the Program or a work on which the Program is based.  The
  1.1140 +work thus licensed is called the contributor's "contributor version".
  1.1141 +
  1.1142 +  A contributor's "essential patent claims" are all patent claims
  1.1143 +owned or controlled by the contributor, whether already acquired or
  1.1144 +hereafter acquired, that would be infringed by some manner, permitted
  1.1145 +by this License, of making, using, or selling its contributor version,
  1.1146 +but do not include claims that would be infringed only as a
  1.1147 +consequence of further modification of the contributor version.  For
  1.1148 +purposes of this definition, "control" includes the right to grant
  1.1149 +patent sublicenses in a manner consistent with the requirements of
  1.1150 +this License.
  1.1151 +
  1.1152 +  Each contributor grants you a non-exclusive, worldwide, royalty-free
  1.1153 +patent license under the contributor's essential patent claims, to
  1.1154 +make, use, sell, offer for sale, import and otherwise run, modify and
  1.1155 +propagate the contents of its contributor version.
  1.1156 +
  1.1157 +  In the following three paragraphs, a "patent license" is any express
  1.1158 +agreement or commitment, however denominated, not to enforce a patent
  1.1159 +(such as an express permission to practice a patent or covenant not to
  1.1160 +sue for patent infringement).  To "grant" such a patent license to a
  1.1161 +party means to make such an agreement or commitment not to enforce a
  1.1162 +patent against the party.
  1.1163 +
  1.1164 +  If you convey a covered work, knowingly relying on a patent license,
  1.1165 +and the Corresponding Source of the work is not available for anyone
  1.1166 +to copy, free of charge and under the terms of this License, through a
  1.1167 +publicly available network server or other readily accessible means,
  1.1168 +then you must either (1) cause the Corresponding Source to be so
  1.1169 +available, or (2) arrange to deprive yourself of the benefit of the
  1.1170 +patent license for this particular work, or (3) arrange, in a manner
  1.1171 +consistent with the requirements of this License, to extend the patent
  1.1172 +license to downstream recipients.  "Knowingly relying" means you have
  1.1173 +actual knowledge that, but for the patent license, your conveying the
  1.1174 +covered work in a country, or your recipient's use of the covered work
  1.1175 +in a country, would infringe one or more identifiable patents in that
  1.1176 +country that you have reason to believe are valid.
  1.1177 +
  1.1178 +  If, pursuant to or in connection with a single transaction or
  1.1179 +arrangement, you convey, or propagate by procuring conveyance of, a
  1.1180 +covered work, and grant a patent license to some of the parties
  1.1181 +receiving the covered work authorizing them to use, propagate, modify
  1.1182 +or convey a specific copy of the covered work, then the patent license
  1.1183 +you grant is automatically extended to all recipients of the covered
  1.1184 +work and works based on it.
  1.1185 +
  1.1186 +  A patent license is "discriminatory" if it does not include within
  1.1187 +the scope of its coverage, prohibits the exercise of, or is
  1.1188 +conditioned on the non-exercise of one or more of the rights that are
  1.1189 +specifically granted under this License.  You may not convey a covered
  1.1190 +work if you are a party to an arrangement with a third party that is
  1.1191 +in the business of distributing software, under which you make payment
  1.1192 +to the third party based on the extent of your activity of conveying
  1.1193 +the work, and under which the third party grants, to any of the
  1.1194 +parties who would receive the covered work from you, a discriminatory
  1.1195 +patent license (a) in connection with copies of the covered work
  1.1196 +conveyed by you (or copies made from those copies), or (b) primarily
  1.1197 +for and in connection with specific products or compilations that
  1.1198 +contain the covered work, unless you entered into that arrangement,
  1.1199 +or that patent license was granted, prior to 28 March 2007.
  1.1200 +
  1.1201 +  Nothing in this License shall be construed as excluding or limiting
  1.1202 +any implied license or other defenses to infringement that may
  1.1203 +otherwise be available to you under applicable patent law.
  1.1204 +
  1.1205 +  12. No Surrender of Others' Freedom.
  1.1206 +
  1.1207 +  If conditions are imposed on you (whether by court order, agreement or
  1.1208 +otherwise) that contradict the conditions of this License, they do not
  1.1209 +excuse you from the conditions of this License.  If you cannot convey a
  1.1210 +covered work so as to satisfy simultaneously your obligations under this
  1.1211 +License and any other pertinent obligations, then as a consequence you may
  1.1212 +not convey it at all.  For example, if you agree to terms that obligate you
  1.1213 +to collect a royalty for further conveying from those to whom you convey
  1.1214 +the Program, the only way you could satisfy both those terms and this
  1.1215 +License would be to refrain entirely from conveying the Program.
  1.1216 +
  1.1217 +  13. Remote Network Interaction; Use with the GNU General Public License.
  1.1218 +
  1.1219 +  Notwithstanding any other provision of this License, if you modify the
  1.1220 +Program, your modified version must prominently offer all users
  1.1221 +interacting with it remotely through a computer network (if your version
  1.1222 +supports such interaction) an opportunity to receive the Corresponding
  1.1223 +Source of your version by providing access to the Corresponding Source
  1.1224 +from a network server at no charge, through some standard or customary
  1.1225 +means of facilitating copying of software.  This Corresponding Source
  1.1226 +shall include the Corresponding Source for any work covered by version 3
  1.1227 +of the GNU General Public License that is incorporated pursuant to the
  1.1228 +following paragraph.
  1.1229 +
  1.1230 +  Notwithstanding any other provision of this License, you have
  1.1231 +permission to link or combine any covered work with a work licensed
  1.1232 +under version 3 of the GNU General Public License into a single
  1.1233 +combined work, and to convey the resulting work.  The terms of this
  1.1234 +License will continue to apply to the part which is the covered work,
  1.1235 +but the work with which it is combined will remain governed by version
  1.1236 +3 of the GNU General Public License.
  1.1237 +
  1.1238 +  14. Revised Versions of this License.
  1.1239 +
  1.1240 +  The Free Software Foundation may publish revised and/or new versions of
  1.1241 +the GNU Affero General Public License from time to time.  Such new versions
  1.1242 +will be similar in spirit to the present version, but may differ in detail to
  1.1243 +address new problems or concerns.
  1.1244 +
  1.1245 +  Each version is given a distinguishing version number.  If the
  1.1246 +Program specifies that a certain numbered version of the GNU Affero General
  1.1247 +Public License "or any later version" applies to it, you have the
  1.1248 +option of following the terms and conditions either of that numbered
  1.1249 +version or of any later version published by the Free Software
  1.1250 +Foundation.  If the Program does not specify a version number of the
  1.1251 +GNU Affero General Public License, you may choose any version ever published
  1.1252 +by the Free Software Foundation.
  1.1253 +
  1.1254 +  If the Program specifies that a proxy can decide which future
  1.1255 +versions of the GNU Affero General Public License can be used, that proxy's
  1.1256 +public statement of acceptance of a version permanently authorizes you
  1.1257 +to choose that version for the Program.
  1.1258 +
  1.1259 +  Later license versions may give you additional or different
  1.1260 +permissions.  However, no additional obligations are imposed on any
  1.1261 +author or copyright holder as a result of your choosing to follow a
  1.1262 +later version.
  1.1263 +
  1.1264 +  15. Disclaimer of Warranty.
  1.1265 +
  1.1266 +  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
  1.1267 +APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
  1.1268 +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
  1.1269 +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
  1.1270 +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  1.1271 +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
  1.1272 +IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
  1.1273 +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  1.1274 +
  1.1275 +  16. Limitation of Liability.
  1.1276 +
  1.1277 +  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
  1.1278 +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
  1.1279 +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
  1.1280 +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
  1.1281 +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
  1.1282 +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
  1.1283 +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
  1.1284 +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
  1.1285 +SUCH DAMAGES.
  1.1286 +
  1.1287 +  17. Interpretation of Sections 15 and 16.
  1.1288 +
  1.1289 +  If the disclaimer of warranty and limitation of liability provided
  1.1290 +above cannot be given local legal effect according to their terms,
  1.1291 +reviewing courts shall apply local law that most closely approximates
  1.1292 +an absolute waiver of all civil liability in connection with the
  1.1293 +Program, unless a warranty or assumption of liability accompanies a
  1.1294 +copy of the Program in return for a fee.
  1.1295 +
  1.1296 +                     END OF TERMS AND CONDITIONS
  1.1297 +
  1.1298 +            How to Apply These Terms to Your New Programs
  1.1299 +
  1.1300 +  If you develop a new program, and you want it to be of the greatest
  1.1301 +possible use to the public, the best way to achieve this is to make it
  1.1302 +free software which everyone can redistribute and change under these terms.
  1.1303 +
  1.1304 +  To do so, attach the following notices to the program.  It is safest
  1.1305 +to attach them to the start of each source file to most effectively
  1.1306 +state the exclusion of warranty; and each file should have at least
  1.1307 +the "copyright" line and a pointer to where the full notice is found.
  1.1308 +
  1.1309 +    <one line to give the program's name and a brief idea of what it does.>
  1.1310 +    Copyright (C) <year>  <name of author>
  1.1311 +
  1.1312 +    This program is free software: you can redistribute it and/or modify
  1.1313 +    it under the terms of the GNU Affero General Public License as published by
  1.1314 +    the Free Software Foundation, either version 3 of the License, or
  1.1315 +    (at your option) any later version.
  1.1316 +
  1.1317 +    This program is distributed in the hope that it will be useful,
  1.1318 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  1.1319 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  1.1320 +    GNU Affero General Public License for more details.
  1.1321 +
  1.1322 +    You should have received a copy of the GNU Affero General Public License
  1.1323 +    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  1.1324 +
  1.1325 +Also add information on how to contact you by electronic and paper mail.
  1.1326 +
  1.1327 +  If your software can interact with users remotely through a computer
  1.1328 +network, you should also make sure that it provides a way for users to
  1.1329 +get its source.  For example, if your program is a web application, its
  1.1330 +interface could display a "Source" link that leads users to an archive
  1.1331 +of the code.  There are many ways you could offer source, and different
  1.1332 +solutions will be better for different programs; see section 13 for the
  1.1333 +specific requirements.
  1.1334 +
  1.1335 +  You should also get your employer (if you work as a programmer) or school,
  1.1336 +if any, to sign a "copyright disclaimer" for the program, if necessary.
  1.1337 +For more information on this, and how to apply and follow the GNU AGPL, see
  1.1338 +<http://www.gnu.org/licenses/>.
     2.1 --- a/src/gen_cpp_Engine.ysl2	Tue Nov 29 11:49:18 2016 +0100
     2.2 +++ b/src/gen_cpp_Engine.ysl2	Tue Nov 29 12:02:29 2016 +0100
     2.3 @@ -28,12 +28,18 @@
     2.4  
     2.5      template "method" {
     2.6          const "mangled" call "mangle";
     2.7 -        const "rettype", "name(parm[creates|returns]/*[2])";
     2.8 -        const "retname", "name(parm[creates|returns]/*[3])";
     2.9 -        const "jtype" call "toJavaDeclare" with "type", "$rettype";
    2.10 +        const "returning", "count(parm/creates|parm/returns)";
    2.11 +        const "CretType" choose {
    2.12 +            when "$returning = 0" > void
    2.13 +            when "$returning > 0" > jobject
    2.14 +        }
    2.15 +        const "CretDefault" choose {
    2.16 +            when "$returning = 0" > 
    2.17 +            when "$returning > 0" > NULL
    2.18 +        }
    2.19  
    2.20          ||
    2.21 -        JNIEXPORT jobject JNICALL «$mangled»(
    2.22 +        JNIEXPORT «$CretType» JNICALL «$mangled»(
    2.23                  JNIEnv *env,
    2.24                  jobject obj`apply "parm[in]", mode=sig`
    2.25              )
    2.26 @@ -51,21 +57,24 @@
    2.27                      status < PEP_STATUS_OK |`> |`
    2.28                      status >= PEP_TRUSTWORD_NOT_FOUND) {
    2.29                  throw_pEp_Exception(env, status);
    2.30 -                return NULL;
    2.31 +                return «$CretDefault»;
    2.32              }
    2.33  
    2.34          ||
    2.35  
    2.36 +        apply "parm[returns|creates]", mode=return;
    2.37 +
    2.38          choose {
    2.39 -            when "count(parm[returns|creates]) > 1" {
    2.40 -                apply "parm[returns|creates]", mode=return;
    2.41 +            when "$returning > 1" {
    2.42  
    2.43 -                apply "parm[1]", mode=return {
    2.44 -                    with "name" > result
    2.45 -                    with "jtype" > Engine$_«@name»_Return
    2.46 -                    with "sig" > (Lorg/pEp/jniadapter/Engine;)V
    2.47 -                    with "jnitype" > InnerClass
    2.48 -                }
    2.49 +                ||
    2.50 +                    jobject result_ = NULL;
    2.51 +                    jclass clazz_result_ = findClass(env, "org/pEp/jniadapter/Engine$_«@name»_Return");
    2.52 +                    assert(clazz_result_);
    2.53 +                    jmethodID constructor_result_ = env->GetMethodID(clazz_result_, "<init>", "(Lorg/pEp/jniadapter/Engine;)V");
    2.54 +                    assert(constructor_result_);
    2.55 +                    result_ = env->NewObject(clazz_result_, constructor_result_, obj);
    2.56 +                ||
    2.57  
    2.58                  apply "parm[returns|creates]", mode=setresult
    2.59                      with "jtype" > org/pEp/jniadapter/Engine$_«@name»_Return
    2.60 @@ -75,25 +84,7 @@
    2.61                  ||
    2.62              }
    2.63  
    2.64 -            when "count(parm[returns|creates]) = 1" {
    2.65 -                choose {
    2.66 -                    when "ancestor::namespace/child::enum[@name=$rettype]" apply "parm[returns|creates]", mode=return {
    2.67 -                        with "jtype", "$jtype";
    2.68 -                        with "jnitype", "'jint'";
    2.69 -                        with "sig", "'(I)V'";
    2.70 -                    }
    2.71 -
    2.72 -                    when "$rettype = 'message' or $rettype = 'identity'" apply "parm[returns|creates]", mode=return {
    2.73 -                        with "jtype", "$jtype";
    2.74 -                        with "jnitype", "'jlong'";
    2.75 -                        with "sig", "'(J)V'";
    2.76 -                    }
    2.77 -
    2.78 -                    when "$rettype = 'stringlist'" apply "parm[returns|creates]", mode=return;
    2.79 -                    when "$rettype = 'stringpairlist'" apply "parm[returns|creates]", mode=return;
    2.80 -
    2.81 -                    otherwise error | # not implemented: return type "«$rettype»";
    2.82 -                }
    2.83 +            when "$returning = 1" {
    2.84  
    2.85                  ||
    2.86                      return «name(parm[returns|creates]/*[3])»_;
    2.87 @@ -131,98 +122,57 @@
    2.88          param "type", "name(*[2])";
    2.89          param "jtype" call "toJava" with "type", "$type";
    2.90          param "name", "name(*[3])";
    2.91 -        param "jnitype" choose {
    2.92 -            when "$type = 'message'" > jlong
    2.93 -            when "ancestor::namespace/child::enum[@name=$type]" > jint
    2.94 -            when "$type = 'stringlist'" > jbyteArray
    2.95 -            otherwise >
    2.96 -        }
    2.97 -        param "retname", "$name";
    2.98 -        param "sig" choose {
    2.99 -            when "$type = 'message'" > (J)V
   2.100 -            when "ancestor::namespace/child::enum[@name=$type]" > (I)V
   2.101 -            when "$type = 'stringlist'" > (Ljava.lang.Object;)V
   2.102 -            otherwise > ()V
   2.103 -        }
   2.104  
   2.105          choose {
   2.106 -            when "$jnitype = 'jbyteArray'"
   2.107 +            when "$type = 'stringlist' or $type = 'stringpairlist' or $type = 'identity' or $type = 'identitylist'"
   2.108              ||
   2.109              jobject «$name»_ = NULL;
   2.110 -            if (_«$retname»)
   2.111 -                «$name»_ = from_stringlist(env, _«$retname»);
   2.112 +            if (_«$name»)
   2.113 +                «$name»_ = from_«$type»(env, _«$name»);
   2.114  
   2.115              ||
   2.116  
   2.117 -            when "$type = 'identity'"
   2.118 -            ||
   2.119 -            jobject «$name»_ = NULL;
   2.120 -            if (_«$retname»)
   2.121 -                «$name»_ = from_identity(env, _«$retname»);
   2.122 +            when "ancestor::namespace/child::enum[@name=$type]" {
   2.123 +                const "ljtype" call "lcase" with "text","$jtype";
   2.124 +                ||
   2.125 +                jobject «$name»_ = NULL;
   2.126 +                {
   2.127 +                    jclass clazz_«$ljtype» = findClass(env, "org/pEp/jniadapter/«$jtype»");
   2.128 +                    assert(clazz_«$ljtype»);
   2.129 +                    jmethodID method_values = env->GetStaticMethodID(clazz_«$ljtype», "values",
   2.130 +                            "()[Lorg/pEp/jniadapter/«$jtype»;");
   2.131 +                    assert(method_values);
   2.132 +                    jfieldID field_value = env->GetFieldID(clazz_«$ljtype», "value", "I");
   2.133 +                    assert(field_value);
   2.134  
   2.135 -            ||
   2.136 -                    
   2.137 -            when "$type = 'stringpairlist'"
   2.138 -            ||
   2.139 -            jobject «$name»_ = NULL;
   2.140 -            if (_«$retname»)
   2.141 -                «$name»_ = from_stringpairlist(env, _«$retname»);
   2.142 +                    jobjectArray values = (jobjectArray) env->CallStaticObjectMethod(clazz_«$ljtype»,
   2.143 +                            method_values);
   2.144 +                    assert(values);
   2.145  
   2.146 -            ||
   2.147 -
   2.148 -            when "ancestor::namespace/child::enum[@name=$jtype]" {
   2.149 -            const "ljtype" call "lcase" with "text","$jtype";
   2.150 -            ||
   2.151 -            jobject «$name»_ = NULL;
   2.152 -            {
   2.153 -                jclass clazz_«$ljtype» = findClass(env, "org/pEp/jniadapter/«$jtype»");
   2.154 -                assert(clazz_«$ljtype»);
   2.155 -                jmethodID method_values = env->GetStaticMethodID(clazz_«$ljtype», "values",
   2.156 -                        "()[Lorg/pEp/jniadapter/«$jtype»;");
   2.157 -                assert(method_values);
   2.158 -                jfieldID field_value = env->GetFieldID(clazz_«$ljtype», "value", "I");
   2.159 -                assert(field_value);
   2.160 -
   2.161 -                jobjectArray values = (jobjectArray) env->CallStaticObjectMethod(clazz_«$ljtype»,
   2.162 -                        method_values);
   2.163 -                assert(values);
   2.164 -
   2.165 -                jsize values_size = env->GetArrayLength(values);
   2.166 -                for (jsize i = 0; i < values_size; i++) {
   2.167 -                    jobject element = env->GetObjectArrayElement(values, i);
   2.168 -                    assert(element);
   2.169 -                    jint value = env->GetIntField(element, field_value);
   2.170 -                    if (value == (jint) _«$name») {
   2.171 -                        «$name»_ = element;
   2.172 -                        break;
   2.173 +                    jsize values_size = env->GetArrayLength(values);
   2.174 +                    for (jsize i = 0; i < values_size; i++) {
   2.175 +                        jobject element = env->GetObjectArrayElement(values, i);
   2.176 +                        assert(element);
   2.177 +                        jint value = env->GetIntField(element, field_value);
   2.178 +                        if (value == (jint) _«$name») {
   2.179 +                            «$name»_ = element;
   2.180 +                            break;
   2.181 +                        }
   2.182                      }
   2.183                  }
   2.184 +
   2.185 +                ||
   2.186              }
   2.187  
   2.188 -            ||
   2.189 -            }
   2.190 -
   2.191 -            otherwise {
   2.192 -                | jobject «$name»_ = NULL;
   2.193 -                indent(0);
   2.194 -                if "$retname != 'result'" > if (_«$retname») 
   2.195 -                > {\n
   2.196 +            otherwise { 
   2.197                  ||
   2.198 +                jobject «$name»_ = NULL;
   2.199 +                if (_«$name») {
   2.200                      jclass clazz_«$name»_ = findClass(env, "org/pEp/jniadapter/«$jtype»");
   2.201                      assert(clazz_«$name»_);
   2.202 -                    jmethodID constructor_«$name»_ = env->GetMethodID(clazz_«$name»_, "<init>", "«$sig»");
   2.203 +                    jmethodID constructor_«$name»_ = env->GetMethodID(clazz_«$name»_, "<init>", "(J)V");
   2.204                      assert(constructor_«$name»_);
   2.205 -                ||
   2.206 -
   2.207 -                indent(1);
   2.208 -                > «$name»_ = env->NewObject(clazz_«$name»_, constructor_«$name»_
   2.209 -                choose {
   2.210 -                    when "$jnitype = 'InnerClass'" > , obj
   2.211 -                    when "$jnitype != ''" > , («$jnitype») _«$retname»
   2.212 -                }
   2.213 -                > );\n
   2.214 -
   2.215 -                ||
   2.216 +                    «$name»_ = env->NewObject(clazz_«$name»_, constructor_«$name»_, (jlong) _«$name»);
   2.217                  }
   2.218  
   2.219                  ||
   2.220 @@ -239,6 +189,8 @@
   2.221                  | message *_«$name» = (message *) callLongMethod(env, «$name», "getHandle");
   2.222              when "$type='bool'"
   2.223                  | bool _«$name» = (bool) «$name»;
   2.224 +            when "$type='int'"
   2.225 +                | int _«$name» = (int) «$name»;
   2.226              otherwise
   2.227                  | √$type *_«$name» = to_«$type»(env, «$name»);
   2.228          }
     3.1 --- a/src/gen_java_Engine.ysl2	Tue Nov 29 11:49:18 2016 +0100
     3.2 +++ b/src/gen_java_Engine.ysl2	Tue Nov 29 12:02:29 2016 +0100
     3.3 @@ -155,6 +155,12 @@
     3.4                  return result;
     3.5              ||
     3.6  
     3.7 +            if "not($singlereturn) and not($multireturn)"
     3.8 +            ||
     3.9 +                _«@name»(`apply "parm[in]", mode=call;`);
    3.10 +                return;
    3.11 +            ||
    3.12 +                
    3.13              ||
    3.14              }
    3.15              ||
     4.1 --- a/src/jniutils.cc	Tue Nov 29 11:49:18 2016 +0100
     4.2 +++ b/src/jniutils.cc	Tue Nov 29 12:02:29 2016 +0100
     4.3 @@ -435,6 +435,8 @@
     4.4                  jfieldID me_id = getFieldID(env, classname, "me", "Z");
     4.5                  env->SetBooleanField(obj, me_id, (jboolean) ident->me);
     4.6  
     4.7 +                jfieldID flags_id = getFieldID(env, classname, "flags", "I");
     4.8 +                env->SetIntField(obj, flags_id, (jint) (int) ident->flags);
     4.9              }
    4.10  
    4.11              return obj;
    4.12 @@ -464,6 +466,9 @@
    4.13  
    4.14                  jfieldID me_id = getFieldID(env, classname, "me", "Z", identityClass);
    4.15                  env->SetBooleanField(obj, me_id, (jboolean) ident->me);
    4.16 +
    4.17 +                jfieldID flags_id = getFieldID(env, classname, "flags", "I", identityClass);
    4.18 +                env->SetIntField(obj, flags_id, (jint) (int) ident->flags);
    4.19              }
    4.20  
    4.21              return obj;
    4.22 @@ -505,6 +510,9 @@
    4.23  
    4.24              jfieldID me_id = getFieldID(env, classname, "me", "Z");
    4.25              ident->me = (bool) env->GetBooleanField(obj, me_id);
    4.26 +            
    4.27 +            jfieldID flags_id = getFieldID(env, classname, "flags", "I");
    4.28 +            ident->flags = (identity_flags_t) (int) env->GetIntField(obj, flags_id);
    4.29  
    4.30              return ident;
    4.31          }
     5.1 --- a/src/org/pEp/jniadapter/Identity.java	Tue Nov 29 11:49:18 2016 +0100
     5.2 +++ b/src/org/pEp/jniadapter/Identity.java	Tue Nov 29 12:02:29 2016 +0100
     5.3 @@ -8,6 +8,7 @@
     5.4      public CommType comm_type;
     5.5      public String lang;
     5.6      public boolean me;
     5.7 +    public int flags;
     5.8  
     5.9      public Identity() {
    5.10          this.me = false;
    5.11 @@ -27,6 +28,7 @@
    5.12          comm_type = CommType.Management.tag.get(i.comm_type);
    5.13          lang = AbstractEngine.toUTF16(i.lang);
    5.14          me = i.me;
    5.15 +        flags = i.flags;
    5.16      }
    5.17  }
    5.18  
     6.1 --- a/src/org/pEp/jniadapter/_Identity.java	Tue Nov 29 11:49:18 2016 +0100
     6.2 +++ b/src/org/pEp/jniadapter/_Identity.java	Tue Nov 29 12:02:29 2016 +0100
     6.3 @@ -8,6 +8,7 @@
     6.4      public int comm_type;
     6.5      public byte[] lang;
     6.6      public boolean me;
     6.7 +    public int flags;
     6.8  
     6.9      public _Identity() {
    6.10          this.me = false;
    6.11 @@ -25,6 +26,7 @@
    6.12          comm_type = i.comm_type.value;
    6.13          lang = AbstractEngine.toUTF8(i.lang);
    6.14          me = i.me;
    6.15 +        flags = i.flags;
    6.16      }
    6.17  }
    6.18  
     7.1 --- a/src/pEp.yml2	Tue Nov 29 11:49:18 2016 +0100
     7.2 +++ b/src/pEp.yml2	Tue Nov 29 12:02:29 2016 +0100
     7.3 @@ -109,7 +109,13 @@
     7.4      enum DecryptFlags {
     7.5          pEp_decrypt_flag_own_private_key > 1
     7.6          PEP_decrypt_flag_consumed > 2
     7.7 -        PEP_decrypt_flag_discarded > 4
     7.8 +        PEP_decrypt_flag_ignored > 4
     7.9 +    };
    7.10 +
    7.11 +    enum IdentityFlags {
    7.12 +        PEP_idf_not_for_sync > 1
    7.13 +        PEP_idf_list > 2
    7.14 +        PEP_idf_devicegroup > 256
    7.15      };
    7.16  
    7.17      enum SyncHandshakeResult {
    7.18 @@ -124,7 +130,7 @@
    7.19                  in stringlist extra,
    7.20                  creates message dst,
    7.21                  Cconst PEP_enc_format encformat "PEP_enc_PEP",
    7.22 -                Cconst PEP_encrypt_flags flage "0"
    7.23 +                Cconst PEP_encrypt_flags flags "0"
    7.24              );
    7.25  
    7.26          method encrypt_message_for_self(
    7.27 @@ -139,6 +145,7 @@
    7.28                  creates message dst,
    7.29                  creates stringlist keylist,
    7.30                  returns Rating rating,
    7.31 +                /* TODO replace with int, this is a OR of multipla DecryptFlags */
    7.32                  returns DecryptFlags flags
    7.33              );
    7.34  
    7.35 @@ -172,6 +179,20 @@
    7.36                  returns stringpairlist keyinfoList
    7.37              );
    7.38  
    7.39 +        method set_identity_flags(
    7.40 +                in identity ident,
    7.41 +                in int flags
    7.42 +            );
    7.43 +
    7.44 +        method unset_identity_flags(
    7.45 +                in identity ident,
    7.46 +                in int flags
    7.47 +            );
    7.48 +
    7.49 +        method own_identities_retrieve(
    7.50 +                returns identitylist identities
    7.51 +            );
    7.52 +
    7.53          basic string trustwords(identity ident);
    7.54          basic identity myself(identity ident);
    7.55          basic identity updateIdentity(identity ident);
     8.1 --- a/src/types_c.ysl2	Tue Nov 29 11:49:18 2016 +0100
     8.2 +++ b/src/types_c.ysl2	Tue Nov 29 12:02:29 2016 +0100
     8.3 @@ -27,6 +27,7 @@
     8.4          when "../enum[@name=$type]" > jint
     8.5          when "$type = 'string'" > jbyteArray
     8.6          when "$type='bool'" > jboolean
     8.7 +        when "$type='int'" > jint
     8.8          otherwise > jobject
     8.9      }
    8.10  }
     9.1 --- a/src/types_java.ysl2	Tue Nov 29 11:49:18 2016 +0100
     9.2 +++ b/src/types_java.ysl2	Tue Nov 29 12:02:29 2016 +0100
     9.3 @@ -2,45 +2,29 @@
     9.4      param "type";
     9.5  
     9.6      choose {
     9.7 +        when "$type='bool'" > Boolean
     9.8 +        when "$type='int'" > Integer
     9.9 +        when "$type='string'" > String
    9.10 +        when "$type='timestamp'" > Date
    9.11 +        when "$type='void'" > void
    9.12 +
    9.13 +        when "$type='identity'" > Identity
    9.14 +        when "$type='message'" > Message
    9.15 +
    9.16 +        when "$type='bloblist'" > Vector<Blob>
    9.17 +        when "$type='identitylist'" > Vector<Identity>
    9.18          when "$type='stringlist'" > Vector<String>
    9.19 -        when "$type='string'" > String
    9.20 -        when "$type='message'" > Message
    9.21 -        when "$type='identity'" > Identity
    9.22 -        when "$type='identitylist'" > Vector<Identity>
    9.23 -        when "$type='timestamp'" > Date
    9.24 +        when "$type='stringpairlist'" > ArrayList<Pair<String, String>>
    9.25 +
    9.26 +        when "$type='Color'" > Color
    9.27 +        when "$type='DecryptFlags'" > DecryptFlags
    9.28          when "$type='EncFormat'" > Message.EncFormat
    9.29 -        when "$type='bloblist'" > Vector<Blob>
    9.30 -        when "$type='stringpairlist'" > ArrayList<Pair<String, String>>
    9.31 -        when "$type='message'" > Message
    9.32 -        when "$type='void'" > void
    9.33 -        when "$type='bool'" > Boolean
    9.34 +        when "$type='Rating'" > Rating
    9.35  
    9.36          otherwise call "CamelCase" with "text", "$type";
    9.37      }
    9.38  }
    9.39  
    9.40 -function "toJavaDeclare" {
    9.41 -    param "type";
    9.42 -
    9.43 -    choose {
    9.44 -        when "$type='stringlist'" > Vector<String>
    9.45 -        when "$type='string'" error | # cannot declare "string"
    9.46 -        when "$type='message'" > Message
    9.47 -        when "$type='identity'" > _Identity
    9.48 -        when "$type='identitylist'" | # cannot declare "identitylist"
    9.49 -        when "$type='timestamp'" | # cannot declare "timestamp"
    9.50 -        when "$type='EncFormat'" > Message.EncFormat
    9.51 -        when "$type='bloblist'" | # cannot declare "bloblist"
    9.52 -        when "$type='stringpairlist'" | # cannot declare "stringpairlist"
    9.53 -        when "$type='message'" > Message
    9.54 -        when "$type='Color'" > Color
    9.55 -        when "$type='Rating'" > Rating
    9.56 -        //when "$type='bool'" > boolean
    9.57 -
    9.58 -        otherwise error | # cannot declare "«$type»"
    9.59 -    }
    9.60 -}
    9.61 -
    9.62  function "toSig" {
    9.63      param "type";
    9.64  
    9.65 @@ -50,19 +34,22 @@
    9.66          otherwise {
    9.67              > L
    9.68              choose {
    9.69 +                when "$type='timestamp'" > java/util/Date
    9.70 +
    9.71 +                when "$type='identity'" > org/pEp/jniadapter/_Identity
    9.72 +                when "$type='message'" > org/pEp/jniadapter/Message
    9.73 +
    9.74 +                when "$type='bloblist'" > java/util/Vector
    9.75 +                when "$type='identitylist'" > java/util/Vector
    9.76                  when "$type='stringlist'" > java/util/Vector
    9.77 -                when "$type='string'" error | # cannot declare "string"
    9.78 -                when "$type='message'" > org/pEp/jniadapter/Message
    9.79 -                when "$type='identity'" > org/pEp/jniadapter/_Identity
    9.80 -                when "$type='identitylist'" > java/util/Vector
    9.81 -                when "$type='timestamp'" > java/util/Date
    9.82 +                when "$type='stringpairlist'" > java/util/ArrayList
    9.83 +
    9.84 +                when "$type='Color'" > org/pEp/jniadapter/Color
    9.85 +                when "$type='DecryptFlags'" > org/pEp/jniadapter/DecryptFlags
    9.86                  when "$type='EncFormat'" > org/pEp/jniadapter/Message/EncFormat
    9.87 -                when "$type='bloblist'" > java/util/Vector
    9.88 -                when "$type='stringpairlist'" > java/util/ArrayList
    9.89 -                when "$type='message'" > org/pEp/jniadapter/Message
    9.90 -                when "$type='Color'" > org/pEp/jniadapter/Color
    9.91                  when "$type='Rating'" > org/pEp/jniadapter/Rating
    9.92 -                when "$type='DecryptFlags'" > org/pEp/jniadapter/DecryptFlags
    9.93 +
    9.94 +                otherwise error | # cannot declare "«$type»"
    9.95              }
    9.96              > ;
    9.97          }
    9.98 @@ -73,15 +60,15 @@
    9.99      param "type";
   9.100  
   9.101      choose {
   9.102 +        when "$type='bool'" > boolean
   9.103 +        when "$type='int'" > int
   9.104 +        when "$type='string'" > byte[]
   9.105 +
   9.106 +        when "$type='bloblist'" > Vector<_Blob>
   9.107 +        when "$type='identity'" > _Identity
   9.108 +        when "$type='identitylist'" > Vector<_Identity>
   9.109          when "$type='stringlist'" > Vector<byte[]>
   9.110          when "$type='stringpairlist'" > ArrayList<Pair<byte[], byte[]>>
   9.111 -        when "$type='string'" > byte[]
   9.112 -        when "$type='identity'" > _Identity
   9.113 -        when "$type='identitylist'" > Vector<_Identity>
   9.114 -        when "$type='bloblist'" > Vector<_Blob>
   9.115 -        when "$type='bool'" > boolean
   9.116 -        when "$type='DecryptFlags'" > DecryptFlags
   9.117 -        when "$type='SyncHandshakeResult'" > int
   9.118  
   9.119          otherwise call "toJava" with "type", "$type";
   9.120      }