Overview
Comment: | smaz-tools: new primitive to output Ada code for a dictionary |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
8a9dabe25e97b7b75e83be708e0e41ca |
User & Date: | nat on 2016-09-06 21:24:39 |
Other Links: | manifest | tags |
Context
2016-09-07
| ||
18:45 | tools/smaz: new tool providing a CLI interface for Natools.Smaz.Tools check-in: bae1665fad user: nat tags: trunk | |
2016-09-06
| ||
21:24 | smaz-tools: new primitive to output Ada code for a dictionary check-in: 8a9dabe25e user: nat tags: trunk | |
2016-09-05
| ||
21:59 | smaz-tools: add a Dictionary constructor from a word list check-in: fd239bbe25 user: nat tags: trunk | |
Changes
Modified src/natools-smaz-tools.adb from [b9e061db75] to [3cac70d086].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | package body Natools.Smaz.Tools is package Sx renames Natools.S_Expressions; function Dummy_Hash (Value : String) return Natural; -- Placeholder for Hash member, always raises Program_Error ------------------------------ -- Local Helper Subprograms -- ------------------------------ function Dummy_Hash (Value : String) return Natural is pragma Unreferenced (Value); begin raise Program_Error with "Dummy_Hash called"; return 0; end Dummy_Hash; ---------------------- -- Public Interface -- ---------------------- procedure Read_List (List : out String_Lists.List; Descriptor : in out S_Expressions.Descriptor'Class) is use type Sx.Events.Event; Event : Sx.Events.Event := Descriptor.Current_Event; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | package body Natools.Smaz.Tools is package Sx renames Natools.S_Expressions; function Dummy_Hash (Value : String) return Natural; -- Placeholder for Hash member, always raises Program_Error function Image (B : Boolean) return String; -- Return correctly-cased image of B ------------------------------ -- Local Helper Subprograms -- ------------------------------ function Dummy_Hash (Value : String) return Natural is pragma Unreferenced (Value); begin raise Program_Error with "Dummy_Hash called"; return 0; end Dummy_Hash; function Image (B : Boolean) return String is begin if B then return "True"; else return "False"; end if; end Image; ---------------------- -- Public Interface -- ---------------------- procedure Print_Dictionary_In_Ada (Dict : in Dictionary; Hash_Image : in String := "TODO"; Max_Width : in Positive := 70; First_Prefix : in String := " := ("; Prefix : in String := " "; Half_Indent : in String := " ") is procedure Append_Entity (Buffer : in out String; Last : in out Natural; Entity : in String); function Double_Quote (S : String; Count : Natural) return String; function Offsets_Suffix (I : Ada.Streams.Stream_Element) return String; function Strip_Image (S : String) return String; function Values_Separator (I : Positive) return String; procedure Append_Entity (Buffer : in out String; Last : in out Natural; Entity : in String) is begin if Last + 1 + Entity'Length <= Buffer'Last then Buffer (Last + 1) := ' '; Buffer (Last + 2 .. Last + 1 + Entity'Length) := Entity; Last := Last + 1 + Entity'Length; else Put_Line (Buffer (Buffer'First .. Last)); Last := Buffer'First + Prefix'Length - 1; Buffer (Last + 1 .. Last + Half_Indent'Length) := Half_Indent; Last := Last + Half_Indent'Length; Buffer (Last + 1 .. Last + Entity'Length) := Entity; Last := Last + Entity'Length; end if; end Append_Entity; function Double_Quote (S : String; Count : Natural) return String is begin if Count = 0 then return S; else return Quoted : String (1 .. S'Length + Count) do declare O : Positive := Quoted'First; begin for I in S'Range loop Quoted (O) := S (I); O := O + 1; if S (I) = '"' then Quoted (O) := S (I); O := O + 1; end if; end loop; end; end return; end if; end Double_Quote; function Offsets_Suffix (I : Ada.Streams.Stream_Element) return String is begin if I < Dict.Offsets'Last then return ","; else return "),"; end if; end Offsets_Suffix; function Strip_Image (S : String) return String is begin if S'Length > 0 and then S (S'First) = ' ' then return S (S'First + 1 .. S'Last); else return S; end if; end Strip_Image; function Values_Separator (I : Positive) return String is begin if I > Dict.Values'First then return "& "; else return ""; end if; end Values_Separator; Line_Buffer : String (1 .. Max_Width + Prefix'Length); Buffer_Last : Natural; begin Put_Line (First_Prefix & "Dict_Last =>" & Ada.Streams.Stream_Element'Image (Dict.Dict_Last) & ','); Put_Line (Prefix & "String_Size =>" & Natural'Image (Dict.String_Size) & ','); Put_Line (Prefix & "Variable_Length_Verbatim => " & Image (Dict.Variable_Length_Verbatim) & ','); Put_Line (Prefix & "Max_Word_Length =>" & Natural'Image (Dict.Max_Word_Length) & ','); Line_Buffer (1 .. Prefix'Length) := Prefix; Line_Buffer (Prefix'Length + 1 .. Prefix'Length + 11) := "Offsets => "; Buffer_Last := Prefix'Length + 11; for I in Dict.Offsets'Range loop Append_Entity (Line_Buffer, Buffer_Last, Strip_Image (Positive'Image (Dict.Offsets (I)) & Offsets_Suffix (I))); if I = Dict.Offsets'First then Line_Buffer (Prefix'Length + 12) := '('; end if; end loop; Put_Line (Line_Buffer (Line_Buffer'First .. Buffer_Last)); Line_Buffer (Prefix'Length + 1 .. Prefix'Length + 9) := "Values =>"; Buffer_Last := Prefix'Length + 9; declare I : Positive := Dict.Values'First; First, Last : Positive; Quote_Count : Natural; begin Values_Loop : while I <= Dict.Values'Last loop Add_Unprintable : while Dict.Values (I) not in ' ' .. '~' loop Append_Entity (Line_Buffer, Buffer_Last, Values_Separator (I) & Character'Image (Dict.Values (I))); I := I + 1; exit Values_Loop when I > Dict.Values'Last; end loop Add_Unprintable; First := I; Quote_Count := 0; Find_Printable_Substring : loop if Dict.Values (I) = '"' then Quote_Count := Quote_Count + 1; end if; I := I + 1; exit Find_Printable_Substring when I > Dict.Values'Last or else Dict.Values (I) not in ' ' .. '~'; end loop Find_Printable_Substring; Last := I - 1; Split_Lines : loop declare Partial_Quote_Count : Natural := 0; Partial_Width : Natural := 0; Partial_Last : Natural := First - 1; Sep : constant String := Values_Separator (First); Available_Length : constant Natural := (if Line_Buffer'Last > Buffer_Last + Sep'Length + 4 then Line_Buffer'Last - Buffer_Last - Sep'Length - 4 else Line_Buffer'Length - Prefix'Length - Half_Indent'Length - Sep'Length - 3); begin if 1 + Last - First + Quote_Count < Available_Length then Append_Entity (Line_Buffer, Buffer_Last, Sep & '"' & Double_Quote (Dict.Values (First .. Last), Quote_Count) & '"'); exit Split_Lines; else Count_Quotes : loop if Dict.Values (Partial_Last + 1) = '"' then exit Count_Quotes when Partial_Width + 2 > Available_Length; Partial_Width := Partial_Width + 1; Partial_Quote_Count := Partial_Quote_Count + 1; else exit Count_Quotes when Partial_Width + 1 > Available_Length; end if; Partial_Width := Partial_Width + 1; Partial_Last := Partial_Last + 1; end loop Count_Quotes; Append_Entity (Line_Buffer, Buffer_Last, Sep & '"' & Double_Quote (Dict.Values (First .. Partial_Last), Partial_Quote_Count) & '"'); First := Partial_Last + 1; Quote_Count := Quote_Count - Partial_Quote_Count; end if; end; end loop Split_Lines; end loop Values_Loop; Put_Line (Line_Buffer (Line_Buffer'First .. Buffer_Last) & ','); end; Line_Buffer (Prefix'Length + 1 .. Prefix'Length + 7) := "Hash =>"; Buffer_Last := Prefix'Length + 7; Append_Entity (Line_Buffer, Buffer_Last, Hash_Image & ");"); Put_Line (Line_Buffer (Line_Buffer'First .. Buffer_Last)); end Print_Dictionary_In_Ada; procedure Read_List (List : out String_Lists.List; Descriptor : in out S_Expressions.Descriptor'Class) is use type Sx.Events.Event; Event : Sx.Events.Event := Descriptor.Current_Event; |
︙ | ︙ |
Modified src/natools-smaz-tools.ads from [41ef1854d1] to [95f4b3e44b].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 | return Dictionary with Pre => String_Lists.Length (List) in 1 .. Ada.Containers.Count_Type (Ada.Streams.Stream_Element'Last); -- Build a Dictionary object from a string list -- Note that Hash is set to a placeholder which uncinditionnally -- raises Program_Error when called. end Natools.Smaz.Tools; | > > > > > > > > > > > > > > > > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | return Dictionary with Pre => String_Lists.Length (List) in 1 .. Ada.Containers.Count_Type (Ada.Streams.Stream_Element'Last); -- Build a Dictionary object from a string list -- Note that Hash is set to a placeholder which uncinditionnally -- raises Program_Error when called. generic with procedure Put_Line (Line : String); procedure Print_Dictionary_In_Ada (Dict : in Dictionary; Hash_Image : in String := "TODO"; Max_Width : in Positive := 70; First_Prefix : in String := " := ("; Prefix : in String := " "; Half_Indent : in String := " "); -- Output Ada code corresponding to the value of the dictionary. -- Note that Prefix is the actual base indentation, while Half_Indent -- is added beyond Prefix before values continued on another line. -- Frist_Prefix is used instead of Prefix on the first line. -- All the defaults value are what was used to generate the constant -- in Natools.Smaz.Original. end Natools.Smaz.Tools; |