GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fixed #386 - rewrote define handling [skip ci] · firewave/simplecpp@2564153

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

simplecpp.cpp
simplecpp.h
test.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎simplecpp.cpp‎`

Copy file name to clipboardExpand all lines: simplecpp.cpp

+48-19Lines changed: 48 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -3289,25 +3289,28 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL`
`3289`	`3289`	`// use a dummy vector for the macros because as this is not part of the file and would add an empty entry - e.g. /usr/include/poll.h`
`3290`	`3290`	`std::vector<std::string> dummy;`
`3291`	`3291`
	`3292`	`+ bool strictAnsiDefined = false;`
	`3293`	`+ bool strictAnsiUndefined = false;`
`3292`	`3294`	`const bool hasInclude = isCpp17OrLater(dui) \|\| isGnu(dui);`
`3293`	`3295`	`MacroMap macros;`
`3294`		`- bool strictAnsiDefined = false;`
`3295`		`- for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {`
`3296`		`- const std::string &macrostr = *it;`
`3297`		`- const std::string::size_type eq = macrostr.find('=');`
`3298`		`- const std::string::size_type par = macrostr.find('(');`
`3299`		`- const std::string macroname = macrostr.substr(0, std::min(eq,par));`
`3300`		`- if (macroname == "__STRICT_ANSI__")`
`3301`		`- strictAnsiDefined = true;`
`3302`		`- if (dui.undefined.find(macroname) != dui.undefined.end())`
	`3296`	`+ for (std::list<Define>::const_iterator it = dui.defines.cbegin(); it != dui.defines.cend(); ++it) {`
	`3297`	`+ const std::string& lhs(it->name);`
	`3298`	`+ if (it->undef) {`
	`3299`	`+ if (lhs == "__STRICT_ANSI__")`
	`3300`	`+ strictAnsiUndefined = true;`
	`3301`	`+ const MacroMap::iterator m_it = macros.find(lhs);`
	`3302`	`+ if (m_it != macros.end())`
	`3303`	`+ macros.erase(m_it);`
`3303`	`3304`	`continue;`
`3304`		`- const std::string lhs(macrostr.substr(0,eq));`
`3305`		`- const std::string rhs(eq==std::string::npos ? std::string("1") : macrostr.substr(eq+1));`
	`3305`	`+ }`
	`3306`	`+ if (lhs == "__STRICT_ANSI__")`
	`3307`	`+ strictAnsiDefined = true;`
	`3308`	`+ const std::string rhs(it->value.empty() ? "1" : it->value);`
`3306`	`3309`	`const Macro macro(lhs, rhs, dummy);`
`3307`	`3310`	`macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));`
`3308`	`3311`	`}`
`3309`	`3312`
`3310`		`- const bool strictAnsiUndefined = dui.undefined.find("__STRICT_ANSI__") != dui.undefined.cend();`
	`3313`	`+ // TODO: test left-to-right`
`3311`	`3314`	`if (!isGnu(dui) && !strictAnsiDefined && !strictAnsiUndefined)`
`3312`	`3315`	`macros.insert(std::pair<TokenString, Macro>("__STRICT_ANSI__", Macro("__STRICT_ANSI__", "1", dummy)));`
`3313`	`3316`
`@@ -3418,13 +3421,11 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL`
`3418`	`3421`	`continue;`
`3419`	`3422`	`try {`
`3420`	`3423`	`const Macro &macro = Macro(rawtok->previous, files);`
`3421`		`- if (dui.undefined.find(macro.name()) == dui.undefined.end()) {`
`3422`		`- const MacroMap::iterator it = macros.find(macro.name());`
`3423`		`- if (it == macros.end())`
`3424`		`- macros.insert(std::pair<TokenString, Macro>(macro.name(), macro));`
`3425`		`- else`
`3426`		`- it->second = macro;`
`3427`		`- }`
	`3424`	`+ const MacroMap::iterator it = macros.find(macro.name());`
	`3425`	`+ if (it == macros.end())`
	`3426`	`+ macros.insert(std::pair<TokenString, Macro>(macro.name(), macro));`
	`3427`	`+ else`
	`3428`	`+ it->second = macro;`
