Run "make clangformat".

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>

fpga_interchange/arch.cc

@@ -564,12 +564,12 @@ TimingClockingInfo Arch::getPortClockingInfo(const CellInfo *cell, IdString port
 void Arch::read_logical_netlist(const std::string &filename) {}
 void Arch::write_physical_netlist(const std::string &filename) const {}
 
-void Arch::parse_xdc(const std::string &filename) {
+void Arch::parse_xdc(const std::string &filename)
+{
     TclInterp interp(getCtx());
     auto result = Tcl_EvalFile(interp.interp, filename.c_str());
     if (result != TCL_OK) {
-        log_error("Error in %s:%d => %s\n", filename.c_str(),
+        log_error("Error in %s:%d => %s\n", filename.c_str(), Tcl_GetErrorLine(interp.interp),
-                Tcl_GetErrorLine(interp.interp),
                   Tcl_GetStringResult(interp.interp));
     }
 }

fpga_interchange/xdc.cc

@@ -19,17 +19,16 @@
  */
 
 #include "xdc.h"
+#include <string>
 #include "log.h"
 #include "nextpnr.h"
-#include <string>
 
 NEXTPNR_NAMESPACE_BEGIN
 
-static int port_set_from_any(Tcl_Interp *interp, Tcl_Obj *objPtr) {
+static int port_set_from_any(Tcl_Interp *interp, Tcl_Obj *objPtr) { return TCL_ERROR; }
-    return TCL_ERROR;
-}
 
-static void set_tcl_obj_string(Tcl_Obj *objPtr, const std::string &s) {
+static void set_tcl_obj_string(Tcl_Obj *objPtr, const std::string &s)
+{
     NPNR_ASSERT(objPtr->bytes == nullptr);
     // Need to have space for the end null byte.
     objPtr->bytes = Tcl_Alloc(s.size() + 1);
@@ -41,44 +40,36 @@ static void set_tcl_obj_string(Tcl_Obj *objPtr, const std::string &s) {
     objPtr->bytes[objPtr->length] = '\0';
 }
 
-static void port_update_string(Tcl_Obj *objPtr) {
+static void port_update_string(Tcl_Obj *objPtr)
+{
     const Context *ctx = static_cast<const Context *>(objPtr->internalRep.twoPtrValue.ptr1);
     PortInfo *port_info = static_cast<PortInfo *>(objPtr->internalRep.twoPtrValue.ptr2);
 
     std::string port_name = port_info->name.str(ctx);
     set_tcl_obj_string(objPtr, port_name);
-
 }
 
-static void port_dup(Tcl_Obj *srcPtr, Tcl_Obj *dupPtr) {
+static void port_dup(Tcl_Obj *srcPtr, Tcl_Obj *dupPtr)
+{
     dupPtr->internalRep.twoPtrValue = srcPtr->internalRep.twoPtrValue;
 }
 
-static void port_free(Tcl_Obj *objPtr) {
+static void port_free(Tcl_Obj *objPtr) {}
-}
 
-
+static void Tcl_SetStringResult(Tcl_Interp *interp, const std::string &s)
-static void Tcl_SetStringResult(Tcl_Interp *interp, const std::string &s) {
+{
     char *copy = Tcl_Alloc(s.size() + 1);
     std::copy(s.begin(), s.end(), copy);
     copy[s.size()] = '\0';
     Tcl_SetResult(interp, copy, TCL_DYNAMIC);
 }
 
-
 static Tcl_ObjType port_object = {
-    "port",
+        "port", port_free, port_dup, port_update_string, port_set_from_any,
-    port_free,
-    port_dup,
-    port_update_string,
-    port_set_from_any,
 };
 
-static int get_ports(
+static int get_ports(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-        ClientData data,
+{
-        Tcl_Interp *interp,
-        int objc,
-        Tcl_Obj *CONST objv[]) {
     const Context *ctx = static_cast<const Context *>(data);
     if (objc == 1) {
         // Return list of all ports.
@@ -109,11 +100,8 @@ static int get_ports(
     }
 }
 
-static int set_property(
+static int set_property(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-        ClientData data,
+{
-        Tcl_Interp *interp,
-        int objc,
-        Tcl_Obj *CONST objv[]) {
     // set_property <property> <value> <object>
     if (objc != 4) {
         Tcl_SetStringResult(interp, "Only simple 'set_property <property> <value> <object>' is supported");
@@ -139,15 +127,15 @@ static int set_property(
     return TCL_OK;
 }
 
-TclInterp::TclInterp(Context *ctx) {
+TclInterp::TclInterp(Context *ctx)
+{
     interp = Tcl_CreateInterp();
     NPNR_ASSERT(Tcl_Init(interp) == TCL_OK);
 
     Tcl_RegisterObjType(&port_object);
 
     NPNR_ASSERT(Tcl_Eval(interp, "rename unknown _original_unknown") == TCL_OK);
-    NPNR_ASSERT(Tcl_Eval(interp,
+    NPNR_ASSERT(Tcl_Eval(interp, "proc unknown args {\n"
-                "proc unknown args {\n"
                                  "  set result [scan [lindex $args 0] \"%d\" value]\n"
                                  "  if { $result == 1 && [llength $args] == 1 } {\n"
                                  "    return \\[$value\\]\n"
@@ -159,8 +147,6 @@ TclInterp::TclInterp(Context *ctx) {
     Tcl_CreateObjCommand(interp, "set_property", set_property, ctx, nullptr);
 }
 
-TclInterp::~TclInterp() {
+TclInterp::~TclInterp() { Tcl_DeleteInterp(interp); }
-    Tcl_DeleteInterp(interp);
-}
 
 NEXTPNR_NAMESPACE_END

fpga_interchange/xdc.h

@@ -17,12 +17,13 @@
  *
  */
 
-#include "nextpnr.h"
 #include <tcl.h>
+#include "nextpnr.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
-struct TclInterp {
+struct TclInterp
+{
     TclInterp(Context *ctx);
     ~TclInterp();