Print cyrillics in TEXT names properly.

Author: sergev

machine.cpp

@@ -670,6 +670,19 @@ std::string word_iso_string(Word w)
     return buf.str();
 }
 
+//
+// Decode word as 8 characters in TEXT format.
+//
+std::string word_text_string(Word w)
+{
+    std::ostringstream buf;
+    for (int shift = 42; shift >= 0; shift -= 6) {
+        unsigned ch = text_to_unicode(w >> shift);
+        utf8_putc(ch, buf);
+    }
+    return buf.str();
+}
+
 //
 // Decode word as filename in ISO format.
 // Remove trailing spaces, convert to lowercase.

machine.h

@@ -339,6 +339,11 @@ std::string tape_name_string(Word w);
 //
 std::string word_iso_string(Word w);
 
+//
+// Decode word as string in TEXT format.
+//
+std::string word_text_string(Word w);
+
 //
 // Decode word as filename in ISO format.
 // Remove trailing spaces, convert to lowercase.

session.cpp

@@ -34,7 +34,6 @@
 #include <vector>
 
 #include "machine.h"
-#include "encoding.h"
 
 //
 // Internal implementation of the simulation session, hidden from user.
@@ -266,14 +265,7 @@ class Session::Hidden {
             }
             Word location = machine.mem_load(BASE + addr + 1);
 
-            out << (char)std::tolower(text_to_unicode(name >> 42))
-                << (char)std::tolower(text_to_unicode(name >> 36))
-                << (char)std::tolower(text_to_unicode(name >> 30))
-                << (char)std::tolower(text_to_unicode(name >> 24))
-                << (char)std::tolower(text_to_unicode(name >> 18))
-                << (char)std::tolower(text_to_unicode(name >> 12))
-                << (char)std::tolower(text_to_unicode(name >> 6))
-                << (char)std::tolower(text_to_unicode(name)) << "   ";
+            out << word_text_string(name) << "   ";
             besm6_print_word_octal(out, location);
             out << std::endl;
         }