`3428`	`3429`	`} catch (const std::runtime_error &) {`
`3429`	`3430`	`if (outputList) {`
`3430`	`3431`	`simplecpp::Output err(files);`
`@@ -3857,3 +3858,31 @@ std::string simplecpp::getCppStdString(const std::string &std)`
`3857`	`3858`	`{`
`3858`	`3859`	`return getCppStdString(getCppStd(std));`
`3859`	`3860`	`}`
	`3861`	`+`
	`3862`	`+simplecpp::Define simplecpp::Define::parse(const std::string& def, bool prefix)`
	`3863`	`+{`
	`3864`	`+ Define define;`
	`3865`	`+ std::string::size_type offset = 0;`
	`3866`	`+ if (prefix) {`
	`3867`	`+ if (def.size() < 3)`
	`3868`	`+ throw 0;`
	`3869`	`+ if (def[0] != '-')`
	`3870`	`+ throw 0;`
	`3871`	`+ if (def[1] == 'U')`
	`3872`	`+ define.undef = true;`
	`3873`	`+ else if (def[1] != 'D')`
	`3874`	`+ throw 0;`
	`3875`	`+ offset = 2;`
	`3876`	`+ }`
	`3877`	`+ const std::string::size_type sep = def.find('=');`
	`3878`	`+ if (sep == std::string::npos) {`
	`3879`	`+ define.name = def.substr(offset);`
	`3880`	`+ }`
	`3881`	`+ else {`
	`3882`	`+ if (define.undef)`
	`3883`	`+ throw 0;`
	`3884`	`+ define.name = def.substr(offset, sep - offset);`
	`3885`	`+ define.value = def.substr(sep + 1);`
	`3886`	`+ }`
	`3887`	`+ return define;`
	`3888`	`+}`

Collapse file

`‎simplecpp.h‎`

Copy file name to clipboardExpand all lines: simplecpp.h

+22-2Lines changed: 22 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`#define simplecppH`
`8`	`8`
`9`	`9`	`#include <cctype>`
	`10`	`+#include <cstdint>`
`10`	`11`	`#include <cstring>`
`11`	`12`	`#include <iosfwd>`
`12`	`13`	`#include <list>`
`@@ -389,14 +390,33 @@ namespace simplecpp {`
`389`	`390`	`long long result; // condition result`
`390`	`391`	`};`
`391`	`392`
	`393`	`+ struct SIMPLECPP_LIB Define {`
	`394`	`+ enum Type : std::uint8_t {`
	`395`	`+ Def,`
	`396`	`+ Undef,`
	`397`	`+ Builtin`
	`398`	`+ };`
	`399`	`+`
	`400`	`+ Define() : undef(false) {}`
	`401`	`+ Define(const std::string& def, Type t = Def) : undef(t == Undef) {`
	`402`	`+ const Define d = parse(def, false);`
	`403`	`+ name = d.name;`
	`404`	`+ value = d.value;`
	`405`	`+ }`
	`406`	`+ std::string name;`
	`407`	`+ std::string value;`
	`408`	`+ bool undef;`
	`409`	`+`
	`410`	`+ static Define parse(const std::string& def, bool prefix = true); /** parse -D/-U string */`
	`411`	`+ };`
	`412`	`+`
`392`	`413`	`/**`
`393`	`414`	`* Command line preprocessor settings.`
`394`	`415`	`* On the command line these are configured by -D, -U, -I, --include, -std`
`395`	`416`	`*/`
`396`	`417`	`struct SIMPLECPP_LIB DUI {`
`397`	`418`	`DUI() : clearIncludeCache(false), removeComments(false) {}`
`398`		`- std::list<std::string> defines;`
`399`		`- std::set<std::string> undefined;`
	`419`	`+ std::list<Define> defines;`
`400`	`420`	`std::list<std::string> includePaths;`
`401`	`421`	`std::list<std::string> includes;`
`402`	`422`	`std::string std;`

Collapse file

`‎test.cpp‎`

Copy file name to clipboardExpand all lines: test.cpp

