diff options
| author | 2024-02-21 00:48:23 +0000 | |
|---|---|---|
| committer | 2024-02-21 11:48:23 +1100 | |
| commit | 3059568bb856977693b8a71ec3e3c4c1c4e41c88 (patch) | |
| tree | 6fc9078cf2ba6870aaa0df54c9796a6fd77e40b1 /src/lib | |
| parent | c91b3755d74afd3c3f02c9a81ce10f407ad020f2 (diff) | |
Removed some unnecessary backslash line continuations. (#12047)
* Removed unnecessary preprocessor line continuations from C++ code.
* Use parentheses to avoid need for line continuations in expressions in Python code.
* Removed line continuations at the end of lists in makefiles.
* cpu/m68000: Regenerated C++ source files.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/netlist/build/makefile | 10 | ||||
| -rw-r--r-- | src/lib/netlist/nl_dice_compat.h | 2 | ||||
| -rw-r--r-- | src/lib/netlist/plib/ppreprocessor.cpp | 2 | ||||
| -rw-r--r-- | src/lib/netlist/plib/ptests.h | 4 | ||||
| -rw-r--r-- | src/lib/netlist/tests/test_penum.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index aaf297efd7d..2a63e816c0a 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -151,7 +151,7 @@ OBJDIRS = $(OBJ) \ $(OBJ)/tests \ $(OBJ)/tools \ $(OBJ)/prg \ - $(OBJ)/generated \ + $(OBJ)/generated MODULESOURCES += $(wildcard $(SRC)/macro/modules/*.cpp) DEVSOURCES = $(SRC)/solver/nld_solver.cpp @@ -170,7 +170,7 @@ CORESOURCES := \ $(SRC)/nl_setup.cpp \ $(SRC)/nl_factory.cpp \ $(SRC)/tools/nl_convert.cpp \ - $(SRC)/generated/static_solvers.cpp \ + $(SRC)/generated/static_solvers.cpp MAINSOURCES = $(SRC)/prg/nltool.cpp $(SRC)/prg/nlwav.cpp @@ -195,7 +195,7 @@ PSOURCES := \ $(PSRC)/ppmf.cpp \ $(PSRC)/ppreprocessor.cpp \ $(PSRC)/ptokenizer.cpp \ - $(PSRC)/putil.cpp \ + $(PSRC)/putil.cpp NLOBJS = $(patsubst $(SRC)%, $(OBJ)%, $(CORESOURCES:.cpp=.o)) NLDEVOBJS = $(patsubst $(SRC)%, $(OBJ)%, $(DEVSOURCES:.cpp=.o)) @@ -212,7 +212,7 @@ VSFILES = \ $(VSBUILD)/nltool.vcxproj.filters \ $(VSBUILD)/nlwav.vcxproj \ $(VSBUILD)/nlwav.vcxproj.filters \ - $(VSBUILD)/netlist.sln \ + $(VSBUILD)/netlist.sln OTHERFILES = makefile @@ -222,7 +222,7 @@ DOCS = \ $(DOC)/mainpage.dox.h \ $(DOC)/primer_1.dox.h \ $(DOC)/structure.dox.h \ - $(DOC)/test1-50r.svg \ + $(DOC)/test1-50r.svg ALL_OBJS = $(OBJS) $(MAINOBJS) diff --git a/src/lib/netlist/nl_dice_compat.h b/src/lib/netlist/nl_dice_compat.h index 3088829b5f9..aff1ac4da6f 100644 --- a/src/lib/netlist/nl_dice_compat.h +++ b/src/lib/netlist/nl_dice_compat.h @@ -16,7 +16,7 @@ sed -e 's/#define \(.*\)"\(.*\)"[ \t]*,[ \t]*\(.*\)/NET_ALIAS(\1,\2.\3)/' src/ma | sed -e 's/) RES(/)\n RES(/g' \ | sed -e 's/) CAP(/)\n CAP(/g' \ | sed -e 's/) NET_C(/)\n NET_C(/g' \ -| sed -e 's/NL_EMPTY//' \ +| sed -e 's/NL_EMPTY//' * */ diff --git a/src/lib/netlist/plib/ppreprocessor.cpp b/src/lib/netlist/plib/ppreprocessor.cpp index fd545bc7879..0c3858862f6 100644 --- a/src/lib/netlist/plib/ppreprocessor.cpp +++ b/src/lib/netlist/plib/ppreprocessor.cpp @@ -146,7 +146,7 @@ namespace plib { sexpr.next(); \ const auto v2 = prepro_expr(sexpr, (p_prio)); \ val = (val p_op v2); \ - } \ + } // Operator precedence see https://en.cppreference.com/w/cpp/language/operator_precedence diff --git a/src/lib/netlist/plib/ptests.h b/src/lib/netlist/plib/ptests.h index cc05b120b96..4e65de7f978 100644 --- a/src/lib/netlist/plib/ptests.h +++ b/src/lib/netlist/plib/ptests.h @@ -47,7 +47,7 @@ #define PINT_REGISTER(name, desc) \ extern const plib::testing::reg_entry<PINT_TESTNAME(name, desc)> PINT_TESTNAME(name, desc ## _reg); \ - const plib::testing::reg_entry<PINT_TESTNAME(name, desc)> PINT_TESTNAME(name, desc ## _reg)(#name, #desc, PINT_LOCATION()); \ + const plib::testing::reg_entry<PINT_TESTNAME(name, desc)> PINT_TESTNAME(name, desc ## _reg)(#name, #desc, PINT_LOCATION()); #define PINT_TEST_F(name, desc, base) \ class PINT_TESTNAME(name, desc) : public base \ @@ -296,7 +296,7 @@ namespace plib::testing static const char * opstr() { return #op ; } \ template <typename T1, typename T2> \ bool operator()(const T1 &v1, const T2 &v2) { return v1 op v2; } \ - }; \ + }; DEF_COMP(eq, ==) DEF_COMP(ne, !=) diff --git a/src/lib/netlist/tests/test_penum.cpp b/src/lib/netlist/tests/test_penum.cpp index 8e90c8537e1..6347a41d027 100644 --- a/src/lib/netlist/tests/test_penum.cpp +++ b/src/lib/netlist/tests/test_penum.cpp @@ -91,7 +91,7 @@ namespace plib return; } } - constexpr operator const char * () const noexcept { return staticf::m_str[static_cast<std::size_t>(m_v)]; } \ + constexpr operator const char * () const noexcept { return staticf::m_str[static_cast<std::size_t>(m_v)]; } constexpr operator E () const noexcept { return m_v; } protected: E m_v; |
