Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can't use std::getline() with a String on all platforms.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@68332 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
2000-05-05 04:10:01 +00:00
parent 08e0462469
commit 4634345331
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/js/js2/debugger.cpp
View File

@@ -34,6 +34,7 @@
#include "world.h"
#include "debugger.h"
#include <iostream>
#include <string>
#include <ctype.h>
#include <assert.h>
@@ -171,6 +172,13 @@ registers, or set the value of a single register."},
}
}
static String widen(string& str)
{
String s(str.size(), char16());
std::transform(str.begin(), str.end(), s.begin(), JavaScript::widen);
return s;
}
void
Shell::listen(Context* cx, InterpretStage stage)
{
@@ -181,9 +189,9 @@ registers, or set the value of a single register."},
if (!(mStopMask & stage))
return;
static String lastLine (widenCString("help\n"));
String line;
static string lastLine("help\n");
string line;
do {
ICodeModule *iCode = cx->getICode();
InstructionIterator pc = cx->getPC();
@@ -192,16 +200,16 @@ registers, or set the value of a single register."},
printFormat (stdOut, "%04X", (pc - iCode->its_iCode->begin()));
stdOut << "]> ";
getline(cin, line);
std::getline(mIn, line);
if (line.size() == 0)
line = lastLine;
else
{
line.append(widenCString("\n"));
line.append("\n");
lastLine = line;
}
} while (doCommand(cx, line));
} while (doCommand(cx, widen(line)));
}

20
mozilla/js2/src/debugger.cpp
View File

@@ -34,6 +34,7 @@
#include "world.h"
#include "debugger.h"
#include <iostream>
#include <string>
#include <ctype.h>
#include <assert.h>
@@ -171,6 +172,13 @@ registers, or set the value of a single register."},
}
}
static String widen(string& str)
{
String s(str.size(), char16());
std::transform(str.begin(), str.end(), s.begin(), JavaScript::widen);
return s;
}
void
Shell::listen(Context* cx, InterpretStage stage)
{
@@ -181,9 +189,9 @@ registers, or set the value of a single register."},
if (!(mStopMask & stage))
return;
static String lastLine (widenCString("help\n"));
String line;
static string lastLine("help\n");
string line;
do {
ICodeModule *iCode = cx->getICode();
InstructionIterator pc = cx->getPC();
@@ -192,16 +200,16 @@ registers, or set the value of a single register."},
printFormat (stdOut, "%04X", (pc - iCode->its_iCode->begin()));
stdOut << "]> ";
getline(cin, line);
std::getline(mIn, line);
if (line.size() == 0)
line = lastLine;
else
{
line.append(widenCString("\n"));
line.append("\n");
lastLine = line;
}
} while (doCommand(cx, line));
} while (doCommand(cx, widen(line)));
}