+60-10Lines changed: 60 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1706,7 +1706,7 @@ static void strict_ansi_3()`
`1706`	`1706`	`"#endif";`
`1707`	`1707`	`simplecpp::DUI dui;`
`1708`	`1708`	`dui.std = "c99";`
`1709`		`- dui.undefined.insert("__STRICT_ANSI__");`
	`1709`	`+ dui.defines.emplace_back("__STRICT_ANSI__", simplecpp::Define::Undef);`
`1710`	`1710`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1711`	`1711`	`}`
`1712`	`1712`
`@@ -1717,7 +1717,7 @@ static void strict_ansi_4()`
`1717`	`1717`	`"#endif";`
`1718`	`1718`	`simplecpp::DUI dui;`
`1719`	`1719`	`dui.std = "gnu99";`
`1720`		`- dui.defines.push_back("__STRICT_ANSI__");`
	`1720`	`+ dui.defines.emplace_back("__STRICT_ANSI__");`
`1721`	`1721`	`ASSERT_EQUALS("\nA", preprocess(code, dui));`
`1722`	`1722`	`}`
`1723`	`1723`
`@@ -1764,7 +1764,7 @@ static void ifA()`
`1764`	`1764`	`ASSERT_EQUALS("", preprocess(code));`
`1765`	`1765`
`1766`	`1766`	`simplecpp::DUI dui;`
`1767`		`- dui.defines.push_back("A=1");`
	`1767`	`+ dui.defines.emplace_back("A=1");`
`1768`	`1768`	`ASSERT_EQUALS("\nX", preprocess(code, dui));`
`1769`	`1769`	`}`
`1770`	`1770`
`@@ -1783,7 +1783,7 @@ static void ifDefined()`
`1783`	`1783`	`"#endif";`
`1784`	`1784`	`simplecpp::DUI dui;`
`1785`	`1785`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1786`		`- dui.defines.push_back("A=1");`
	`1786`	`+ dui.defines.emplace_back("A=1");`
`1787`	`1787`	`ASSERT_EQUALS("\nX", preprocess(code, dui));`
`1788`	`1788`	`}`
`1789`	`1789`
`@@ -1794,7 +1794,7 @@ static void ifDefinedNoPar()`
`1794`	`1794`	`"#endif";`
`1795`	`1795`	`simplecpp::DUI dui;`
`1796`	`1796`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1797`		`- dui.defines.push_back("A=1");`
	`1797`	`+ dui.defines.emplace_back("A=1");`
`1798`	`1798`	`ASSERT_EQUALS("\nX", preprocess(code, dui));`
`1799`	`1799`	`}`
`1800`	`1800`
`@@ -1806,7 +1806,7 @@ static void ifDefinedNested()`
`1806`	`1806`	`"#endif";`
`1807`	`1807`	`simplecpp::DUI dui;`
`1808`	`1808`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1809`		`- dui.defines.push_back("FOO=1");`
	`1809`	`+ dui.defines.emplace_back("FOO=1");`
`1810`	`1810`	`ASSERT_EQUALS("\n\nX", preprocess(code, dui));`
`1811`	`1811`	`}`
`1812`	`1812`
`@@ -1818,7 +1818,7 @@ static void ifDefinedNestedNoPar()`
`1818`	`1818`	`"#endif";`
`1819`	`1819`	`simplecpp::DUI dui;`
`1820`	`1820`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1821`		`- dui.defines.push_back("FOO=1");`
	`1821`	`+ dui.defines.emplace_back("FOO=1");`
`1822`	`1822`	`ASSERT_EQUALS("\n\nX", preprocess(code, dui));`
`1823`	`1823`	`}`
`1824`	`1824`
`@@ -1871,10 +1871,10 @@ static void ifLogical()`
`1871`	`1871`	`simplecpp::DUI dui;`
`1872`	`1872`	`ASSERT_EQUALS("", preprocess(code, dui));`
`1873`	`1873`	`dui.defines.clear();`
`1874`		`- dui.defines.push_back("A=1");`
	`1874`	`+ dui.defines.emplace_back("A=1");`
`1875`	`1875`	`ASSERT_EQUALS("\nX", preprocess(code, dui));`
`1876`	`1876`	`dui.defines.clear();`
`1877`		`- dui.defines.push_back("B=1");`
	`1877`	`+ dui.defines.emplace_back("B=1");`
