Make code more explicit and safe

c_gate.cpp

@@ -45,9 +45,7 @@ lutok::state_c_gate::state_c_gate(state& state_) :
 /// Destroying this object has no implications on the life cycle of the Lua
 /// state.  Only the corresponding state object controls when the Lua state is
 /// closed.
-lutok::state_c_gate::~state_c_gate(void)
-{
-}
+lutok::state_c_gate::~state_c_gate(void) = default;
 
 
 /// Creates a C++ state for a C Lua state.
@@ -62,15 +60,15 @@ lutok::state_c_gate::~state_c_gate(void)
 lutok::state
 lutok::state_c_gate::connect(lua_State* raw_state)
 {
-    return state(static_cast< void* >(raw_state));
+    return state(raw_state);
 }
 
 
 /// Returns the C native Lua state.
 ///
 /// \return A native lua_State object holding the Lua C API state.
 lua_State*
-lutok::state_c_gate::c_state(void)
+lutok::state_c_gate::c_state(void) const
 {
     return static_cast< lua_State* >(_state.raw_state());
 }

c_gate.hpp

@@ -57,12 +57,12 @@ class state_c_gate {
     state& _state;
 
 public:
-    state_c_gate(state&);
+    explicit state_c_gate(state&);
     ~state_c_gate(void);
 
     static state connect(lua_State*);
 
-    lua_State* c_state(void);
+    [[nodiscard]] lua_State* c_state(void) const;
 };
 
 

debug.cpp

@@ -33,7 +33,6 @@
 #include <lutok/c_gate.hpp>
 #include <lutok/debug.hpp>
 #include <lutok/exceptions.hpp>
-#include <lutok/state.ipp>
 
 
 /// Internal implementation for lutok::debug.
@@ -51,9 +50,7 @@ lutok::debug::debug(void) :
 
 
 /// Destructor.
-lutok::debug::~debug(void)
-{
-}
+lutok::debug::~debug(void) = default;
 
 
 /// Wrapper around lua_getinfo.
@@ -64,7 +61,7 @@ lutok::debug::~debug(void)
 /// \warning Terminates execution if there is not enough memory to manipulate
 /// the Lua stack.
 void
