retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Set the proper current file name when starting to parse a JS file. 

Changed a local variable name to avoid hiding a method with same name.


git-svn-id: http://voip.null.ro/svn/yate@5653 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2013-09-16 12:55:49 +00:00
parent 7b3e7f6c2e
commit 6b39df879d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/yscript/javascript.cpp
View File

@ -3395,31 +3395,33 @@ bool JsParser::parse(const char* text, bool fragment, const char* file, int len)
if (TelEngine::null(text))
return false;
String::stripBOM(text);
ParsePoint expr(text,0,0,file);
JsCode* jsc = static_cast<JsCode*>(code());
ParsePoint expr(text,0,(jsc ? jsc->lineNumber() : 0),file);
if (fragment)
return code() && static_cast<JsCode*>(code())->compile(expr,this);
return jsc && jsc->compile(expr,this);
m_parsedFile.clear();
JsCode* code = new JsCode;
setCode(code);
code->deref();
expr.m_eval = code;
jsc = new JsCode;
setCode(jsc);
jsc->deref();
expr.m_eval = jsc;
if (!TelEngine::null(file)) {
code->setBaseFile(file);
jsc->setBaseFile(file);
expr.m_fileName = file;
expr.m_lineNo = jsc->lineNumber();
}
if (!code->compile(expr,this)) {
if (!jsc->compile(expr,this)) {
setCode(0);
return false;
}
m_parsedFile = file;
DDebug(DebugAll,"Compiled: %s",code->ExpEvaluator::dump().c_str());
code->simplify();
DDebug(DebugAll,"Simplified: %s",code->ExpEvaluator::dump().c_str());
DDebug(DebugAll,"Compiled: %s",jsc->ExpEvaluator::dump().c_str());
jsc->simplify();
DDebug(DebugAll,"Simplified: %s",jsc->ExpEvaluator::dump().c_str());
if (m_allowLink) {
code->link();
DDebug(DebugAll,"Linked: %s",code->ExpEvaluator::dump().c_str());
jsc->link();
DDebug(DebugAll,"Linked: %s",jsc->ExpEvaluator::dump().c_str());
}
code->trace(m_allowTrace);
jsc->trace(m_allowTrace);
return true;
}