@@ -424,18 +424,18 @@ int WsjcppSafeScriptingContext::exec(
424424 const std::string &sScriptRootDir ,
425425 const std::string &sScriptFileName ,
426426 const std::string &sScriptContent ,
427- std::vector<std::string> vArgs
427+ std::vector<std::string> vArgs0
428428) {
429429 m_sScriptRootDir = sScriptRootDir ;
430430 m_sScriptFileName = sScriptFileName ;
431431 m_sScriptContent = sScriptContent ;
432432
433433 m_vVariables[" rootdir" ] = new WsjcppSafeScriptingVariable (m_sScriptRootDir);
434434 m_vVariables[" script_filename" ] = new WsjcppSafeScriptingVariable (m_sScriptFileName);
435- for (int i = 0 ; i < vArgs .size (); i++) {
435+ for (int i = 0 ; i < vArgs0 .size (); i++) {
436436 std::string sArgName = " arg" + std::to_string (i+1 );
437- WsjcppLog::info (TAG, sArgName + " = '" + vArgs [i] + " '" );
438- m_vVariables[sArgName ] = new WsjcppSafeScriptingVariable (vArgs [i]);
437+ WsjcppLog::info (TAG, sArgName + " = '" + vArgs0 [i] + " '" );
438+ m_vVariables[sArgName ] = new WsjcppSafeScriptingVariable (vArgs0 [i]);
439439 }
440440 if (!parseScript ()) {
441441 WsjcppLog::err (TAG, " Parse script failed" );
@@ -470,7 +470,7 @@ int WsjcppSafeScriptingContext::exec(
470470 addVariable (sVarName ); // TODO add variable
471471 }
472472 } else if (hasProc (sToken )) {
473- std::vector<WsjcppSafeScriptingVariable *> vArgs ;
473+ std::vector<WsjcppSafeScriptingVariable *> vArgs2 ;
474474 std::vector<WsjcppSafeScriptingVariable *> vRuntimeRemoveAfter;
475475 std::vector<WsjcppSafeScriptingToken *> vTokenArgs;
476476 for (int n = i+1 ; n < m_vScriptTokens.size (); n++) {
@@ -484,23 +484,23 @@ int WsjcppSafeScriptingContext::exec(
484484 } else if (pToken2->hasString ()) {
485485 WsjcppSafeScriptingVariable *pVar = addVariable (" vartmp_" + WsjcppCore::createUuid ());
486486 pVar->setValue (sTokenValue2 );
487- vArgs .push_back (pVar);
487+ vArgs2 .push_back (pVar);
488488 vRuntimeRemoveAfter.push_back (pVar);
489489 } else if (hasVariable (sTokenValue2 )) {
490490 WsjcppSafeScriptingVariable *pVar = getVariable (sTokenValue2 );
491- vArgs .push_back (pVar);
491+ vArgs2 .push_back (pVar);
492492 } else {
493493 WsjcppLog::err (TAG, " Uknown token: " + sTokenValue2 );
494494 // TODO cleanup
495495 return -1 ;
496496 }
497497 }
498498 WsjcppSafeScriptingProc *pProcedure = this ->getProc (sToken );
499- if (!pProcedure->exec (vArgs )) {
499+ if (!pProcedure->exec (vArgs2 )) {
500500 std::string sDebugInfo = " Procedure: " + sToken + " \n " ;
501501 sDebugInfo += " Arguments: \n " ;
502- for (int n = 0 ; n < vArgs .size (); n++) {
503- sDebugInfo += " - " + vArgs [n]->getValue () + " \n " ;
502+ for (int n = 0 ; n < vArgs2 .size (); n++) {
503+ sDebugInfo += " - " + vArgs2 [n]->getValue () + " \n " ;
504504 }
505505 sDebugInfo += " Tokens info:\n " ;
506506 sDebugInfo += pToken->getContextForLog () + " \n " ;
0 commit comments