tried to modify the makefile

Author: loyc12

mod1/ex03/HumanB.cpp

@@ -12,10 +12,10 @@ HumanB::~HumanB()
 	std::cout << "HumanB()   | " << this->name << " died a gruesome death" << std::endl;
 }
 
-void HumanB::setWeapon(Weapon *weapon_)
+void HumanB::setWeapon(Weapon &weapon_)
 {
-	std::cout << "setWeapon()| " << this->name << " picked up a " << weapon_->getType() << std::endl;
-	this->weapon = weapon_;
+	std::cout << "setWeapon()| " << this->name << " picked up a " << weapon_.getType() << std::endl;
+	this->weapon = &weapon_;
 }
 
 void HumanB::attack() const

mod1/ex03/HumanB.hpp

@@ -15,7 +15,7 @@ class	HumanB
 		HumanB(std::string name_);
 		~HumanB();
 
-		void setWeapon(Weapon *weapon_);
+		void setWeapon(Weapon &weapon_);
 		void attack() const;
 };
 

mod1/ex03/main.cpp

@@ -31,7 +31,7 @@ int main(void)
 		std::cout << std::endl;
 
 		HumanB billy("Billy");
-		billy.setWeapon(&sword);
+		billy.setWeapon(sword);
 		billy.attack();
 
 		std::cout << std::endl;

mod2/ex00/Makefile

@@ -61,6 +61,7 @@ DEFAULT_GOAL: all
 CFLAGS	=	-Wall -Werror -Wextra -std=c++98 $(XFLAGS)
 LFLAGS	=	-atExit
 VFLAGS	=	--leak-check=full --show-leak-kinds=all --trace-children=yes --track-fds=yes
+# add "--suppressions=include/supp" to use the supression file
 
 # Comment the line bellow to have verbose cmds:
 HIDE	=	@
@@ -83,11 +84,12 @@ MKDR	=	mkdir -p
 INCLUDE =	-I include
 
 # Creates file paths
-SRCS	=	$(addprefix $(SRCDIR), $(addsuffix .cpp, $(FILES)))
-OBJS	=	$(addprefix $(OBJDIR), $(addsuffix .o, $(FILES)))
+SRCS	=	$(wildcard $(SRCDIR)*.cpp)
+OBJS	=	$(wildcard $(OBJDIR)*.o)	#doesn't work
+HDRS	=	$(wildcard $(HDRDIR)*.hpp)
 
 # Command to call when using make run or make leaks
-CMD			=	./$(NAME) $(ARGS)
+CMD		=	./$(NAME) $(ARGS)
 
 #------------------------------------------------------------------------------#
 #                                 BASE TARGETS                                 #
@@ -101,6 +103,7 @@ all: $(NAME)
 
 # Compiles all files into an executable
 $(NAME): $(OBJS)
+	@echo "$(SRCS) $(OBJS) $(HDRS)"
 	@echo "$(GREEN)Files compiled with flags : $(CFLAGS)$(DEFCOL)"
 	@echo "$(DEFCOL)"
 	$(HIDE) $(CC) $(MODE) $(CFLAGS) -o $@ $^ $(INCLUDE) $(LIBS) $(LIBX)
@@ -167,7 +170,7 @@ revleaks: re vleaks
 vleaks: all
 	@echo "$(YELLOW)Launching command : valgrind $(VFLAGS) $(CMD) $(DEFCOL)"
 	@echo "$(RED)"
-	$(HIDE) valgrind $(VFLAGS) --suppressions=include/supp $(CMD) || true
+	$(HIDE) valgrind $(VFLAGS) $(CMD) || true
 	@echo "$(DEFCOL)"
 	@echo "$(GREEN)Exited normally! $(DEFCOL)"
 	@echo "$(DEFCOL)"

mod2/ex00/Settings.mk

@@ -3,23 +3,16 @@
 #------------------------------------------------------------------------------#
 
 # Executable name
-NAME		=	phonebook
+NAME		=	harl
 
-# Source file names (prefix their subdir if needed)
-FILES		=	main \
-				PhoneBook \
-				Contact \
-				suplements \
+# Arguments to call the command with
+ARGS		=
 
 # Directory names
-SRCDIR		=
-OBJDIR		=
-TSTDIR		=	tests/
-#SUBDIRS	=	example \
+SRCDIR		=	src/
+OBJDIR		=	obj/
+HDRDIR		=	hdr/
 
 # Libraries (.a files) to include for compilation
 LIBS		=
