branch: master commit 029547200702d50b30ab078745c6fd10f5e16c2b Author: Stephen Leake <stephen_le...@stephe-leake.org> Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Forgot some new files in wisi * packages/wisi/wisi.el: Bump version to 3.1.3 for packaging fix. * packages/wisi/sal-gen_unconstrained_array_image.adb: New file. * packages/wisi/sal-gen_unconstrained_array_image.ads: New file. * packages/wisi/sal-gen_unconstrained_array_image_aux.adb: New file. * packages/wisi/sal-gen_unconstrained_array_image_aux.ads: New file. --- .../wisi/sal-gen_unconstrained_array_image.adb | 34 ++++++++++++++++++++++ .../wisi/sal-gen_unconstrained_array_image.ads | 24 +++++++++++++++ .../wisi/sal-gen_unconstrained_array_image_aux.adb | 33 +++++++++++++++++++++ .../wisi/sal-gen_unconstrained_array_image_aux.ads | 25 ++++++++++++++++ packages/wisi/wisi.el | 2 +- 5 files changed, 117 insertions(+), 1 deletion(-) diff --git a/packages/wisi/sal-gen_unconstrained_array_image.adb b/packages/wisi/sal-gen_unconstrained_array_image.adb new file mode 100644 index 0000000..7ea1c83 --- /dev/null +++ b/packages/wisi/sal-gen_unconstrained_array_image.adb @@ -0,0 +1,34 @@ +-- Abstract : +-- +-- See spec. +-- +-- Copyright (C) 2019 Free Software Foundation, Inc. +-- +-- This library is free software; you can redistribute it and/or modify it +-- under terms of the GNU General Public License as published by the Free +-- Software Foundation; either version 3, or (at your option) any later +-- version. This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- +-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-- As a special exception under Section 7 of GPL version 3, you are granted +-- additional permissions described in the GCC Runtime Library Exception, +-- version 3.1, as published by the Free Software Foundation. + +pragma License (Modified_GPL); + +with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; +function SAL.Gen_Unconstrained_Array_Image (Item : in Array_Type) return String +is + Result : Unbounded_String := To_Unbounded_String ("("); +begin + for I in Item'Range loop + Result := Result & Element_Image (Item (I)); + if I = Item'Last then + Result := Result & ")"; + else + Result := Result & ", "; + end if; + end loop; + return To_String (Result); +end SAL.Gen_Unconstrained_Array_Image; diff --git a/packages/wisi/sal-gen_unconstrained_array_image.ads b/packages/wisi/sal-gen_unconstrained_array_image.ads new file mode 100644 index 0000000..226ba00 --- /dev/null +++ b/packages/wisi/sal-gen_unconstrained_array_image.ads @@ -0,0 +1,24 @@ +-- Abstract : +-- +-- Image for unconstrained Ada array types +-- +-- Copyright (C) 2019 Free Software Foundation, Inc. +-- +-- This library is free software; you can redistribute it and/or modify it +-- under terms of the GNU General Public License as published by the Free +-- Software Foundation; either version 3, or (at your option) any later +-- version. This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- +-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-- As a special exception under Section 7 of GPL version 3, you are granted +-- additional permissions described in the GCC Runtime Library Exception, +-- version 3.1, as published by the Free Software Foundation. + +pragma License (Modified_GPL); +generic + type Index_Type is (<>); + type Element_Type is private; + type Array_Type is array (Index_Type range <>) of Element_Type; + with function Element_Image (Item : in Element_Type) return String; +function SAL.Gen_Unconstrained_Array_Image (Item : in Array_Type) return String; diff --git a/packages/wisi/sal-gen_unconstrained_array_image_aux.adb b/packages/wisi/sal-gen_unconstrained_array_image_aux.adb new file mode 100644 index 0000000..9e4c5cd --- /dev/null +++ b/packages/wisi/sal-gen_unconstrained_array_image_aux.adb @@ -0,0 +1,33 @@ +-- Abstract : +-- +-- See spec. +-- +-- Copyright (C) 2019, 2020 Free Software Foundation, Inc. +-- +-- This library is free software; you can redistribute it and/or modify it +-- under terms of the GNU General Public License as published by the Free +-- Software Foundation; either version 3, or (at your option) any later +-- version. This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- +-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-- As a special exception under Section 7 of GPL version 3, you are granted +-- additional permissions described in the GCC Runtime Library Exception, +-- version 3.1, as published by the Free Software Foundation. + +pragma License (Modified_GPL); + +with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; +function SAL.Gen_Unconstrained_Array_Image_Aux (Item : in Array_Type; Aux : in Aux_Data) return String +is + Result : Unbounded_String := To_Unbounded_String ("("); +begin + for I in Item'Range loop + Result := Result & Element_Image (Item (I), Aux); + if I < Item'Last then + Result := Result & ", "; + end if; + end loop; + Result := Result & ")"; + return To_String (Result); +end SAL.Gen_Unconstrained_Array_Image_Aux; diff --git a/packages/wisi/sal-gen_unconstrained_array_image_aux.ads b/packages/wisi/sal-gen_unconstrained_array_image_aux.ads new file mode 100644 index 0000000..ad2b9cb --- /dev/null +++ b/packages/wisi/sal-gen_unconstrained_array_image_aux.ads @@ -0,0 +1,25 @@ +-- Abstract : +-- +-- Image for unconstrained Ada array types +-- +-- Copyright (C) 2019, 2020 Free Software Foundation, Inc. +-- +-- This library is free software; you can redistribute it and/or modify it +-- under terms of the GNU General Public License as published by the Free +-- Software Foundation; either version 3, or (at your option) any later +-- version. This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- +-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-- As a special exception under Section 7 of GPL version 3, you are granted +-- additional permissions described in the GCC Runtime Library Exception, +-- version 3.1, as published by the Free Software Foundation. + +pragma License (Modified_GPL); +generic + type Index_Type is (<>); + type Element_Type is private; + type Array_Type is array (Index_Type range <>) of Element_Type; + type Aux_Data (<>) is private; + with function Element_Image (Item : in Element_Type; Aux : in Aux_Data) return String; +function SAL.Gen_Unconstrained_Array_Image_Aux (Item : in Array_Type; Aux : in Aux_Data) return String; diff --git a/packages/wisi/wisi.el b/packages/wisi/wisi.el index 2032f93..a7b88ff 100644 --- a/packages/wisi/wisi.el +++ b/packages/wisi/wisi.el @@ -7,7 +7,7 @@ ;; Keywords: parser ;; indentation ;; navigation -;; Version: 3.1.2 +;; Version: 3.1.3 ;; package-requires: ((emacs "25.0") (seq "2.20")) ;; URL: http://stephe-leake.org/ada/wisitoken.html ;;