Use fmt:::format instead of fmt::sprintf

Author: yitzchak

.github/workflows/test.yml

@@ -39,6 +39,8 @@ jobs:
     - name: Install MacOS dependencies
       if: matrix.os == 'macos-latest'
       run: |
+        brew update
+        brew upgrade
         brew install boost fmt gmp llvm@15 ninja pkg-config sbcl ecl netcdf expat
     - name: Checkout repository
       uses: actions/checkout@v3

include/clasp/asttooling/clangTooling.h

@@ -127,7 +127,7 @@ class DerivableFrontendActionFactory : public clbind::Derivable<clang::tooling::
   }
 
   clang::FrontendAction *default_create() {
-    SIMPLE_ERROR_SPRINTF("Subclass must implement create");
+    SIMPLE_ERROR("Subclass must implement create");
   };
 };
 
@@ -158,7 +158,7 @@ class DerivableMatchCallback
   }
 
   void default_run(const clang::ast_matchers::MatchFinderMatchResult &Result) {
-    SIMPLE_ERROR_SPRINTF("Subclass must implement");
+    SIMPLE_ERROR("Subclass must implement");
   };
 
   virtual void onStartOfTranslationUnit() {
@@ -229,7 +229,7 @@ namespace translate {
         printf("Invoking o.px_ref()->describe(); /* A virtual function */\n");
         o.px_ref()->describe();
 #endif
-        SIMPLE_ERROR_SPRINTF("Could not convert %s of RTTI type %s to %s",_rep_(o).c_str(),typeid(o).name(), typeid(asttooling::DerivableMatchCallback*).name() );
+        SIMPLE_ERROR("Could not convert {} of RTTI type {} to {}",_rep_(o), typeid(o).name(), typeid(asttooling::DerivableMatchCallback*).name());
     }
 };
 

include/clasp/asttooling/translators.h

@@ -92,7 +92,7 @@ struct from_object<const vector<string> &> {
       }
       return;
     }
-    SIMPLE_ERROR_SPRINTF("Add support to convert %s to vector<string>", _rep_(o).c_str());
+    SIMPLE_ERROR("Add support to convert {} to vector<string>", _rep_(o));
   }
 };
 

