Use UTF8, wide characters.

Author: simonjwright

README.md

@@ -97,8 +97,8 @@ These card types have not been implemented (yet):
 As a minor change, lower case can be used: `n001 42` is
 acceptable (it stores 42 into column 1).
 
-Multiplication and division can only be indicated by the `*`
-and `/` symbols (× and ÷ aren't supported).
+As in the [Fourmilab Java implementation][], multiplication can be
+indicated by `*` or `×`, division by `/` or `÷`.
 
 [Fourmilab Java implementation]: https://www.fourmilab.ch/babbage/cards.html
 

aes.gpr

@@ -37,7 +37,7 @@ project Aes is
    end Builder;
 
    package Compiler is
-      Switches := ("-gnatwa");
+      Switches := ("-gnatwa", "-gnatW8");
       case Opt is
          when "debug" =>
             Switches := Switches & ("-gnatqQafoy", "-O0");

bernouilli.ae

@@ -10,8 +10,8 @@
  A bug in operation 4 has been fixed (the comment requires V4/V5,
  AAL's code does V5/V4).
 
- Another bug was at operation 24: the value accumulated in V13 is *the
- negative* of the required value, see Note G Equation 9.
+ Another bug was at operation 24: the value accumulated in V13 is ×the
+ negative× of the required value, see Note G Equation 9.
 
  useful constants
 n001 1
@@ -29,7 +29,7 @@ n022   -00333333333
 n023    00238095238
 
  operation 1
-*
+×
 l002
 l003
 s004
@@ -49,14 +49,14 @@ l001
 s005
 
  operation 4, with bug fixed
-/
+÷
 z004
 <10
 z005
 s011'
 
  operation 5
-/
+÷
 z011
 l002
 s011'
@@ -79,14 +79,14 @@ l007
 s007
 
  operation 9
-/
+÷
 l006
 <10
 l007
 s011'
 
  operation 10, using b1 (v021)
-*
+×
 l021
 l011
 >10
@@ -117,14 +117,14 @@ z007
 s007
 
  operation 15
-/
+÷
 l006
 <10
 l007
 s008'
 
  operation 16
-*
+×
 z008
 z011
 >10
@@ -143,21 +143,21 @@ z007
 s007
 
  operation 19
-/
+÷
 l006
 <10
 l007
 s009'
 
  operation 20
-*
+×
 z009
 z011
 >10
 s011
 
  operation 21, using b3 (v022)
-*
+×
 l022
 l011
 >10
@@ -188,14 +188,14 @@ z007
 s007
 
  operation 15
-/
+÷
 l006
 <10
 l007
 s008'
 
  operation 16
-*
+×
 z008
 z011
 >10
@@ -214,21 +214,21 @@ z007
 s007
 
  operation 19
-/
+÷
 l006
 <10
 l007
 s009'
 
  operation 20
-*
+×
 z009
 z011
 >10
 s011
 
  operation 21 (NB using b5, v023 this time)
-*
+×
 l023
 l011
 >10
@@ -251,7 +251,8 @@ s010
 l024
 l013
 s024
- the result!!
+ the result!! calculations were scaled by 10 places
+a write numbers as 9.9999999999
 p
 
  operation 25

src/analytical_engine-annunciator_panel-command_line.adb

@@ -19,17 +19,17 @@
 --  program; see the files COPYING3 and COPYING.RUNTIME respectively.
 --  If not, see <http://www.gnu.org/licenses/>.
 
-with Ada.Text_IO; use Ada.Text_IO;
+with Ada.Wide_Text_IO; use Ada.Wide_Text_IO;
 package body Analytical_Engine.Annunciator_Panel.Command_Line is
 
-   procedure Log_Attendant_Message (Panel : Instance; Msg : String)
+   procedure Log_Attendant_Message (Panel : Instance; Msg : Wide_String)
    is
       pragma Unreferenced (Panel);
    begin
       Put_Line (Msg);
    end Log_Attendant_Message;
 
-   procedure Log_Trace_Message (Panel : Instance; Msg : String)
+   procedure Log_Trace_Message (Panel : Instance; Msg : Wide_String)
    is
       pragma Unreferenced (Panel);
    begin

src/analytical_engine-annunciator_panel-command_line.ads

@@ -24,10 +24,10 @@ package Analytical_Engine.Annunciator_Panel.Command_Line is
    type Instance is new Annunciator_Panel.Instance with private;
 
    overriding
-   procedure Log_Attendant_Message (Panel : Instance; Msg : String);
+   procedure Log_Attendant_Message (Panel : Instance; Msg : Wide_String);
 
    overriding
-   procedure Log_Trace_Message (Panel : Instance; Msg : String);
+   procedure Log_Trace_Message (Panel : Instance; Msg : Wide_String);
 
 private
 

src/analytical_engine-annunciator_panel.ads

@@ -26,10 +26,10 @@ package Analytical_Engine.Annunciator_Panel is
    type Class_P is access all Instance'Class;
 
    procedure Log_Attendant_Message
-     (This : Instance; Msg : String) is abstract;
+     (This : Instance; Msg : Wide_String) is abstract;
 
    procedure Log_Trace_Message
-     (This : Instance; Msg : String) is abstract;
+     (This : Instance; Msg : Wide_String) is abstract;
 
    procedure Set_Tracing (This : in out Instance; To : Boolean);
 

src/analytical_engine-card-attendant_request.adb

@@ -19,15 +19,11 @@
 --  program; see the files COPYING3 and COPYING.RUNTIME respectively.
 --  If not, see <http://www.gnu.org/licenses/>.
 
---  with Ada.Strings.Unbounded;
---  private with Ada.Finalization;
---  private with Analytical_Engine.Mill;
---  private with Analytical_Engine.Store;
---  private with GNATCOLL.GMP.Integers;
---  private with System;
-
---  with Ada.Strings.Fixed;
+with Ada.Characters.Conversions;
+with Ada.Strings.Wide_Unbounded;
+
 with Analytical_Engine.Framework;
+
 with GNAT.Regpat;
 
 package body Analytical_Engine.Card.Attendant_Request is
@@ -50,44 +46,45 @@ package body Analytical_Engine.Card.Attendant_Request is
 
    Max_Parens : constant := 10; -- overkill
 
-   function Read (From : String) return Card'Class is
-      --  First : Positive;
-      --  Last : Natural;
+   function "+" (Item : Wide_String) return String
+     is (Ada.Characters.Conversions.To_String (Item, Substitute => ' '));
+
+   function Read (From : Wide_String) return Card'Class is
       Matches : GNAT.Regpat.Match_Array (0 .. Max_Parens);
       use type GNAT.Regpat.Match_Location;
    begin
-      GNAT.Regpat.Match (Picture_Matcher, From, Matches);
+      GNAT.Regpat.Match (Picture_Matcher, +From, Matches);
       if Matches (0) /= GNAT.Regpat.No_Match then
          return C : Picture_Card do
-            C.Source := Ada.Strings.Unbounded.To_Unbounded_String (From);
+            C.Source := To_Unbounded_Wide_String (From);
             C.Picture :=
-              Ada.Strings.Unbounded.To_Unbounded_String
+              To_Unbounded_Wide_String
                 (From (Matches (1).First .. Matches (1).Last));
          end return;
       end if;
 
-      GNAT.Regpat.Match (Row_Column_Matcher, From, Matches);
+      GNAT.Regpat.Match (Row_Column_Matcher, +From, Matches);
       if Matches (0) /= GNAT.Regpat.No_Match then
          return C : Row_Column_Card do
-            C.Source := Ada.Strings.Unbounded.To_Unbounded_String (From);
+            C.Source := To_Unbounded_Wide_String (From);
             C.In_Rows := From (Matches (1).First .. Matches (1).Last) = "rows";
          end return;
       end if;
 
-      GNAT.Regpat.Match (Annotation_Matcher, From, Matches);
+      GNAT.Regpat.Match (Annotation_Matcher, +From, Matches);
       if Matches (0) /= GNAT.Regpat.No_Match then
          return C : Annotation_Card do
-            C.Source := Ada.Strings.Unbounded.To_Unbounded_String (From);
+            C.Source := To_Unbounded_Wide_String (From);
             C.Annotation :=
-              Ada.Strings.Unbounded.To_Unbounded_String
+              To_Unbounded_Wide_String
                 (From (Matches (1).First .. Matches (1).Last));
          end return;
       end if;
 
-      GNAT.Regpat.Match (New_Line_Matcher, From, Matches);
+      GNAT.Regpat.Match (New_Line_Matcher, +From, Matches);
       if Matches (0) /= GNAT.Regpat.No_Match then
          return C : New_Line_Card do
-            C.Source := Ada.Strings.Unbounded.To_Unbounded_String (From);
+            C.Source := To_Unbounded_Wide_String (From);
          end return;
       end if;
       raise Card_Error
@@ -119,14 +116,15 @@ package body Analytical_Engine.Card.Attendant_Request is
    procedure Execute (C : Annotation_Card;
                       In_The_Framework : in out Framework.Instance) is
    begin
-      In_The_Framework.Output.Output (To_String (C.Annotation));
+      In_The_Framework.Output.Output (To_Wide_String (C.Annotation));
    end Execute;
 
    procedure Execute (C : New_Line_Card;
                       In_The_Framework : in out Framework.Instance) is
       pragma Unreferenced (C);
+      use Ada.Characters.Conversions;
    begin
-      In_The_Framework.Output.Output ((1 => ASCII.LF));
+      In_The_Framework.Output.Output ((1 => To_Wide_Character (ASCII.LF)));
    end Execute;
 
    --     Not_A_Request);

src/analytical_engine-card-attendant_request.ads

@@ -33,7 +33,7 @@ private package Analytical_Engine.Card.Attendant_Request is
 
    type Card is abstract new Analytical_Engine.Card.Card with private;
 
-   function Read (From : String) return Card'Class
+   function Read (From : Wide_String) return Card'Class
    with Pre => From'Length > 0
                and then (From (From'First) = 'A'
                            or else From (From'First) = 'a');
@@ -51,7 +51,7 @@ private
    --     Decimal_Place_Expansion,
 
    type Picture_Card is new Card with record
-      Picture : Ada.Strings.Unbounded.Unbounded_String;
+      Picture : Ada.Strings.Wide_Unbounded.Unbounded_Wide_String;
    end record;
    overriding
    procedure Execute (C : Picture_Card;
@@ -67,7 +67,7 @@ private
                       In_The_Framework : in out Framework.Instance);
 
    type Annotation_Card is new Card with record
-      Annotation : Ada.Strings.Unbounded.Unbounded_String;
+      Annotation : Ada.Strings.Wide_Unbounded.Unbounded_Wide_String;
    end record;
    overriding
    procedure Execute (C : Annotation_Card;