fly/flightgear
1
0
Fork 0
Code Activity

we need a way to specify other contexts than _context; idea & OK by Andy

Browse source
This commit is contained in:
mfranz 2006-01-27 19:51:25 +00:00
parent 0f448cb4ca
commit 32968d81f3
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Scripting/NasalSys.cxx
View file

@ -75,7 +75,7 @@ bool FGNasalSys::parseAndRun(const char* sourceCode)
naCall(_context, code, 0, 0, naNil(), naNil()); naCall(_context, code, 0, 0, naNil(), naNil());
if(!naGetError(_context)) return true; if(!naGetError(_context)) return true;
logError(); logError(_context);
return false; return false;
} }
@ -443,17 +443,17 @@ void FGNasalSys::loadPropertyScripts()
} }
// Logs a runtime error, with stack trace, to the FlightGear log stream // Logs a runtime error, with stack trace, to the FlightGear log stream
void FGNasalSys::logError() void FGNasalSys::logError(naContext context)
{ {
SG_LOG(SG_NASAL, SG_ALERT, SG_LOG(SG_NASAL, SG_ALERT,
"Nasal runtime error: " << naGetError(_context)); "Nasal runtime error: " << naGetError(context));
SG_LOG(SG_NASAL, SG_ALERT, SG_LOG(SG_NASAL, SG_ALERT,
" at " << naStr_data(naGetSourceFile(_context, 0)) << " at " << naStr_data(naGetSourceFile(context, 0)) <<
", line " << naGetLine(_context, 0)); ", line " << naGetLine(context, 0));
for(int i=1; i<naStackDepth(_context); i++) for(int i=1; i<naStackDepth(context); i++)
SG_LOG(SG_NASAL, SG_ALERT, SG_LOG(SG_NASAL, SG_ALERT,
" called from: " << naStr_data(naGetSourceFile(_context, i)) << " called from: " << naStr_data(naGetSourceFile(context, i)) <<
", line " << naGetLine(_context, i)); ", line " << naGetLine(context, i));
} }
// Reads a script file, executes it, and places the resulting // Reads a script file, executes it, and places the resulting
@ -494,7 +494,7 @@ void FGNasalSys::createModule(const char* moduleName, const char* fileName,
naCall(_context, code, 0, 0, naNil(), locals); naCall(_context, code, 0, 0, naNil(), locals);
if(naGetError(_context)) { if(naGetError(_context)) {
logError(); logError(_context);
return; return;
} }
hashset(_globals, moduleName, locals); hashset(_globals, moduleName, locals);
@ -539,7 +539,7 @@ bool FGNasalSys::handleCommand(const SGPropertyNode* arg)
// Call it! // Call it!
naRef result = naCall(_context, code, 0, 0, naNil(), locals); naRef result = naCall(_context, code, 0, 0, naNil(), locals);
if(!naGetError(_context)) return true; if(!naGetError(_context)) return true;
logError(); logError(_context);
return false; return false;
} }
@ -580,7 +580,7 @@ void FGNasalSys::handleTimer(NasalTimer* t)
{ {
naCall(_context, t->handler, 0, 0, naNil(), naNil()); naCall(_context, t->handler, 0, 0, naNil(), naNil());
if(naGetError(_context)) if(naGetError(_context))
logError(); logError(_context);
gcRelease(t->gcKey); gcRelease(t->gcKey);
} }

4
src/Scripting/NasalSys.hxx
View file

@ -68,7 +68,7 @@ private:
void loadPropertyScripts(); void loadPropertyScripts();
void hashset(naRef hash, const char* key, naRef val); void hashset(naRef hash, const char* key, naRef val);
void logError(); void logError(naContext);
naRef parse(const char* filename, const char* buf, int len); naRef parse(const char* filename, const char* buf, int len);
naRef genPropsModule(); naRef genPropsModule();
naRef propNodeGhost(SGPropertyNode* handle); naRef propNodeGhost(SGPropertyNode* handle);
@ -120,7 +120,7 @@ public:
naContext subc = naNewContext(); naContext subc = naNewContext();
naCall(subc, _handler, 0, 0, naNil(), naNil()); naCall(subc, _handler, 0, 0, naNil(), naNil());
if(naGetError(subc)) if(naGetError(subc))
_nas->logError(); _nas->logError(subc);
naFreeContext(subc); naFreeContext(subc);
} }