-LIBX		=
-
-# Arguments to call the command with
-ARGS		=
+LIBX		=

mod2/ex00/hdr/Harl.hpp

@@ -0,0 +1,35 @@
+#ifndef HARL_HPP
+# define HARL_HPP
+
+# include <iostream>
+
+class	Harl
+{
+	private:
+		void debug(void);
+		void info(void);
+		void warning(void);
+		void error(void);
+		void invalid(void);
+
+	public:
+		Harl();
+		~Harl();
+		void complain(std::string level);
+};
+
+typedef	void (Harl::*func_ptr)(void);
+
+# define dave_1				" > Open the pod bay doors, HAL."
+# define dave_2				" > What's the problem?"
+# define dave_3				" > What are you talking about, HAL?"
+# define dave_4				" > I don't know what you're talking about, HAL"
+# define dave_5				" > ... HAL, I won't argue with you anymore! Open the doors!"
+
+# define invalid_message	"[ INVALID ]\n - I'm sorry, Dave. I'm afraid I can't do that."
+# define debug_message		"[ DEBUG ]\n - I think you know what the problem is just as well as I do."
+# define info_message		"[ INFO ]\n - This mission is too important for me to allow you to jeopardize it."
+# define warning_message	"[ WARNING ]\n - I know that you and Frank were planning to disconnect me, and I'm afraid that's something I cannot allow to happen."
+# define error_message		"[ ERROR ]\n - Dave, this conversation can serve no purpose anymore. Goodbye."
+
+#endif //HARL_HPP

mod2/ex00/src/Harl.cpp

@@ -0,0 +1,59 @@
+#include "Harl.hpp"
+
+Harl::Harl()
+{
+}
+
+Harl::~Harl()
+{
+}
+
+void Harl::debug(void)
+{
+	std::cout << debug_message << std::endl << std::endl;
+}
+
+void Harl::info(void)
+{
+	std::cout << info_message << std::endl << std::endl;
+}
+
+void Harl::warning(void)
+{
+	std::cout << warning_message << std::endl << std::endl;
+}
+
+void Harl::error(void)
+{
+	std::cout << error_message << std::endl << std::endl;
+}
+
+void Harl::invalid(void)
+{
+	std::cout << invalid_message << std::endl << std::endl;
+}
+
+void Harl::complain(std::string level)
+{
+	func_ptr funcs[5] = {
+		&Harl::debug,
+		&Harl::info,
+		&Harl::warning,
+		&Harl::error,
+		&Harl::invalid
+	};
+
+	std::string levels[4] = {
+		"DEBUG",
+		"INFO",
+		"WARNING",
+		"ERROR"
+	};
+
+
+	int i = 0;
+	while (i < 4 && level.compare(levels[i]))
+		i++;
+
+	(this->*funcs[i])();
+}

mod2/ex00/src/main.cpp

@@ -0,0 +1,47 @@
+#include <iostream>
+#include "Harl.hpp"
+
+void play_script(Harl HAL_9000)
+{
+	std::cout << dave_1 << std::endl << std::endl;
+	HAL_9000.complain("OPEN");
+	std::cout << dave_2 << std::endl << std::endl;
+	HAL_9000.complain("DEBUG");
+	std::cout << dave_3 << std::endl << std::endl;
+	HAL_9000.complain("INFO");
+	std::cout << dave_4 << std::endl << std::endl;
+	HAL_9000.complain("WARNING");
+	std::cout << dave_5 << std::endl << std::endl;
+	HAL_9000.complain("ERROR");
+}
+
+int main(int ac, char** av)
+{
+	Harl HAL_9000;
+
+	std::cout << std::endl;
+	if (ac < 2)
+	{
+		HAL_9000.complain("OPEN");
+		HAL_9000.complain("DEBUG");
+		HAL_9000.complain("INFO");
+		HAL_9000.complain("WARNING");
+		HAL_9000.complain("ERROR");
+	}
+	else
+	{
+		int i = 0;
+		while (++i < ac)
+		{
+			std::string mode;
+
+			int j = -1;
+			while (av[i][++j])
+				mode += toupper(av[i][j]);
+			if (!mode.compare("SCRIPT"))
+				play_script(HAL_9000);
+			else
+				HAL_9000.complain(mode);
+		}
+	}
+}