From 18b2b85a28c4e8d59cd564612bb7f60019c53051 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 3 Jul 2017 16:18:02 +1000 Subject: Changed license to Unlicense, improved with/use code style --- license.txt | 121 ------------------------------------------ src/bundles-containers.adb | 14 ++--- src/bundles-containers.ads | 12 ++--- src/bundles.adb | 8 --- src/bundles.ads | 21 ++++---- src/candidates-containers.adb | 14 ++--- src/candidates-containers.ads | 12 ++--- src/candidates.adb | 10 +--- src/candidates.ads | 10 +--- src/csv.adb | 8 --- src/csv.ads | 15 +++--- src/election.adb | 27 +++++----- src/election.ads | 21 ++++---- src/preferences.adb | 12 ++--- src/preferences.ads | 13 ++--- src/rationals.adb | 8 --- src/rationals.ads | 8 --- src/simple_time.adb | 17 +++--- src/simple_time.ads | 10 +--- src/stv.adb | 38 +++++++------ unlicense.txt | 24 +++++++++ 21 files changed, 116 insertions(+), 307 deletions(-) delete mode 100644 license.txt create mode 100644 unlicense.txt diff --git a/license.txt b/license.txt deleted file mode 100644 index 0e259d4..0000000 --- a/license.txt +++ /dev/null @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff --git a/src/bundles-containers.adb b/src/bundles-containers.adb index 2dc9712..1e566fa 100644 --- a/src/bundles-containers.adb +++ b/src/bundles-containers.adb @@ -1,16 +1,10 @@ -with Ada.Strings.Unbounded; -with Ada.Text_IO; -with CSV; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Strings.Unbounded, + Ada.Text_IO, + CSV; package body Bundles.Containers is diff --git a/src/bundles-containers.ads b/src/bundles-containers.ads index f892b5c..c12aa39 100644 --- a/src/bundles-containers.ads +++ b/src/bundles-containers.ads @@ -1,15 +1,9 @@ -with Ada.Containers.Ordered_Maps; -with Ada.Containers.Vectors; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Containers.Ordered_Maps, + Ada.Containers.Vectors; generic diff --git a/src/bundles.adb b/src/bundles.adb index a6e1472..6734bbc 100644 --- a/src/bundles.adb +++ b/src/bundles.adb @@ -1,13 +1,5 @@ --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ - - package body Bundles is diff --git a/src/bundles.ads b/src/bundles.ads index 6d95693..603d164 100644 --- a/src/bundles.ads +++ b/src/bundles.ads @@ -1,17 +1,14 @@ -with Preferences; -with Candidates.Containers; -with Rationals; -private with Ada.Containers.Vectors; - - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +with + + Preferences, + Candidates.Containers, + Rationals; + +private with + + Ada.Containers.Vectors; generic diff --git a/src/candidates-containers.adb b/src/candidates-containers.adb index a69a3a2..9dc7f74 100644 --- a/src/candidates-containers.adb +++ b/src/candidates-containers.adb @@ -1,16 +1,10 @@ -with Ada.Containers.Vectors; -with Ada.Text_IO; -with CSV; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Containers.Vectors, + Ada.Text_IO, + CSV; package body Candidates.Containers is diff --git a/src/candidates-containers.ads b/src/candidates-containers.ads index f070b2e..3d9d3f9 100644 --- a/src/candidates-containers.ads +++ b/src/candidates-containers.ads @@ -1,15 +1,9 @@ -with Ada.Containers.Ordered_Maps; -with Ada.Containers.Ordered_Sets; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Containers.Ordered_Maps, + Ada.Containers.Ordered_Sets; package Candidates.Containers is diff --git a/src/candidates.adb b/src/candidates.adb index b95e480..b763334 100644 --- a/src/candidates.adb +++ b/src/candidates.adb @@ -1,14 +1,8 @@ -with CSV; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + CSV; package body Candidates is diff --git a/src/candidates.ads b/src/candidates.ads index c0c310f..7df961d 100644 --- a/src/candidates.ads +++ b/src/candidates.ads @@ -1,14 +1,8 @@ -private with Ada.Strings.Unbounded; +private with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Strings.Unbounded; package Candidates is diff --git a/src/csv.adb b/src/csv.adb index 5e7eec5..6bc5880 100644 --- a/src/csv.adb +++ b/src/csv.adb @@ -1,13 +1,5 @@ --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ - - package body CSV is diff --git a/src/csv.ads b/src/csv.ads index 4815a17..d2360c2 100644 --- a/src/csv.ads +++ b/src/csv.ads @@ -1,16 +1,13 @@ -with Ada.Strings.Unbounded; -with Ada.Containers.Vectors; -use type Ada.Strings.Unbounded.Unbounded_String; +with + Ada.Strings.Unbounded, + Ada.Containers.Vectors; --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +use type + + Ada.Strings.Unbounded.Unbounded_String; generic diff --git a/src/election.adb b/src/election.adb index 298c82b..181da64 100644 --- a/src/election.adb +++ b/src/election.adb @@ -1,18 +1,19 @@ -with Ada.Strings.Fixed; -with Ada.Strings.Unbounded; -with Ada.Text_IO; use Ada.Text_IO; -with Rationals; -use type Rationals.Fraction; - - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +with + + Ada.Strings.Fixed, + Ada.Strings.Unbounded, + Ada.Text_IO, + Rationals; + +use + + Ada.Text_IO; + +use type + + Rationals.Fraction; package body Election is diff --git a/src/election.ads b/src/election.ads index 3da5e5a..0bed2da 100644 --- a/src/election.ads +++ b/src/election.ads @@ -1,17 +1,14 @@ -with Candidates.Containers; -with Bundles.Containers; -private with Ada.Containers.Vectors; -private with Rationals; - - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +with + + Candidates.Containers, + Bundles.Containers; + +private with + + Ada.Containers.Vectors, + Rationals; generic diff --git a/src/preferences.adb b/src/preferences.adb index 7dd6c95..36cc5ea 100644 --- a/src/preferences.adb +++ b/src/preferences.adb @@ -1,15 +1,9 @@ -with Ada.Strings.Unbounded; -with Ada.Strings.Maps; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Strings.Unbounded, + Ada.Strings.Maps; package body Preferences is diff --git a/src/preferences.ads b/src/preferences.ads index 4f0700d..d38b6ec 100644 --- a/src/preferences.ads +++ b/src/preferences.ads @@ -1,15 +1,12 @@ -with Candidates.Containers; -private with Ada.Containers; +with + Candidates.Containers; --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +private with + + Ada.Containers; generic diff --git a/src/rationals.adb b/src/rationals.adb index c50c479..53c23e3 100644 --- a/src/rationals.adb +++ b/src/rationals.adb @@ -1,13 +1,5 @@ --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ - - with Interfaces.C; diff --git a/src/rationals.ads b/src/rationals.ads index fb7c5b5..bfd512f 100644 --- a/src/rationals.ads +++ b/src/rationals.ads @@ -1,13 +1,5 @@ --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ - - private with Ada.Finalization, diff --git a/src/simple_time.adb b/src/simple_time.adb index 6dab6bc..6c31a89 100644 --- a/src/simple_time.adb +++ b/src/simple_time.adb @@ -1,16 +1,15 @@ -with Ada.Calendar; use Ada.Calendar; -with Ada.Strings; use Ada.Strings; -with Ada.Strings.Fixed; use Ada.Strings.Fixed; +with + Ada.Calendar, + Ada.Strings.Fixed; --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +use + + Ada.Calendar, + Ada.Strings, + Ada.Strings.Fixed; package body Simple_Time is diff --git a/src/simple_time.ads b/src/simple_time.ads index cde53b0..1a0b61b 100644 --- a/src/simple_time.ads +++ b/src/simple_time.ads @@ -1,14 +1,8 @@ -with Ada.Calendar; +with - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ + Ada.Calendar; package Simple_Time is diff --git a/src/stv.adb b/src/stv.adb index 0b07891..a83689f 100644 --- a/src/stv.adb +++ b/src/stv.adb @@ -1,25 +1,23 @@ -with GNAT.Command_Line; -with GNAT.Strings; -with Ada.Command_Line; -with Ada.Text_IO; use Ada.Text_IO; -with Ada.Directories; -with Ada.Strings.Unbounded; -with Simple_Time; -with CSV; -with Candidates.Containers; -with Preferences; -with Bundles.Containers; -with Election; - - --- This source is licensed under Creative Commons CC0 v1.0. --- --- To read the full text, see license.txt in the main directory of this repository --- or go to https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt --- --- For a human readable summary, go to https://creativecommons.org/publicdomain/zero/1.0/ +with + + GNAT.Command_Line, + GNAT.Strings, + Ada.Command_Line, + Ada.Text_IO, + Ada.Directories, + Ada.Strings.Unbounded, + Simple_Time, + CSV, + Candidates.Containers, + Preferences, + Bundles.Containers, + Election; + +use + + Ada.Text_IO; procedure STV is diff --git a/unlicense.txt b/unlicense.txt new file mode 100644 index 0000000..68a49da --- /dev/null +++ b/unlicense.txt @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to -- cgit