~bjonte/jasm commit - sourcehut hg

6 files changed, 31 insertions(+), 4 deletions(-)

M jasm/docs/jasm.md
M jasm/strings/string_conversions.cpp
M jasm/strings/string_conversions.h
A => jasm/unit_tests/results/test_string_conversion_ascii_7.bin
A => jasm/unit_tests/test_string_conversion_ascii_7.asm
M jasm/website/site/docs/index.html

M jasm/docs/jasm.md +6 -2

@@ 2055,16 2055,20 @@ The following format properties are supp
 		<th>Comment</th>
 	</tr>
 	<tr>
+		<td>ascii7</td>
+		<td>7 bit ascii format.</td>
+	</tr>
+	<tr>
 		<td>petscii</td>
 		<td>The character set used in Commodore 8 bit computers.</td>
 	</tr>
 	<tr>
 		<td>zx80</td>
-		<td></td>
+		<td>Sinclair specific character set.</td>
 	</tr>
 	<tr>
 		<td>zx81</td>
-		<td></td>
+		<td>Sinclair specific character set.</td>
 	</tr>
 </table>

M jasm/strings/string_conversions.cpp +9 -0

@@ 29,6 29,7 @@ const std::string_view StringConversions
 	std::string_view("petscii"),
 	std::string_view("zx80"),
 	std::string_view("zx81"),
+	std::string_view("ascii7"),
 };
 
 const std::string_view StringConversions::_subformats[static_cast<size_t>(StringConversions::SubFormat::NumFormats)] = {

          
@@ 59,6 60,7 @@ StringConversions::StringConversions()
 	_conversions.insert(format_hash(Format::Petscii, SubFormat::UppercaseScreen, Locale::English));
 	_conversions.insert(format_hash(Format::ZX80, SubFormat::Default, Locale::English));
 	_conversions.insert(format_hash(Format::ZX81, SubFormat::Default, Locale::English));
+	_conversions.insert(format_hash(Format::Ascii7, SubFormat::Default, Locale::English));
 
 	{
 		// fill petascii lowercase

          
@@ 388,6 390,13 @@ StringConversions::StringConversions()
 		ConversionMap &map = _conversions.at(format_hash(Format::ZX81, SubFormat::Default, Locale::English));
 		add_characters(conversions, map);
 	}
+
+	{
+		ConversionMap &map = _conversions.at(format_hash(Format::Ascii7, SubFormat::Default, Locale::English));
+		for(wchar_t c = L'\x0'; c < L'\x80'; ++c) {
+			map[c] = c;
+		}
+	}
 }
 
 template<typename F, size_t N>

M jasm/strings/string_conversions.h +1 -0

@@ 27,6 27,7 @@ public:
 		Petscii,
 		ZX80,
 		ZX81,
+		Ascii7,
 		NumFormats,
 		Invalid = NumFormats,
 	};

A => jasm/unit_tests/results/test_string_conversion_ascii_7.bin +1 -0

@@ 0,0 1,1 @@ 
+!#$abcAB
  No newline at end of file

A => jasm/unit_tests/test_string_conversion_ascii_7.asm +8 -0

@@ 0,0 1,8 @@ 
+// assembler command line arguments: 6502 [-v0]
+
+section code, "main", 0
+{
+	define byte[] = {
+		string("!#$abcABC", "ascii7", "high_bit_term")
+	}
+}
  No newline at end of file

M jasm/website/site/docs/index.html +6 -2

@@ 2157,16 2157,20 @@ aa
         <th>Comment</th>
     </tr>
     <tr>
+        <td>ascii7</td>
+        <td>7 bit ascii format.</td>
+    </tr>
+    <tr>
         <td>petscii</td>
         <td>The character set used in Commodore 8 bit computers.</td>
     </tr>
     <tr>
         <td>zx80</td>
-        <td></td>
+        <td>Sinclair specific character set.</td>
     </tr>
     <tr>
         <td>zx81</td>
-        <td></td>
+        <td>Sinclair specific character set.</td>
     </tr>
 </table>