-lutok::debug::get_info(state& s, const std::string& what_)
+lutok::debug::get_info(state& s, const std::string& what_) const
 {
     lua_State* raw_state = state_c_gate(s).c_state();
 
@@ -78,7 +75,7 @@ lutok::debug::get_info(state& s, const std::string& what_)
 /// \param s The Lua state.
 /// \param level The second parameter to lua_getstack.
 void
-lutok::debug::get_stack(state& s, const int level)
+lutok::debug::get_stack(state& s, const int level) const
 {
     lua_State* raw_state = state_c_gate(s).c_state();
 
@@ -102,7 +99,7 @@ lutok::debug::event(void) const
 std::string
 lutok::debug::name(void) const
 {
-    assert(_pimpl->lua_debug.name != NULL);
+    assert(_pimpl->lua_debug.name != nullptr);
     return _pimpl->lua_debug.name;
 }
 
@@ -113,7 +110,7 @@ lutok::debug::name(void) const
 std::string
 lutok::debug::name_what(void) const
 {
-    assert(_pimpl->lua_debug.namewhat != NULL);
+    assert(_pimpl->lua_debug.namewhat != nullptr);
     return _pimpl->lua_debug.namewhat;
 }
 
@@ -124,7 +121,7 @@ lutok::debug::name_what(void) const
 std::string
 lutok::debug::what(void) const
 {
-    assert(_pimpl->lua_debug.what != NULL);
+    assert(_pimpl->lua_debug.what != nullptr);
     return _pimpl->lua_debug.what;
 }
 
@@ -135,7 +132,7 @@ lutok::debug::what(void) const
 std::string
 lutok::debug::source(void) const
 {
-    assert(_pimpl->lua_debug.source != NULL);
+    assert(_pimpl->lua_debug.source != nullptr);
     return _pimpl->lua_debug.source;
 }
 
@@ -187,6 +184,5 @@ lutok::debug::last_line_defined(void) const
 std::string
 lutok::debug::short_src(void) const
 {
-    assert(_pimpl->lua_debug.short_src != NULL);
     return _pimpl->lua_debug.short_src;
 }

debug.hpp

@@ -61,19 +61,19 @@ class debug {
     debug(void);
     ~debug(void);
 
-    void get_info(state&, const std::string&);
-    void get_stack(state&, const int);
+    void get_info(state&, const std::string&) const;
+    void get_stack(state&, int) const;
 
-    int event(void) const;
-    std::string name(void) const;
-    std::string name_what(void) const;
-    std::string what(void) const;
-    std::string source(void) const;
-    int current_line(void) const;
-    int n_ups(void) const;
-    int line_defined(void) const;
-    int last_line_defined(void) const;
-    std::string short_src(void) const;
+    [[nodiscard]] int event(void) const;
+    [[nodiscard]] std::string name(void) const;
+    [[nodiscard]] std::string name_what(void) const;
+    [[nodiscard]] std::string what(void) const;
+    [[nodiscard]] std::string source(void) const;
+    [[nodiscard]] int current_line(void) const;
+    [[nodiscard]] int n_ups(void) const;
+    [[nodiscard]] int line_defined(void) const;
+    [[nodiscard]] int last_line_defined(void) const;
+    [[nodiscard]] std::string short_src(void) const;
 };
 
 

exceptions.cpp

@@ -45,9 +45,7 @@ lutok::error::error(const std::string& message) :
 
 
 /// Destructor for the error.
-lutok::error::~error(void) throw()
-{
-}
+lutok::error::~error(void) noexcept = default;
 
 
 /// Constructs a new error.
@@ -63,9 +61,7 @@ lutok::api_error::api_error(const std::string& api_function_,
 
 
 /// Destructor for the error.
-lutok::api_error::~api_error(void) throw()
-{
-}
+lutok::api_error::~api_error(void) noexcept = default;
 
 
 /// Constructs a new api_error with the message on the top of the Lua stack.
@@ -111,9 +107,7 @@ lutok::file_not_found_error::file_not_found_error(
 
 
 /// Destructor for the error.
-lutok::file_not_found_error::~file_not_found_error(void) throw()
-{
-}
+lutok::file_not_found_error::~file_not_found_error(void) noexcept = default;
 
 
 /// Gets the name of the file that could not be found.

exceptions.hpp

@@ -45,35 +45,35 @@ class state;
 class error : public std::runtime_error {
 public:
     explicit error(const std::string&);
-    virtual ~error(void) throw();
+    ~error(void) noexcept override;
 };
 
 
 /// Exception for errors raised by the Lua API library.
-class api_error : public error {
+class api_error final : public error {
     /// Name of the Lua C API function that caused the error.
     std::string _api_function;
 
 public:
     explicit api_error(const std::string&, const std::string&);
-    virtual ~api_error(void) throw();
+    ~api_error(void) noexcept override;
 
     static api_error from_stack(state&, const std::string&);
 
-    const std::string& api_function(void) const;
+    [[nodiscard]] const std::string& api_function(void) const;
 };
 
 
 /// File not found error.
-class file_not_found_error : public error {
+class file_not_found_error final : public error {
     /// Name of the not-found file.
     std::string _filename;
 
 public:
     explicit file_not_found_error(const std::string&);
-    virtual ~file_not_found_error(void) throw();
+    ~file_not_found_error(void) noexcept override;
 
-    const std::string& filename(void) const;
+    [[nodiscard]] const std::string& filename(void) const;
 };
 
 

include/lutok/c_gate.hpp

@@ -1 +1,6 @@
+#ifndef C_GATE_HPP
+#define C_GATE_HPP
+
 #include "../../c_gate.hpp"
+
+#endif // C_GATE_HPP

include/lutok/debug.hpp

@@ -1 +1,6 @@
+#ifndef DEBUG_HPP
+#define DEBUG_HPP
+
 #include "../../debug.hpp"
+
+#endif // DEBUG_HPP

include/lutok/exceptions.hpp

@@ -1 +1,6 @@
+#ifndef EXCEPTIONS_HPP
+#define EXCEPTIONS_HPP
+
 #include "../../exceptions.hpp"
+
+#endif // EXCEPTIONS_HPP

include/lutok/state.hpp

@@ -1 +1,6 @@
+#ifndef STATE_HPP
+#define STATE_HPP
+
 #include "../../state.hpp"
+
+#endif // STATE_HPP

include/lutok/state.ipp

@@ -1 +1,6 @@
+#ifndef STATE_IPP
+#define STATE_IPP
+
 #include "../../state.ipp"
+
+#endif // STATE_IPP

operations.cpp

@@ -47,10 +47,9 @@ lutok::create_module(state& s, const std::string& name,
 {
     stack_cleaner cleaner(s);
     s.new_table();
-    for (std::map< std::string, cxx_function >::const_iterator
-         iter = members.begin(); iter != members.end(); iter++) {
-        s.push_string((*iter).first);
-        s.push_cxx_function((*iter).second);
+    for (const auto & member : members) {
+        s.push_string(member.first);
+        s.push_cxx_function(member.second);
         s.set_table(-3);
     }
     s.set_global(name);

operations.hpp

@@ -43,11 +43,11 @@ namespace lutok {
 
 void create_module(state&, const std::string&,
                    const std::map< std::string, cxx_function >&);
-unsigned int do_file(state&, const std::string&, const int, const int,
-                     const int);
-unsigned int do_string(state&, const std::string&, const int, const int,
-                       const int);
-void eval(state&, const std::string&, const int);
+unsigned int do_file(state&, const std::string&, int, int,
+                     int);
+unsigned int do_string(state&, const std::string&, int, int,
+                       int);
+void eval(state&, const std::string&, int);
 
 
 }  // namespace lutok

stack_cleaner.cpp

@@ -27,7 +27,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cassert>
-#include <cstring>
 
 #include "stack_cleaner.hpp"
 #include "state.ipp"
@@ -75,7 +74,7 @@ lutok::stack_cleaner::~stack_cleaner(void)
     assert(current_depth >= _pimpl->original_depth);
     const unsigned int diff = current_depth - _pimpl->original_depth;
     if (diff > 0)
-        _pimpl->state_ref.pop(diff);
+        _pimpl->state_ref.pop(static_cast<int>(diff));
 }
 
 
@@ -85,7 +84,7 @@ lutok::stack_cleaner::~stack_cleaner(void)
 /// elements that are currently in the stack will not be touched during
 /// destruction when the function is called.
 void
-lutok::stack_cleaner::forget(void)
+lutok::stack_cleaner::forget(void) const
 {
     _pimpl->original_depth = _pimpl->state_ref.get_top();
 }

stack_cleaner.hpp

@@ -81,10 +81,10 @@ class stack_cleaner {
     stack_cleaner& operator=(const stack_cleaner&);
 
 public:
-    stack_cleaner(state&);
+    explicit stack_cleaner(state&);
     ~stack_cleaner(void);
 
-    void forget(void);
+    void forget(void) const;
 };