include/clasp/clbind/adapter.fwd.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 namespace clbind {
 
 inline void throwSlotsNotSupported() {
-  SIMPLE_ERROR_SPRINTF("Slots are not supported by this class");
+  SIMPLE_ERROR("Slots are not supported by this class");
 }
 
 /*! Add the enable_derivable type to Adapter or Derivable

include/clasp/clbind/class.h

@@ -139,7 +139,7 @@ class DummyCreator_O : public core::Creator_O {
   virtual size_t templatedSizeof() const override { return sizeof(*this); };
   virtual bool allocates() const override { return false; };
   virtual core::T_sp creator_allocate() override {
-    SIMPLE_ERROR_SPRINTF("This class named: %s cannot allocate instances", core::_rep_(this->_name).c_str());
+    SIMPLE_ERROR("This class named: {} cannot allocate instances", core::_rep_(this->_name));
   } // return _Nil<core::T_O>(); };
   core::Creator_sp duplicateForClassName(core::Symbol_sp className) override {
     core::GlobalSimpleFun_sp entryPoint =

include/clasp/clbind/clbind_wrappers.h

@@ -197,13 +197,13 @@ void* mostDerivedPointer() const { return (void*)RawGetter<HolderType>::get_poin
       obj->_setInstanceClassUsingSymbol(classSymbol);
       return obj;
     }
-    SIMPLE_ERROR("In make_wrapper for a class class_id %d\n"
+    SIMPLE_ERROR("In make_wrapper for a class class_id {}\n"
                  "  the classSymbol could not be identified\n"
                  "  this probably means that you are trying to wrap an unexposed class\n"
                  "  OR you don't have an appropriate to_object translator for the type\n"
                  "  that corresponds to this class_id.\n"
                  "  Connect a debugger and check if:\n"
-                 "  struct to_object<T &, translate::dont_adopt_pointer> is on the stack",  dynamic_id );
+                 "  struct to_object<T &, translate::dont_adopt_pointer> is on the stack",  dynamic_id);
   }
 
   static gctools::smart_ptr<WrapperType> make_wrapper(const OT &val, class_id dynamic_id ) {
@@ -229,7 +229,7 @@ void* mostDerivedPointer() const { return (void*)RawGetter<HolderType>::get_poin
 bool validp() const { return RawGetter<HolderType>::get_pointer(this->p_gc_ignore) != NULL; };
   void throwIfInvalid() const {
     if (!this->validp()) {
-      SIMPLE_ERROR_SPRINTF("The wrapper is invalid");
+      SIMPLE_ERROR("The wrapper is invalid");
     }
   };
 
@@ -579,7 +579,7 @@ struct from_object<std::unique_ptr<T>> {
       core::General_O* gp = (core::General_O*)&(*o);
       T* v_alien = reinterpret_cast<T*>(gp->pointerToAlienWithin());
       if (!v_alien) {
-        SIMPLE_ERROR_SPRINTF("Wrong type of argument - clbind object@%p of type: %s", (void*)gp, typeid(T).name());
+        SIMPLE_ERROR("Wrong type of argument - clbind object@{} of type: {}", (void*)gp, typeid(T).name());
       }
 
       ASSERT(v_alien);
@@ -596,7 +596,7 @@ struct from_object<std::unique_ptr<T>> {
       printf("o.px_ref() = %p\n", go.raw_());
       printf("typeid(T*)@%p  typeid(T*).name=%s\n", &typeid(T *), typeid(T *).name());
       printf("typeid(clbind::Derivable<T>*)@%p   typeid(clbind::Derivable<T>*).name() = %s\n", &typeid(clbind::Derivable<T> *), typeid(clbind::Derivable<T> *).name());
-      SIMPLE_ERROR_SPRINTF("Could not convert %s of RTTI type %s to %s", _rep_(go).c_str(), typeid(o).name(), typeid(T*).name());
+      SIMPLE_ERROR("Could not convert {} of RTTI type {} to {}", _rep_(go), typeid(o).name(), typeid(T*).name());
     } else {
       printf("%s:%d Can't handle object\n", __FILE__, __LINE__ );
     }
@@ -629,9 +629,9 @@ struct from_object<T *> {
         std::string demangled;
         bool success = core::maybe_demangle(expectedType,demangled);
         if (success) {
-          SIMPLE_ERROR(("Incorrect object %s passed to function - expected type %s") , _rep_(o).c_str() , demangled);
+          SIMPLE_ERROR("Incorrect object {} passed to function - expected type {}", _rep_(o).c_str() , demangled);
         } else {
-          SIMPLE_ERROR(("Incorrect object %s passed to function - expected type %s") , _rep_(o).c_str() , typeid(T).name());
+          SIMPLE_ERROR("Incorrect object {} passed to function - expected type {}", _rep_(o).c_str() , typeid(T).name());
         }
       }
       ASSERT(v_alien);
@@ -663,7 +663,7 @@ struct from_object<const T *&> {
     } else if ( core::General_sp gp = o.asOrNull<core::General_O>() ) {
       // What do I do here?
     }
-    SIMPLE_ERROR_SPRINTF("Could not convert %s of RTTI type %s to %s",  _rep_(o).c_str(), typeid(o).name(), typeid(T *&).name());
+    SIMPLE_ERROR("Could not convert {} of RTTI type {} to {}",  _rep_(o).c_str(), typeid(o).name(), typeid(T *&).name());
   }
 };
 
@@ -687,7 +687,7 @@ T& safe_deref(T* ptr) {
   if (ptr) {
     return *ptr;
   }
-  SIMPLE_ERROR(("Passing NULL to a from_object that dereferences - this probably means that NIL was passed to a clbind wrapped function that expects a real object"));
+  SIMPLE_ERROR("Passing NULL to a from_object that dereferences - this probably means that NIL was passed to a clbind wrapped function that expects a real object");
 }
 
 template <typename T>

include/clasp/clbind/constructor.h

@@ -147,7 +147,7 @@ class DerivableDefaultConstructorFunctor : public core::Function_O {
   virtual size_t templatedSizeof() const { return sizeof(*this); };
 public:
   static inline LCC_RETURN LISP_CALLING_CONVENTION() {
-    SIMPLE_ERROR_SPRINTF("What do we do when this is called?");
+    SIMPLE_ERROR("What do we do when this is called?");
   }
     static inline LISP_ENTRY_0() {
     return entry_point_n(lcc_closure,0,NULL);

include/clasp/clbind/enum_maker.h

@@ -144,7 +144,7 @@ struct enum_ : public enum_base {
         this->_v = converter->enumForSymbol<_ENUM_TYPE_>(sym);                                                   \
         return;                                                                                                  \
       }                                                                                                          \
-      SIMPLE_ERROR_SPRINTF("Cannot convert object %s to " #_ENUM_TYPE_, _rep_(object).c_str()); \
+      SIMPLE_ERROR("Cannot convert object {} to " #_ENUM_TYPE_, _rep_(object)); \
     }                                                                                                            \
   };                                                                                                             \
   template <> struct to_object<_ENUM_TYPE_> {                                                                    \

include/clasp/clbind/wrapped_iterator.h

@@ -4,14 +4,14 @@
 
 /*
 Copyright (c) 2014, Christian E. Schafmeister
- 
+
 CLASP is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
 License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later version.
- 
+
 See directory 'clasp/licenses' for full details.
- 
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
@@ -43,38 +43,38 @@ class Iterator : public core::Iterator_O /*, public gctools::GC_MergeKinds */ {
   IT _Iterator;
   //        End     _end;
 public:
-Iterator(IT it /*, End end */) : _Iterator(it) /* , _end(end) */ {};
+  Iterator(IT it /*, End end */) : _Iterator(it) /* , _end(end) */ {};
 
-  core::T_sp unsafeElement() const {
-    return translate::to_object<IT>::convert(this->_Iterator);
-  }
+  core::T_sp unsafeElement() const { return translate::to_object<IT>::convert(this->_Iterator); }
   size_t templatedSizeof() const { return sizeof(*this); };
   void step() { ++this->_Iterator; };
-size_t distance(core::T_sp other) const {
+  size_t distance(core::T_sp other) const {
     if (gctools::smart_ptr<Iterator> io = other.asOrNull<Iterator<IT>>()) {
-        IT& otherIterator = io.get()->_Iterator;
-        return std::distance(this->_Iterator,otherIterator);
+      IT &otherIterator = io.get()->_Iterator;
+      return std::distance(this->_Iterator, otherIterator);
     }
-    SIMPLE_ERROR(("You tried to compare an iterator %s to an object %s of class %s and the isA relationship failed") , _rep_(this->asSmartPtr()) , _rep_(other) , _rep_(core::instance_class(other)));
+    SIMPLE_ERROR("You tried to compare an iterator {} to an object {} of class %s and the isA relationship failed",
+                 _rep_(this->asSmartPtr()), _rep_(other), _rep_(core::instance_class(other)));
   }
-bool operator==(core::T_sp other) const {
+  bool operator==(core::T_sp other) const {
     if (gctools::smart_ptr<Iterator> io = other.asOrNull<Iterator<IT>>()) {
-        IT& otherIterator = io->_Iterator;
-        return this->_Iterator == otherIterator;
+      IT &otherIterator = io->_Iterator;
+      return this->_Iterator == otherIterator;
     }
-    SIMPLE_ERROR(("You tried to compare an iterator %s to an object %s of class %s and the isA relationship failed") , _rep_(this->asSmartPtr()) , _rep_(other) , _rep_(core::instance_class(other)));
+    SIMPLE_ERROR("You tried to compare an iterator {} to an object {} of class {} and the isA relationship failed",
+                 _rep_(this->asSmartPtr()), _rep_(other), _rep_(core::instance_class(other)));
   }
   bool operator<(core::T_sp other) {
     if (Iterator<IT> *io = gc::As<gc::smart_ptr<Iterator<IT>>>(other)) {
-        return this->_Iterator < (*io)._Iterator;
+      return this->_Iterator < (*io)._Iterator;
     }
-    SIMPLE_ERROR(("You tried to compare an iterator %s to an object %s of class %s and the isA relationship failed") , _rep_(this->asSmartPtr()) , _rep_(other) , _rep_(core::instance_class(other)));
+    SIMPLE_ERROR("You tried to compare an iterator {} to an object {} of class {} and the isA relationship failed",
+                 _rep_(this->asSmartPtr()), _rep_(other), _rep_(core::instance_class(other)));
   }
 };
-};
+}; // namespace clbind
 
-template <typename IT, typename Policy>
-class gctools::GCStamp<clbind::Iterator<IT, Policy>> {
+template <typename IT, typename Policy> class gctools::GCStamp<clbind::Iterator<IT, Policy>> {
 public:
   static gctools::GCStampEnum const StampWtag = gctools::GCStamp<typename clbind::Iterator<IT, Policy>::TemplatedBase>::StampWtag;
 };

include/clasp/core/bformat.h

@@ -33,6 +33,6 @@ THE SOFTWARE.
 namespace core {
 
 T_sp cl__format(T_sp dest, T_sp control, List_sp args);
-T_sp core__bformat(T_sp dest, const string &control, List_sp args);
+T_sp core__fmt(T_sp dest, const string &control, List_sp args);
 };
 #endif /* _bformat_H_ */