From 61f5d4089bf22e03e582bc37a4133d64412fa641 Mon Sep 17 00:00:00 2001 From: konrad Date: Sat, 25 Dec 2010 11:38:25 +0000 Subject: [PATCH] revert to LGPL, make sure copyright texts are correct git-svn-id: https://silmor.de/svn/softmagic/elam/trunk@677 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- COPYING.LGPL | 165 +++++++++++++++ README | 6 +- TODO | 5 - doc/index.html | 1 + doc/lgplv3.html | 514 ++++++++++++++++++++++++++++++++++++++++++++++ src/elamexpression.cpp | 5 + src/elamfloatengine.h | 2 +- src/elamintengine.cpp | 2 +- src/elamstringengine.cpp | 2 +- 9 files changed, 690 insertions(+), 12 deletions(-) create mode 100644 COPYING.LGPL create mode 100644 doc/lgplv3.html diff --git a/COPYING.LGPL b/COPYING.LGPL new file mode 100644 index 0000000..fc8a5de --- /dev/null +++ b/COPYING.LGPL @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/README b/README index 071f784..3ab52f9 100644 --- a/README +++ b/README @@ -4,10 +4,8 @@ README for ELAM ELAM = Elementary Logic and Arithmetic Machine (c) Konrad Rosenbaum, 2010 -protected under the GNU GPL version 3 or at your option any newer -see COPYING for details - -Hint: I really mean GPL, not LGPL. You can't use this library in proprietary code! +protected under the GNU LGPL version 3 or at your option any newer +see COPYING(.LGPL) for details This engine can be fed simple arithmetic formulas and will calculate their result, similar to those used in languages like C or Pascal. It is not able diff --git a/TODO b/TODO index 44345e4..86a3d76 100644 --- a/TODO +++ b/TODO @@ -5,7 +5,6 @@ TODO for ELAM Engine --------- -* Expression ordering and execution * function overloading Default Library @@ -14,7 +13,3 @@ Default Library int: abs(...) float: abs, round, comparison operators - -bool - -string diff --git a/doc/index.html b/doc/index.html index 8b1fe2a..3810a33 100644 --- a/doc/index.html +++ b/doc/index.html @@ -11,6 +11,7 @@
+GNU Lesser General Public License: as text, as HTML
GNU General Public License: as text, as HTML \ No newline at end of file diff --git a/doc/lgplv3.html b/doc/lgplv3.html new file mode 100644 index 0000000..d2add1d --- /dev/null +++ b/doc/lgplv3.html @@ -0,0 +1,514 @@ + + + + + + + + + + + + +GNU Lesser General Public License v3.0 - GNU Project - Free Software Foundation (FSF) + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + +

GNU Lesser General Public License

+ + + + + +

This license is a set of additional permissions added to version 3 of the GNU General Public +License. For more information about how to release your own software +under this license, please see our page +of instructions.

+ +
+ + +
+

GNU LESSER GENERAL PUBLIC LICENSE

+

Version 3, 29 June 2007

+ +

Copyright © 2007 Free Software Foundation, Inc. + <http://fsf.org/>

+ Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed.

+ +

This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below.

+ +

0. Additional Definitions.

+ +

As used herein, “this License” refers to version 3 of the GNU Lesser +General Public License, and the “GNU GPL” refers to version 3 of the GNU +General Public License.

+ +

“The Library” refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below.

+ +

An “Application” is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library.

+ +

A “Combined Work” is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the “Linked +Version”.

+ +

The “Minimal Corresponding Source” for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version.

+ +

The “Corresponding Application Code” for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work.

+ +

1. Exception to Section 3 of the GNU GPL.

+ +

You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL.

+ +

2. Conveying Modified Versions.

+ +

If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version:

+ +
    +
  • a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or
    • + +
  • b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy.
    • +
+ +

3. Object Code Incorporating Material from Library Header Files.

+ +

The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following:

+ +
    +
  • a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License.
    • + +
  • b) Accompany the object code with a copy of the GNU GPL and this license + document.
    • +
+ +

4. Combined Works.

+ +

You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following:

+ +
    +
  • a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License.
    • + +
  • b) Accompany the Combined Work with a copy of the GNU GPL and this license + document.
    • + +
  • c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document.
    • + +
  • d) Do one of the following: + +
      +
    • 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.
      • + +
    • 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version.
      • +
    • + +
  • e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.)
    • +
+ +

5. Combined Libraries.

+ +

You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following:

+ +
    +
  • a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License.
    • + +
  • b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work.
    • +
+ +

6. Revised Versions of the GNU Lesser General Public License.

+ +

The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns.

+ +

Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License “or any later version” +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation.

+ +

If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library.

+ +
+
+ + +
+ + + +
+ +

The Free Software +Foundation is the principal organizational sponsor of the GNU Operating System. Our +mission is to preserve, protect and promote the freedom to use, study, +copy, modify, and redistribute computer software, and to defend the +rights of Free Software users.

+ +

Support GNU and the FSF by buying manuals and gear, joining the FSF as an associate +member or by making a +donation.

+ +

back to top

+ + + + +
+ + +
+ + + + + +
+

Translations of this page

+ + + + + + + + + + + + + + + + + +
+
+ + diff --git a/src/elamexpression.cpp b/src/elamexpression.cpp index 587cfea..799ad8e 100644 --- a/src/elamexpression.cpp +++ b/src/elamexpression.cpp @@ -1,3 +1,8 @@ +//ELAM expression implementation +// +// (c) Konrad Rosenbaum, 2010 +// protected under the GNU LGPL v3 or at your option any newer + #include "elamexpression.h" #include diff --git a/src/elamfloatengine.h b/src/elamfloatengine.h index 4c49cf1..b850789 100644 --- a/src/elamfloatengine.h +++ b/src/elamfloatengine.h @@ -1,4 +1,4 @@ -//ELAM integer engine header +//ELAM floating point engine header // // (c) Konrad Rosenbaum, 2010 // protected under the GNU LGPL v3 or at your option any newer diff --git a/src/elamintengine.cpp b/src/elamintengine.cpp index d75fd16..41144a0 100644 --- a/src/elamintengine.cpp +++ b/src/elamintengine.cpp @@ -1,4 +1,4 @@ -// ELAM int engine definition implementation +// ELAM floating point engine definition implementation // // (c) Konrad Rosenbaum, 2010 // protected under the GNU LGPL v3 or at your option any newer diff --git a/src/elamstringengine.cpp b/src/elamstringengine.cpp index a847d19..3b7bce9 100644 --- a/src/elamstringengine.cpp +++ b/src/elamstringengine.cpp @@ -1,4 +1,4 @@ -// ELAM int engine definition implementation +// ELAM string engine definition implementation // // (c) Konrad Rosenbaum, 2010 // protected under the GNU LGPL v3 or at your option any newer -- 1.7.2.5