Ladebeze66/cpp-partie-2
1
0
Fork 0
mirror of https://github.com/Ladebeze66/cpp-partie-2.git synced 2026-11-09 13:47:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

modif

Browse Source
This commit is contained in:
Ladebeze66
2024-02-20 15:37:45 +01:00
parent 8ad95969ba
commit bb9b81c53f
15 changed files with 341 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpp05/ex00/Bureaucrat.cpp
View File

@@ -6,7 +6,7 @@
/* By: fgras-ca <fgras-ca@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/11 13:16:26 by fgras-ca #+# #+# */
/* Updated: 2024/02/14 14:38:10 by fgras-ca ### ########.fr */
/* Updated: 2024/02/16 16:48:16 by fgras-ca ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,7 +15,7 @@
// Constructeur par défaut
Bureaucrat::Bureaucrat() : name("Default"), grade(150)
{
std::cout << GREEN << "Bureaucrat default constructor called!\n" << RESET << std::endl;
std::cout << GREEN << "Bureaucrat default constructor called!" << RESET << std::endl;
}
// Constructeur avec paramètres
Bureaucrat::Bureaucrat(const std::string& name, int grade) :name(name), grade(grade)
@@ -73,7 +73,8 @@ void Bureaucrat::incrementGrade()
// Décrémente le grade
void Bureaucrat::decrementGrade()
{
if (grade >= 150) {
if (grade >= 150)
{
throw GradeTooLowException();
}
++grade;
@@ -81,12 +82,12 @@ void Bureaucrat::decrementGrade()
// Méthodes pour les exceptions
const char* Bureaucrat::GradeTooHighException::what() const throw()
{
return "Grade too hight\n";
return ("Grade too hight\n");
}
const char* Bureaucrat::GradeTooLowException::what() const throw()
{
return "Grade too low\n";
return ("Grade too low\n");
}
// Surcharge de l'opérateur <<
std::ostream& operator<<(std::ostream& os, const Bureaucrat& bureaucrat)
@@ -94,4 +95,3 @@ std::ostream& operator<<(std::ostream& os, const Bureaucrat& bureaucrat)
os << bureaucrat.getName() << " bureaucrat grade " << bureaucrat.getGrade();
return (os);
}

41
cpp05/ex00/Bureaucrat.hpp
View File

@@ -6,7 +6,7 @@
/* By: fgras-ca <fgras-ca@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/11 12:57:28 by fgras-ca #+# #+# */
/* Updated: 2024/02/14 14:32:41 by fgras-ca ### ########.fr */
/* Updated: 2024/02/16 16:39:04 by fgras-ca ### ########.fr */
/* */
/* ************************************************************************** */
@@ -30,35 +30,34 @@
class Bureaucrat
{
public:
class GradeTooHighException : public std::exception
class GradeTooHighException : public std::exception
{
public:
const char* what() const throw() override;
};
public:
const char* what() const throw() override;
};
class GradeTooLowException : public std::exception
class GradeTooLowException : public std::exception
{
public:
const char* what() const throw() override;
};
public:
const char* what() const throw() override;
};
Bureaucrat();
Bureaucrat(const std::string& name, int grade);
Bureaucrat(const Bureaucrat& other);
Bureaucrat& operator=(const Bureaucrat& other);
~Bureaucrat();
Bureaucrat();
Bureaucrat(const std::string& name, int grade);
Bureaucrat(const Bureaucrat& other);
Bureaucrat& operator=(const Bureaucrat& other);
~Bureaucrat();
std::string getName() const;
int getGrade() const;
void incrementGrade();
void decrementGrade();
std::string getName() const;
int getGrade() const;
void incrementGrade();
void decrementGrade();
private:
const std::string name;
int grade;
const std::string name;
int grade;
};
std::ostream& operator<<(std::ostream& os, const Bureaucrat& bureaucrat);
#endif

BIN
cpp05/ex00/Bureaucrat.o
View File

Binary file not shown.

2
cpp05/ex00/main.cpp
View File

@@ -6,7 +6,7 @@
/* By: fgras-ca <fgras-ca@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/11 13:28:49 by fgras-ca #+# #+# */
/* Updated: 2024/02/14 14:37:10 by fgras-ca ### ########.fr */
/* Updated: 2024/02/16 16:48:36 by fgras-ca ### ########.fr */
/* */
/* ************************************************************************** */