max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 08:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Do not close a nesting level twice after close() has been

Browse source 
called explicitly on a Nest object.
This commit is contained in:
Eelco Dolstra 2004-03-27 15:33:19 +00:00
parent 7823db2137
commit f0f7a9f299
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libutil/util.cc
View file

@ -279,6 +279,7 @@ void Nest::close()
nestingLevel--; nestingLevel--;
if (logType == ltEscapes) if (logType == ltEscapes)
cerr << "\033[q"; cerr << "\033[q";
nest = false;
} }
} }

11
src/log2xml/log2xml.cc
View file

@ -16,6 +16,7 @@ struct Decoder
bool newNumber; bool newNumber;
int priority; int priority;
bool ignoreLF; bool ignoreLF;
int lineNo, charNo;
Decoder() Decoder()
{ {
@ -25,6 +26,8 @@ struct Decoder
level = 0; level = 0;
priority = 1; priority = 1;
ignoreLF = false; ignoreLF = false;
lineNo = 1;
charNo = 0;
} }
void pushChar(char c); void pushChar(char c);
@ -35,6 +38,11 @@ struct Decoder
void Decoder::pushChar(char c) void Decoder::pushChar(char c)
{ {
if (c == '\n') {
lineNo++;
charNo = 0;
} else charNo++;
switch (state) { switch (state) {
case stTop: case stTop:
@ -71,7 +79,8 @@ void Decoder::pushChar(char c)
level--; level--;
cout << "</nest>" << endl; cout << "</nest>" << endl;
} else } else
cerr << "not enough nesting levels" << endl; cerr << "not enough nesting levels at line "
<< lineNo << ", character " << charNo << endl;
break; break;
case 's': case 's':
if (line.size()) finishLine(); if (line.size()) finishLine();