From 10388666c0fa3cf1b02cf0058fe5e5e841ffcaa6 Mon Sep 17 00:00:00 2001 From: "rogerl%netscape.com" Date: Mon, 5 Aug 2002 19:59:24 +0000 Subject: [PATCH] Fixed retval printing. git-svn-id: svn://10.0.0.236/trunk@126364 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js2/src/epimetheus.cpp | 7 +++++-- mozilla/js2/src/js2eval.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/js2/src/epimetheus.cpp b/mozilla/js2/src/epimetheus.cpp index 72fd3c77cb5..7ac519b3dc4 100644 --- a/mozilla/js2/src/epimetheus.cpp +++ b/mozilla/js2/src/epimetheus.cpp @@ -140,8 +140,11 @@ static int readEvalPrint(FILE *in) metadata->setCurrentParser(&p); // for error reporting metadata->ValidateStmtList(parsedStatements); - metadata->EvalStmtList(MetaData::RunPhase, parsedStatements); - + jsval rval = metadata->EvalStmtList(MetaData::RunPhase, parsedStatements); + if (!JSVAL_IS_VOID(rval)) { + JSString *str = JS_ValueToString(metadata->monkeyContext, rval); + stdOut << String(JS_GetStringChars(str), JS_GetStringLength(str)) << '\n'; + } } clear(buffer); } catch (Exception &e) { diff --git a/mozilla/js2/src/js2eval.cpp b/mozilla/js2/src/js2eval.cpp index 43df46c1cb0..ab3a5c25e60 100644 --- a/mozilla/js2/src/js2eval.cpp +++ b/mozilla/js2/src/js2eval.cpp @@ -153,7 +153,7 @@ namespace MetaData { ASSERT(argc == 0); - meta->env.lexicalRead(meta, lRef->variableMultiname, RunPhase); + *rval = meta->env.lexicalRead(meta, lRef->variableMultiname, RunPhase); return JS_TRUE; }