`1878`	`1878`	`ASSERT_EQUALS("\nX", preprocess(code, dui));`
`1879`	`1879`	`}`
`1880`	`1880`
`@@ -2768,7 +2768,7 @@ static void userdef()`
`2768`	`2768`	`{`
`2769`	`2769`	`const char code[] = "#ifdef A\n123\n#endif\n";`
`2770`	`2770`	`simplecpp::DUI dui;`
`2771`		`- dui.defines.push_back("A=1");`
	`2771`	`+ dui.defines.emplace_back("A=1");`
`2772`	`2772`	`ASSERT_EQUALS("\n123", preprocess(code, dui));`
`2773`	`2773`	`}`
`2774`	`2774`
`@@ -3246,6 +3246,54 @@ static void safe_api()`
`3246`	`3246`	`#endif`
`3247`	`3247`	`}`
`3248`	`3248`
	`3249`	`+static void define_parse()`
	`3250`	`+{`
	`3251`	`+ {`
	`3252`	`+ const simplecpp::Define define = simplecpp::Define::parse("-DDEF");`
	`3253`	`+ ASSERT_EQUALS("DEF", define.name);`
	`3254`	`+ ASSERT_EQUALS("", define.value);`
	`3255`	`+ ASSERT_EQUALS(false, define.undef);`
	`3256`	`+ }`
	`3257`	`+ {`
	`3258`	`+ const simplecpp::Define define = simplecpp::Define::parse("-DDEF=1");`
	`3259`	`+ ASSERT_EQUALS("DEF", define.name);`
	`3260`	`+ ASSERT_EQUALS("1", define.value);`
	`3261`	`+ ASSERT_EQUALS(false, define.undef);`
	`3262`	`+ }`
	`3263`	`+ {`
	`3264`	`+ const simplecpp::Define define = simplecpp::Define::parse("-UDEF");`
	`3265`	`+ ASSERT_EQUALS("DEF", define.name);`
	`3266`	`+ ASSERT_EQUALS("", define.value);`
	`3267`	`+ ASSERT_EQUALS(true, define.undef);`
	`3268`	`+ }`
	`3269`	`+`
	`3270`	`+ {`
	`3271`	`+ const simplecpp::Define define = simplecpp::Define::parse("DEF", false);`
	`3272`	`+ ASSERT_EQUALS("DEF", define.name);`
	`3273`	`+ ASSERT_EQUALS("", define.value);`
	`3274`	`+ ASSERT_EQUALS(false, define.undef);`
	`3275`	`+ }`
	`3276`	`+ {`
	`3277`	`+ const simplecpp::Define define = simplecpp::Define::parse("DEF=1", false);`
	`3278`	`+ ASSERT_EQUALS("DEF", define.name);`
	`3279`	`+ ASSERT_EQUALS("1", define.value);`
	`3280`	`+ ASSERT_EQUALS(false, define.undef);`
	`3281`	`+ }`
	`3282`	`+ {`
	`3283`	`+ const simplecpp::Define define = simplecpp::Define::parse("-D__has_builtin(x)=(1)", true);`
	`3284`	`+ ASSERT_EQUALS("__has_builtin(x)", define.name);`
	`3285`	`+ ASSERT_EQUALS("(1)", define.value);`
	`3286`	`+ ASSERT_EQUALS(false, define.undef);`
	`3287`	`+ }`
	`3288`	`+ {`
	`3289`	`+ const simplecpp::Define define = simplecpp::Define::parse("__has_builtin(x)=(1)", false);`
	`3290`	`+ ASSERT_EQUALS("__has_builtin(x)", define.name);`
	`3291`	`+ ASSERT_EQUALS("(1)", define.value);`
	`3292`	`+ ASSERT_EQUALS(false, define.undef);`
	`3293`	`+ }`
	`3294`	`+ // -UDEF=0`
	`3295`	`+}`
	`3296`	`+`
`3249`	`3297`	`static void fuzz_crash()`
`3250`	`3298`	`{`
`3251`	`3299`	`{`
`@@ -3514,6 +3562,8 @@ int main(int argc, char **argv)`
`3514`	`3562`
`3515`	`3563`	`TEST_CASE(safe_api);`
`3516`	`3564`
	`3565`	`+ TEST_CASE(define_parse);`
	`3566`	`+`
`3517`	`3567`	`TEST_CASE(fuzz_crash);`
`3518`	`3568`
`3519`	`3569`	`return numberOfFailedAssertions > 0 ? EXIT_FAILURE : EXIT_SUCCESS;`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.