Merge pull request #609 from potassco/typo-fixes

minor fixes

Author: rkaminsk

lib/c-api/include/clingo/ast.h

@@ -302,7 +302,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_ast_attribute_get_string(clingo_ast_t *ast
 
 //! Get the value of a string array attribute.
 //!
-//! @note The the required size of the array can be queried setting value to NULL.
+//! @note The required size of the array can be queried setting value to NULL.
 //!
 //! @param[in] ast the target AST
 //! @param[in] attribute the target attribute
@@ -315,7 +315,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_ast_attribute_get_string_array(clingo_ast_
 
 //! Get the value of a symbol array attribute.
 //!
-//! @note The the required size of the array can be queried setting value to NULL.
+//! @note The required size of the array can be queried setting value to NULL.
 //!
 //! @param[in] ast the target AST
 //! @param[in] attribute the target attribute
@@ -363,7 +363,7 @@ CLINGO_VISIBILITY_DEFAULT char const *clingo_ast_type_info_yaml(void);
 
 //! A callback to intercept ast's.
 //!
-//! @param[in] ast the paresd ast
+//! @param[in] ast the parsed ast
 //! @param[in] data the user data of the callback
 //! @return whether the call was successful
 typedef bool (*clingo_ast_callback_t)(clingo_ast_t *ast, void *data);
@@ -525,7 +525,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_program_add(clingo_program_t *program, cli
 
 //! @}
 
-//! Extend the control objects's program with the given one.
+//! Extend the control object's program with the given one.
 //!
 //! After extending the logic program, the corresponding program parts are typically grounded with
 //! ::clingo_control_ground.

lib/c-api/include/clingo/base.h

@@ -104,7 +104,7 @@ typedef struct clingo_theory_base clingo_theory_base_t;
 //! @return whether the call was successful
 CLINGO_VISIBILITY_DEFAULT bool clingo_base_is_fact(clingo_base_t const *atoms, clingo_literal_t literal, bool *is_fact);
 
-//! Check whether an literal is external.
+//! Check whether a literal is external.
 //!
 //! A literal is external if it has been defined using an external directive and
 //! has not been released or defined by a rule.
@@ -116,7 +116,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_base_is_fact(clingo_base_t const *atoms, c
 CLINGO_VISIBILITY_DEFAULT bool clingo_base_is_external(clingo_base_t const *atoms, clingo_literal_t literal,
                                                        bool *is_external);
 
-//! Check whether an literal is shown.
+//! Check whether a literal is shown.
 //!
 //! A literal is shown if it has been shown by a show directive.
 //!
@@ -129,7 +129,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_base_is_shown(clingo_base_t const *atoms,
 
 //! Check whether a literal is subject to projection.
 //!
-//! An literal is subject to projection if it occurred in a project directive.
+//! A literal is subject to projection if it occurred in a project directive.
 //!
 //! @param[in] atoms the target
 //! @param[in] literal the index of the literal
@@ -277,7 +277,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_term_base_symbol(clingo_term_base_t const
 //! of conjunctions.
 //!
 //! @param[in] terms the term base
-//! @param[in] index the index of the show diriective
+//! @param[in] index the index of the show directive
 //! @param[out] sizes the sizes of the conjunctions
 //! @param[out] literals the target literals
 //! @param[out] size the size of the disjunction
@@ -405,7 +405,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_theory_base_element_to_string(clingo_theor
 //! @name Theory Atom Inspection
 //! @{
 
-//! Get the total number of theory theory.
+//! Get the total number of theory atoms.
 //!
 //! @param[in] theory the target
 //! @param[out] size the resulting number

lib/c-api/include/clingo/config.h

@@ -222,7 +222,7 @@ CLINGO_VISIBILITY_DEFAULT bool clingo_config_value_get(clingo_config_t const *co
 CLINGO_VISIBILITY_DEFAULT bool clingo_config_value_set(clingo_config_t *config, clingo_id_t key, char const *value,
                                                        size_t size);
 
-//! Get the string representation of the given theory element.
+//! Get the string representation of the given configuration element.
 //!
 //! @param[in] config the target configuration
 //! @param[in] key the key

lib/c-api/include/clingo/control.h

@@ -44,7 +44,7 @@ enum clingo_mode_e {
 //! The corresponding type to ::clingo_mode_e.
 typedef int clingo_mode_t;
 
-//! A map from constantns to their values.
+//! A map from constants to their values.
 typedef struct clingo_const_map clingo_const_map_t;
 
 //! Get the constant with the given name.
@@ -58,10 +58,10 @@ typedef struct clingo_const_map clingo_const_map_t;
 CLINGO_VISIBILITY_DEFAULT bool clingo_const_map_find(clingo_const_map_t const *map, char const *name, size_t name_size,
                                                      clingo_symbol_t *symbol, bool *found);
 
-//! Get the name and value of the contstant at the given index.
+//! Get the name and value of the contestant at the given index.
 //!
 //! @param[in] map the target
-//! @param[in] index the index of the elemnt
+//! @param[in] index the index of the element
 //! @param[out] name the name of the constant
 //! @param[out] symbol the value of the constant
 //! @return whether the call was successful

lib/c-api/include/clingo/core.h

@@ -239,7 +239,7 @@ CLINGO_VISIBILITY_DEFAULT void clingo_lib_acquire(clingo_lib_t *lib);
 //! @param[in] lib the target
 CLINGO_VISIBILITY_DEFAULT void clingo_lib_release(clingo_lib_t *lib);
 
-//! Report a message via the libraries logger.
+//! Report a message via the library’s logger.
 //!
 //! @param[in] lib the library
 //! @param[in] code associated code

lib/c-api/include/clingo/observe.h

@@ -4,7 +4,6 @@
 #include <clingo/base.h>
 #include <clingo/core.h>
 #include <clingo/shared.h>
-#include <clingo/symbol.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/c-api/include/clingo/solve.h

@@ -62,7 +62,7 @@ typedef unsigned clingo_solve_result_bitset_t;
 
 //! Enumeration of solve modes.
 enum clingo_solve_mode_e {
-    clingo_solve_mode_default = 0, //!< The defalut solve mode.
+    clingo_solve_mode_default = 0, //!< The default solve mode.
     clingo_solve_mode_async = 1,   //!< Enable non-blocking search.
     clingo_solve_mode_yield = 2,   //!< Yield models in calls to clingo_solve_handle_model.
     clingo_solve_mode_lock = 4,    //!< Ensure callbacks are executed in lock-step.
@@ -79,7 +79,7 @@ typedef struct clingo_solve_event_handler {
     //! @param goon whether to stop or continue
     //! @return whether the call was successful
     bool (*model)(clingo_model_t *model, void *data, bool *goon);
-    //! Callback to interept lower bounds.
+    //! Callback to intercept lower bounds.
     //!
     //! @param values the values of the current lower bound
     //! @param size the number of values in the lower bound

lib/c-api/include/clingo/theory.h

@@ -126,7 +126,7 @@ typedef struct clingo_theory {
     bool (*on_stats)(void *self, clingo_stats_t *stats);
     //! Get the integer index of a symbol assigned by the theory when a model is found.
     //!
-    //! Using indices allows for efficent retrieval of values.
+    //! Using indices allows for efficient retrieval of values.
     //!
     //! @param[in] self the self pointer
     //! @param[in] symbol the symbol to lookup
@@ -163,7 +163,7 @@ typedef struct clingo_theory {
     bool (*assignment_get_value)(void *self, uint32_t thread_id, size_t index, clingo_symbol_t *symbol,
                                  clingo_theory_value_t *value, bool *has_value);
 
-    //! The userdata for the first value to the callabcks in this struct.
+    //! The userdata for the first value to the callbacks in this struct.
     void *self;
 } clingo_theory_t;
 

lib/c-api/src/base.cc

@@ -606,10 +606,8 @@ extern "C" auto clingo_theory_base_atom_guard(clingo_theory_base_t const *theory
                 return fail_with(clingo_result_runtime, "guard expected");
             }
             auto str = std::string_view{get_theory(theory).getTerm(*guard).symbol()};
-            if (connective != nullptr) {
-                connective->data = str.data();
-                connective->size = str.size();
-            }
+            connective->data = str.data();
+            connective->size = str.size();
         }
         if (term != nullptr) {
             auto const *rhs = x.rhs();

lib/c-api/src/core.cc

@@ -93,24 +93,20 @@ extern "C" auto clingo_lib_new(clingo_lib_flags_t flags, clingo_log_level_t leve
                                void *data, size_t limit, clingo_lib_t **lib) -> bool {
     try {
         *lib = nullptr;
-        struct LH {
-            clingo_logger_t log;
-            void *data;
-            ~LH() {
-                if (log.free != nullptr) {
-                    log.free(data);
-                }
-            }
-        };
-        std::shared_ptr<LH> lh;
         CppClingo::Logger::Printer prt = nullptr;
-        if (logger != nullptr) {
-            lh = std::make_shared<LH>(*logger, data);
-            if (logger->log != nullptr) {
-                prt = [lh](CppClingo::MessageCode code, std::string_view msg) {
-                    lh->log.log(static_cast<clingo_message_t>(code), msg.data(), msg.size(), lh->data);
-                };
-            }
+        if (logger != nullptr && logger->log != nullptr) {
+            struct LH {
+                clingo_logger_t log;
+                void *data;
+                ~LH() {
+                    if (log.free != nullptr) {
+                        log.free(data);
+                    }
+                }
+            };
+            prt = [lh = std::make_shared<LH>(*logger, data)](CppClingo::MessageCode code, std::string_view msg) {
+                lh->log.log(static_cast<clingo_message_t>(code), msg.data(), msg.size(), lh->data);
+            };
         }
         *lib = std::make_unique<clingo_lib>(CppClingo::Logger{std::move(prt), limit},
                                             CppClingo::make_symbol_store((flags & clingo_lib_flags_slotted) != 0,