caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clangformat cleanup

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-12 20:44:05 +02:00
parent b7c747f15b
commit 7b1c599947
9 changed files with 405 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gui/mainwindow.cc
View File

@ -25,8 +25,8 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
QList<QTreeWidgetItem *> bel_items; QList<QTreeWidgetItem *> bel_items;
for (auto bel : design->chip.getBels()) { for (auto bel : design->chip.getBels()) {
auto name = design->chip.getBelName(bel); auto name = design->chip.getBelName(bel);
bel_items.append(new QTreeWidgetItem((QTreeWidget *)nullptr, bel_items.append(new QTreeWidgetItem(
QStringList(QString(name.c_str())))); (QTreeWidget *)nullptr, QStringList(QString(name.c_str()))));
} }
bel_root->addChildren(bel_items); bel_root->addChildren(bel_items);
@ -36,8 +36,8 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
ui->treeWidget->insertTopLevelItem(0, wire_root); ui->treeWidget->insertTopLevelItem(0, wire_root);
for (auto wire : design->chip.getWires()) { for (auto wire : design->chip.getWires()) {
auto name = design->chip.getWireName(wire); auto name = design->chip.getWireName(wire);
wire_items.append(new QTreeWidgetItem((QTreeWidget *)nullptr, wire_items.append(new QTreeWidgetItem(
QStringList(QString(name.c_str())))); (QTreeWidget *)nullptr, QStringList(QString(name.c_str()))));
} }
wire_root->addChildren(wire_items); wire_root->addChildren(wire_items);
@ -47,12 +47,11 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
ui->treeWidget->insertTopLevelItem(0, pip_root); ui->treeWidget->insertTopLevelItem(0, pip_root);
for (auto pip : design->chip.getPips()) { for (auto pip : design->chip.getPips()) {
auto name = design->chip.getPipName(pip); auto name = design->chip.getPipName(pip);
pip_items.append(new QTreeWidgetItem((QTreeWidget *)nullptr, pip_items.append(new QTreeWidgetItem(
QStringList(QString(name.c_str())))); (QTreeWidget *)nullptr, QStringList(QString(name.c_str()))));
} }
pip_root->addChildren(pip_items); pip_root->addChildren(pip_items);
PyImport_ImportModule("emb"); PyImport_ImportModule("emb");
write = [this](std::string s) { write = [this](std::string s) {

3
tests/dummy/main.cc
View File

@ -2,7 +2,8 @@
#include <vector> #include <vector>
int main(int argc, char **argv) { int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }

9
tests/ice40/hx1k.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class HX1KTest : public ::testing::Test { class HX1KTest : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class HX1KTest : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;

9
tests/ice40/hx8k.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class HX8KTest : public ::testing::Test { class HX8KTest : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class HX8KTest : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;

9
tests/ice40/lp1k.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class LP1KTest : public ::testing::Test { class LP1KTest : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class LP1KTest : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;

9
tests/ice40/lp384.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class LP384Test : public ::testing::Test { class LP384Test : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class LP384Test : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;

9
tests/ice40/lp8k.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class LP8KTest : public ::testing::Test { class LP8KTest : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class LP8KTest : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;

5
tests/ice40/main.cc
View File

@ -1,7 +1,8 @@
#include "gtest/gtest.h"
#include <vector> #include <vector>
#include "gtest/gtest.h"
int main(int argc, char **argv) { int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }

9
tests/ice40/up5k.cc
View File

@ -1,10 +1,11 @@
#include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "nextpnr.h" #include "nextpnr.h"
#include <vector>
USING_NEXTPNR_NAMESPACE USING_NEXTPNR_NAMESPACE
class UP5KTest : public ::testing::Test { class UP5KTest : public ::testing::Test
{
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
@ -12,9 +13,7 @@ class UP5KTest : public ::testing::Test {
design = new Design(chipArgs); design = new Design(chipArgs);
} }
virtual void TearDown() { virtual void TearDown() { delete design; }
delete design;
}
ChipArgs chipArgs; ChipArgs chipArgs;
Design *design; Design *design;