Ya compilan Ascii y Unicode.

[z.facultad/75.42/string.git] / unicode.cpp

diff --git a/unicode.cpp b/unicode.cpp
index f1a0ad72f91e917b823480d6c6a734316e17476b..c0bfa8fafa372d379d590479e3894cf8ca33a307 100644 (file)
--- a/unicode.cpp
+++ b/unicode.cpp
@@ -20,7 +20,7 @@
 #   include <iostream>
 #endif
 
 #   include <iostream>
 #endif
 

-Unicode::Unicode(short c = 0): caracter(c) {
+Unicode::Unicode(short c): caracter(c) {

 #ifdef DEBUG
     std::cerr << "En constructor de Unicode." << std::endl;
 #endif
 #ifdef DEBUG
     std::cerr << "En constructor de Unicode." << std::endl;
 #endif


@@ -60,14 +60,20 @@ bool Unicode::operator==(const Unicode& unicode) {
     return caracter == unicode.caracter;
 }
 
     return caracter == unicode.caracter;
 }
 

-char Unicode::operator char(void) {
+Unicode::operator short(void) const {
+#ifdef DEBUG
+    std::cerr << "En cast de Unicode a char." << std::endl;
+#endif
+    return static_cast<short>(caracter);
+}
+
+Unicode::operator char(void) const {

 #ifdef DEBUG
     std::cerr << "En cast de Unicode a char." << std::endl;
 #endif
     return static_cast<char>(caracter);
 }
 
 #ifdef DEBUG
     std::cerr << "En cast de Unicode a char." << std::endl;
 #endif
     return static_cast<char>(caracter);
 }
 

-/// Volcado a un stream de salida.

 std::ostream& operator<<(std::ostream& out, const Unicode& unicode) {
 #ifdef DEBUG
     std::cerr << "En operator<< de Unicode." << std::endl;
 std::ostream& operator<<(std::ostream& out, const Unicode& unicode) {
 #ifdef DEBUG
     std::cerr << "En operator<< de Unicode." << std::endl;


@@ -75,7 +81,6 @@ std::ostream& operator<<(std::ostream& out, const Unicode& unicode) {
     return out << unicode.caracter;
 }
 
     return out << unicode.caracter;
 }
 

-/// Captura desde un stream de entrada.

 std::istream& operator>>(std::istream& in, const Unicode& unicode) {
 #ifdef DEBUG
     std::cerr << "En operator>> de Unicode." << std::endl;
 std::istream& operator>>(std::istream& in, const Unicode& unicode) {
 #ifdef DEBUG
     std::cerr << "En operator>> de Unicode." << std::endl;