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

Fixed Javascript line counting. 

git-svn-id: http://voip.null.ro/svn/yate@5313 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-10-31 17:11:15 +00:00
parent 0ac6e3ffd9
commit 76303f7036
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/yscript/evaluator.cpp
View File

@ -198,29 +198,21 @@ char ExpEvaluator::skipWhites(const char*& expr)
{
if (!expr)
return 0;
char skip = '\0';
for (; ; expr++) {
char c = *expr;
switch (c) {
case ' ':
case '\t':
skip = '\0';
continue;
case '\r':
if (skip != c) {
m_lineNo++;
skip = '\n';
}
else
skip = '\0';
m_lineNo++;
if (expr[1] == '\n')
expr++;
continue;
case '\n':
if (skip != c) {
m_lineNo++;
skip = '\r';
}
else
skip = '\0';
m_lineNo++;
if (expr[1] == '\r')
expr++;
continue;
default:
return c;

24
libs/yscript/javascript.cpp
View File

@ -923,6 +923,7 @@ bool JsCode::getInstruction(const char*& expr, char stop, GenObject* nested)
return true;
}
const char* saved = expr;
unsigned int savedLine = m_lineNo;
Opcode op = ExpEvaluator::getOperator(expr,s_instr);
switch ((JsOpcode)op) {
case (JsOpcode)OpcNone:
@ -949,6 +950,7 @@ bool JsCode::getInstruction(const char*& expr, char stop, GenObject* nested)
return parseIf(expr,nested);
case OpcElse:
expr = saved;
m_lineNo = savedLine;
return false;
case OpcSwitch:
return parseSwitch(expr,nested);
@ -957,29 +959,37 @@ bool JsCode::getInstruction(const char*& expr, char stop, GenObject* nested)
case OpcWhile:
return parseWhile(expr,nested);
case OpcCase:
if (!ParseNested::parseInner(nested,OpcCase,expr))
if (!ParseNested::parseInner(nested,OpcCase,expr)) {
m_lineNo = savedLine;
return gotError("case not inside switch",saved);
}
if (skipComments(expr) != ':')
return gotError("Expecting ':'",expr);
expr++;
break;
case OpcDefault:
if (!ParseNested::parseInner(nested,OpcDefault,expr))
if (!ParseNested::parseInner(nested,OpcDefault,expr)) {
m_lineNo = savedLine;
return gotError("Unexpected default instruction",saved);
}
if (skipComments(expr) != ':')
return gotError("Expecting ':'",expr);
expr++;
break;
case OpcBreak:
if (!ParseNested::parseInner(nested,OpcBreak,expr))
if (!ParseNested::parseInner(nested,OpcBreak,expr)) {
m_lineNo = savedLine;
return gotError("Unexpected break instruction",saved);
}
if (skipComments(expr) != ';')
return gotError("Expecting ';'",expr);
expr++;
break;
case OpcCont:
if (!ParseNested::parseInner(nested,OpcCont,expr))
if (!ParseNested::parseInner(nested,OpcCont,expr)) {
m_lineNo = savedLine;
return gotError("Unexpected continue instruction",saved);
}
if (skipComments(expr) != ';')
return gotError("Expecting ';'",expr);
expr++;
@ -1108,9 +1118,10 @@ bool JsCode::parseIf(const char*& expr, GenObject* nested)
return gotError("Expecting ')'",expr);
ExpOperation* cond = addOpcode((Opcode)OpcJumpFalse,++m_label);
expr++;
if (!getOneInstruction(++expr,nested))
if (!getOneInstruction(expr,nested))
return false;
const char* save = expr;
unsigned int savedLine = m_lineNo;
skipComments(expr);
if ((JsOpcode)ExpEvaluator::getOperator(expr,s_instr) == OpcElse) {
ExpOperation* jump = addOpcode((Opcode)OpcJump,++m_label);
@ -1121,6 +1132,7 @@ bool JsCode::parseIf(const char*& expr, GenObject* nested)
}
else {
expr = save;
m_lineNo = savedLine;
addOpcode(OpcLabel,cond->number());
}
return true;
@ -1445,6 +1457,7 @@ bool JsCode::getSimple(const char*& expr, bool constOnly)
XDebug(this,DebugAll,"JsCode::getSimple(%s) '%.30s'",String::boolText(constOnly),expr);
skipComments(expr);
const char* save = expr;
unsigned int savedLine = m_lineNo;
switch ((JsOpcode)ExpEvaluator::getOperator(expr,s_constants)) {
case OpcFalse:
addOpcode(false);
@ -1461,6 +1474,7 @@ bool JsCode::getSimple(const char*& expr, bool constOnly)
case OpcFuncDef:
if (constOnly) {
expr = save;
m_lineNo = savedLine;
return false;
}
return parseFuncDef(expr,false);