@@ -424,18 +424,18 @@ int WsjcppSafeScriptingContext::exec(
424
424
const std::string &sScriptRootDir ,
425
425
const std::string &sScriptFileName ,
426
426
const std::string &sScriptContent ,
427
- std::vector<std::string> vArgs
427
+ std::vector<std::string> vArgs0
428
428
) {
429
429
m_sScriptRootDir = sScriptRootDir ;
430
430
m_sScriptFileName = sScriptFileName ;
431
431
m_sScriptContent = sScriptContent ;
432
432
433
433
m_vVariables[" rootdir" ] = new WsjcppSafeScriptingVariable (m_sScriptRootDir);
434
434
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++) {
436
436
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]);
439
439
}
440
440
if (!parseScript ()) {
441
441
WsjcppLog::err (TAG, " Parse script failed" );
@@ -470,7 +470,7 @@ int WsjcppSafeScriptingContext::exec(
470
470
addVariable (sVarName ); // TODO add variable
471
471
}
472
472
} else if (hasProc (sToken )) {
473
- std::vector<WsjcppSafeScriptingVariable *> vArgs ;
473
+ std::vector<WsjcppSafeScriptingVariable *> vArgs2 ;
474
474
std::vector<WsjcppSafeScriptingVariable *> vRuntimeRemoveAfter;
475
475
std::vector<WsjcppSafeScriptingToken *> vTokenArgs;
476
476
for (int n = i+1 ; n < m_vScriptTokens.size (); n++) {
@@ -484,23 +484,23 @@ int WsjcppSafeScriptingContext::exec(
484
484
} else if (pToken2->hasString ()) {
485
485
WsjcppSafeScriptingVariable *pVar = addVariable (" vartmp_" + WsjcppCore::createUuid ());
486
486
pVar->setValue (sTokenValue2 );
487
- vArgs .push_back (pVar);
487
+ vArgs2 .push_back (pVar);
488
488
vRuntimeRemoveAfter.push_back (pVar);
489
489
} else if (hasVariable (sTokenValue2 )) {
490
490
WsjcppSafeScriptingVariable *pVar = getVariable (sTokenValue2 );
491
- vArgs .push_back (pVar);
491
+ vArgs2 .push_back (pVar);
492
492
} else {
493
493
WsjcppLog::err (TAG, " Uknown token: " + sTokenValue2 );
494
494
// TODO cleanup
495
495
return -1 ;
496
496
}
497
497
}
498
498
WsjcppSafeScriptingProc *pProcedure = this ->getProc (sToken );
499
- if (!pProcedure->exec (vArgs )) {
499
+ if (!pProcedure->exec (vArgs2 )) {
500
500
std::string sDebugInfo = " Procedure: " + sToken + " \n " ;
501
501
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 " ;
504
504
}
505
505
sDebugInfo += " Tokens info:\n " ;
506
506
sDebugInfo += pToken->getContextForLog () + " \n " ;
0 commit comments