Разрешаване на проблема с диаманта за print

triffon · May 8, 2019 · bb867c6 · bb867c6
1 parent a1b4a54
commit bb867c6
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 11 deletions.
diff --git a/highorder/main.cpp b/highorder/main.cpp
@@ -116,6 +116,6 @@ void testderive() {
 int main() {
   // testtypes();
   testaccumulate();
-  // testderive();
+  testderive();
   return 0;
 }
diff --git a/player/boss.cpp b/player/boss.cpp
@@ -6,8 +6,13 @@ Boss::Boss(char const* n, int s,
   Player(n, s), Hero(n, s, lvl), Bot(n, s, algo, t, d), damage(dmg) {}
 
 void Boss::print(std::ostream& os) const {
-  Hero::print(os);
-  Bot::print(os);
-  os << " и нанася поражения " << getDamage();
+  Player::print(os);
+  printDirect(os);
 }
 
+void Boss::printDirect(std::ostream& os) const {
+  os << ", който е boss";
+  Hero::printDirect(os);
+  Bot::printDirect(os);
+  os << " и нанася поражения " << getDamage();
+}
diff --git a/player/boss.h b/player/boss.h
@@ -16,6 +16,9 @@ class Boss : public Bot, public Hero {
   unsigned getDamage() const { return damage; }
 
   void print(std::ostream& os = std::cout) const;
+
+protected:
+  void printDirect(std::ostream& os = std::cout) const;
 };
 
 #endif
diff --git a/player/bot.cpp b/player/bot.cpp
@@ -6,12 +6,17 @@ Bot::Bot(char const* n, int s,
                        difficulty(d)
 {}
 
-void Bot::print(std::ostream& os) const {
-  Player::print();
+void Bot::printDirect(std::ostream& os) const {
   os << " и е бот с ниво на трудност "
      << getDifficulty()
-     << ", реализиран от";
-  AI::print();
+     << ", реализиран от ";
+  AI::print(os);
+}
+
+
+void Bot::print(std::ostream& os) const {
+  Player::print(os);
+  printDirect(os);
 }
 
 std::ostream& operator<<(std::ostream& os, Bot const& b) {

diff --git a/player/bot.h b/player/bot.h
@@ -18,6 +18,10 @@ class Bot : virtual public Player, public AI {
 
   void print(std::ostream& os = std::cout) const;
 
+protected:
+
+  void printDirect(std::ostream& os = std::cout) const;
+
 };
 
 std::ostream& operator<<(std::ostream& os, Bot const& b);

diff --git a/player/hero.cpp b/player/hero.cpp
@@ -5,7 +5,11 @@ Hero::Hero(char const* n, int s,
            unsigned lvl) : level(lvl), Player(n, s) {
 }
 
-void Hero::print(std::ostream& os) const {
-  Player::print();
+void Hero::printDirect(std::ostream& os) const {
   os << " и е герой на ниво " << getLevel();
 }
+
+void Hero::print(std::ostream& os) const {
+  Player::print(os);
+  printDirect(os);
+}
diff --git a/player/hero.h b/player/hero.h
@@ -16,6 +16,9 @@ class Hero : virtual public Player {
   virtual unsigned getLevel() const { return level; }
 
   void print(std::ostream& os = std::cout) const;
+
+protected:
+  void printDirect(std::ostream& os = std::cout) const;
 };
 
 #endif
diff --git a/player/main.cpp b/player/main.cpp
@@ -129,9 +129,15 @@ void testBinding() {
 void testBoss() {
   Boss boss("Саурон", 50, "Тъмни сили", 2.8, 
             100, 20, 1000);
-  boss.print();
+  std::cout << boss;
   std::cout << ((Hero&)boss).getName() << std::endl;
   std::cout << ((Bot&)boss).getName() << std::endl;
+  Bot b("HAL 9000", 100, "α-β", 0.7, 9000);
+  std::cout << b;
+  Hero h("Гандалф Сивия", 45, 10);
+  std::cout << h;
+  Player* p = &h;
+  p->print();
 }
 
 int main() {