Cleanup

Signed-off-by: Krzysztof Boronski <[email protected]>

Author: kboronski-ant

libs/libtclcpp/src/tclcpp.cpp

@@ -134,12 +134,10 @@ TclDynList::TclDynList(Tcl_Interp* interp, Tcl_Obj* obj)
     if (obj_type == nullptr)
         return;
 
-    if (obj_type == nullptr || std::strcmp(obj_type->name, "list")) {
-        Tcl_Obj* item;
+    if (obj_type == nullptr || std::strcmp(obj_type->name, "list"))
         this->_obj = Tcl_NewListObj(1, &obj);
-    } else {
+    else
         this->_obj = obj;
-    }
 }
 
 TclDynList tcl_obj_getdynlist (TclClient* client, Tcl_Obj* obj) {
@@ -151,7 +149,7 @@ Tcl_Obj* TclDynList::operator[](size_t idx) {
     Tcl_Obj* objp;
 
     Tcl_ListObjLength(this->_interp, this->_obj, &count);
-    if (idx >= count)
+    if (idx >= size_t(count))
         return nullptr;
     Tcl_ListObjIndex(this->_interp, this->_obj, idx, &objp);
 

libs/libtclcpp/src/tclcpp.h

@@ -159,7 +159,8 @@ class TclList {
      * Client must point to the concrete TclClient instance.
      */
     template<typename Container>
-    TclList(Tcl_Interp* interp, void* client, Container&& elements) {
+    TclList(Tcl_Interp* interp, void* client, Container&& elements) 
+        : _interp(interp) {
         std::vector<Tcl_Obj*> tcl_objs;
         for (auto&& elem : elements) {
             Tcl_Obj* obj = Tcl_MoveCppObject(client, elem);
@@ -179,12 +180,10 @@ class TclList {
         if (obj_type == nullptr)
             return;
 
-        if (obj_type == nullptr || std::strcmp(obj_type->name, "list")) {
-            Tcl_Obj* item;
+        if (obj_type == nullptr || std::strcmp(obj_type->name, "list"))
             this->_obj = Tcl_NewListObj(1, &obj);
-        } else {
+        else
             this->_obj = obj;
-        }
     }
 
     /**
@@ -239,8 +238,8 @@ class TclList {
 
         Iterator(Tcl_Interp* interp, Tcl_Obj* obj, int idx)
             : _interp(interp)
-            , _obj(obj)
-            , _idx(idx) {}
+            , _idx(idx) 
+            , _obj(obj) {}
 
       protected:
         Tcl_Interp* _interp;
@@ -342,8 +341,8 @@ class TclDynList {
 
         inline Iterator(Tcl_Interp* interp, Tcl_Obj* obj, int idx)
             : _interp(interp)
-            , _obj(obj)
-            , _idx(idx) {}
+            , _idx(idx)
+            , _obj(obj) {}
 
       protected:
         Tcl_Interp* _interp;
@@ -486,7 +485,7 @@ class TclClient {
     }
 
     template<typename T>
-    int _ret_list(void* this_, TclList<T>& list) {
+    int _ret_list(TclList<T>& list) {
         this->object = list.tcl_obj();
         this->cmd_status = e_TclCommandStatus::TCL_CMD_SUCCESS_LIST;
 

vpr/src/base/xdc_constraints.cpp

@@ -87,7 +87,7 @@ class TclPhysicalConstraintsClient : public TclClient {
 
         std::vector<const char*> port_names;
 
-        for (size_t i = 1; i < objc; i++) {
+        for (int i = 1; i < objc; i++) {
             const char* pin_name = Tcl_GetString(objvp[i]);
             if (pin_name == nullptr)
                 return this->_ret_error("get_ports: pin_name should be a string.");
@@ -98,6 +98,8 @@ class TclPhysicalConstraintsClient : public TclClient {
     }
 
     int get_cells(int objc, Tcl_Obj* const objvp[]) {
+        (void)objc;
+        (void)objvp;
         return this->_ret_error("get_cells: unimplemented");
     }
 
@@ -167,7 +169,6 @@ class TclPhysicalConstraintsClient : public TclClient {
     }
 
     int _do_set_property_iostandard(const char* io_standard, TclList<AtomPortId>& ports) {
-        auto iterator = ports.begin();
         for (auto port : ports) {
             if (port == nullptr)
                 return this->_ret_error("set_property: port_name of IOSTANDARD should have a `AtomPortId` type.");
@@ -190,7 +191,7 @@ class TclPhysicalConstraintsClient : public TclClient {
         }
 
         auto port_list = this->_list<AtomPortId, decltype(port_ids)>(this, std::move(port_ids));
-        this->_ret_list<AtomPortId>(reinterpret_cast<void*>(this), port_list);
+        return this->_ret_list<AtomPortId>(port_list);
     }
 
     int _do_get_port(const char* pin_name, AtomPortId* port_) {

vpr/src/base/xdc_constraints.h

@@ -33,7 +33,7 @@ class XDCStream {
  * 
  * This function may modify the netlist by changing its blocks' properties.
  */
-VprConstraints read_xdc_constraints_to_vpr(std::vector<XDCStream>& xdc_streams, const t_arch& arch, AtomNetlist& netlist);
+VprConstraints read_xdc_constraints_to_vpr(std::vector<XDCStream>&& xdc_streams, const t_arch& arch, AtomNetlist& netlist);
 
 /**
  * @brief Parse a file in XDC format and apply it to global FloorplanningContext.