Skip to content

Fixed a compiler warning / error in the debug function generator when… #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiplingw wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed a compiler warning / error in the debug function generator when… #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a25cbc6
Fixed a compiler warning / error in the debug function generator when…
kiplingw Aug 18, 2017
1a3a1b0
Fixed Generator::conflicts() choking on white space in user implement…
kiplingw Aug 24, 2017
5bb810e
Fixed Generator choking on white space when checking for conflicts...
kiplingw Aug 25, 2017
3b2fdf4
Merge branch 'master' of https://github.com/kiplingw/flexcpp
kiplingw Aug 25, 2017
9a4622f
Minor fix to previous commit. Safer regexs for the Generator looking …
kiplingw Aug 25, 2017
88cc93d
Fixes Input::Input(std::istream *iStream, size_t lineNr) not detectin…
kiplingw Aug 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions flexc++/generator/conflicts.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ bool Generator::conflicts() const
if (Stat(classHeaderPath))
{
ret = errExisting(classHeaderPath, "class-name",
"^class " + d_options.className() + "\\b")
"^\\s*class\\s+" + d_options.className() + "\\b")
or ret;

if (not d_options.nameSpace().empty())
ret = errExisting(classHeaderPath, "namespace",
"^namespace " + d_options.nameSpace() + "\\b")
"^\\s*namespace\\s+" + d_options.nameSpace() + "\\b")
or ret;

ret = errExisting(classHeaderPath, Options::baseclassHeaderSpec(),
"^#include \"" + d_options.baseclassHeaderName() + '"')
"^\\s*#include\\s+\"" + d_options.baseclassHeaderName() + '"')
or ret;
}

string const &implementationHeader = d_options.implementationHeaderPath();

if (Stat(implementationHeader))
ret = errExisting(implementationHeader, d_options.classHeaderSpec(),
"^#include \"" + d_options.classHeaderName() + '"')
"^\\s*#include\\s+\"" + d_options.classHeaderName() + '"')
or ret;

return ret;
Expand Down
2 changes: 1 addition & 1 deletion flexc++/generator/debugfunctions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ void Generator::debugFunctions(std::ostream &out) const
{
out <<
"void " << d_baseclassScope << "setDebug(bool onOff)\n"
"{}\n"
"{ (void)(onOff); }\n"
"\n"
"bool " << d_baseclassScope << "debug() const\n"
"{\n"
Expand Down
5 changes: 4 additions & 1 deletion flexc++/generator/inputimplementation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ void Generator::inputImplementation(ostream &out) const
:
d_in(iStream),
d_lineNr(lineNr)
{}
{
if(not *iStream)
throw std::runtime_error("Cannot read from stream");
}

size_t )" << d_baseclassScope << R"(Input::get()
{
Expand Down