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 --- 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 ++++++++++++++++++-------------------- 19 files changed, 92 insertions(+), 186 deletions(-) (limited to 'src') 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 -- cgit