comment_length = comment_ends_at + 2 - comment_starts_at + 1;
LineComment = CurrentLine.substr(comment_starts_at+4, comment_length-4-3);
CurrentLine.erase(comment_starts_at, comment_length);
+ if (CurrentLine.find_first_not_of(" ") == string::npos) {
+ CurrentLine.erase();
+ }
} else if ( start_comment && !end_comment) { // <!-- ...
CommentsOn = true;
comment_length = line_length - comment_starts_at;
CommentString += CommentStringTemp + "\r\n";
CurrentLine.erase(0, comment_length);
}
-
} while (CommentsOn);
- if (CurrentLine.length() == 0) GetNextConfigLine();
CurrentIndex = 0;
+ if (CurrentLine.length() == 0) {
+ GetNextConfigLine();
+ }
return CurrentLine;
}
string FGConfigFile::GetValue(string val)
{
- unsigned int pos, p1, p2, ptest;
+ string::size_type pos, p1, p2, ptest;
if (val == "") { // this call is to return the tag value
pos = CurrentLine.find("<");
FGConfigFile& FGConfigFile::operator>>(double& val)
{
- unsigned int pos, end;
+ string::size_type pos, end;
pos = CurrentLine.find_first_not_of(", ",CurrentIndex);
if (pos == CurrentLine.npos) pos = CurrentLine.length();
FGConfigFile& FGConfigFile::operator>>(int& val)
{
- unsigned int pos, end;
+ string::size_type pos, end;
pos = CurrentLine.find_first_not_of(", ",CurrentIndex);
if (pos == CurrentLine.npos) pos = CurrentLine.length();
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-FGConfigFile& FGConfigFile::operator>>(eParam& val)
-{
- unsigned int pos, end;
-
- pos = CurrentLine.find_first_not_of(", ",CurrentIndex);
- if (pos == CurrentLine.npos) pos = CurrentLine.length();
- end = CurrentLine.find_first_of(", ",pos+1);
- if (end == CurrentLine.npos) end = CurrentLine.length();
- string str = CurrentLine.substr(pos, end - pos);
- val = (eParam)atoi(str.c_str());
- CurrentIndex = end+1;
- if (end == pos) {
- GetNextConfigLine();
- *this >> val;
- } else {
- if (CurrentIndex >= CurrentLine.length()) GetNextConfigLine();
- }
- return *this;
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
FGConfigFile& FGConfigFile::operator>>(string& str)
{
- unsigned int pos, end;
+ string::size_type pos, end;
pos = CurrentLine.find_first_not_of(", ",CurrentIndex);
if (pos == CurrentLine.npos) pos = CurrentLine.length();
}
if (debug_lvl & 16) { // Sanity checking
}
+ if (debug_lvl & 64) {
+ if (from == 0) { // Constructor
+ cout << IdSrc << endl;
+ cout << IdHdr << endl;
+ }
+ }
}