#include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx>
+#include <simgear/misc/SimpleMarkdown.hxx>
#include <simgear/structure/commands.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/structure/event_mgr.hxx>
#include "NasalSGPath.hxx"
#include "NasalSys.hxx"
#include "NasalSys_private.hxx"
+#include "NasalAircraft.hxx"
#include "NasalModelData.hxx"
#include "NasalPositioned.hxx"
#include "NasalCanvas.hxx"
void invoke()
{
+ if( _singleShot )
+ // Callback may restart the timer, so update status before callback is
+ // called (Prevent warnings of deleting not existing tasks from the
+ // event manager).
+ _isRunning = false;
+
naRef *args = NULL;
_sys->callMethod(_func, _self, 0, args, naNil() /* locals */);
- if (_singleShot) {
- _isRunning = false;
- }
}
void setSingleShot(bool aSingleShot)
return callMethod(code, naNil(), argc, args, locals);
}
+naRef FGNasalSys::callWithContext(naContext ctx, naRef code, int argc, naRef* args, naRef locals)
+{
+ return callMethodWithContext(ctx, code, naNil(), argc, args, locals);
+}
+
// Does a naCall() in a new context. Wrapped here to make lock
// tracking easier. Extension functions are called with the lock, but
// we have to release it before making a new naCall(). So rather than
return naCallMethod(code, self, argc, args, locals);
}
+naRef FGNasalSys::callMethodWithContext(naContext ctx, naRef code, naRef self, int argc, naRef* args, naRef locals)
+{
+ return naCallMethodCtx(ctx, code, self, argc, args, locals);
+}
+
FGNasalSys::~FGNasalSys()
{
if (_inited) {
bool FGNasalSys::parseAndRun(const char* sourceCode)
{
- naRef code = parse("FGNasalSys::parseAndRun()", sourceCode,
+ naContext ctx = naNewContext();
+ naRef code = parse(ctx, "FGNasalSys::parseAndRun()", sourceCode,
strlen(sourceCode));
- if(naIsNil(code))
+ if(naIsNil(code)) {
+ naFreeContext(ctx);
return false;
- call(code, 0, 0, naNil());
+ }
+ callWithContext(ctx, code, 0, 0, naNil());
+ naFreeContext(ctx);
return true;
}
}
TimerObj* timerObj = new TimerObj(nasalSys, func, self, args[0].num);
- return NasalTimerObj::create(c, timerObj);
+ return nasal::to_nasal(c, timerObj);
}
// setlistener(func, property, bool) extension function. Falls through to
return naStr_fromdata(naNewString(c), const_cast<char*>(file), strlen(file));
}
+/**
+ * Parse very simple and small subset of markdown
+ *
+ * parse_markdown(src)
+ */
+static naRef f_parse_markdown(naContext c, naRef me, int argc, naRef* args)
+{
+ nasal::CallContext ctx(c, me, argc, args);
+ return ctx.to_nasal(
+ simgear::SimpleMarkdown::parse(ctx.requireArg<std::string>(0))
+ );
+}
+
+/**
+ * Create md5 hash from given string
+ *
+ * md5(str)
+ */
+static naRef f_md5(naContext c, naRef me, int argc, naRef* args)
+{
+ if( argc != 1 || !naIsString(args[0]) )
+ naRuntimeError(c, "md5(): wrong type or number of arguments");
+
+ return nasal::to_nasal(
+ c,
+ simgear::strutils::md5(naStr_data(args[0]), naStr_len(args[0]))
+ );
+}
+
// Return UNIX epoch time in seconds.
static naRef f_systime(naContext c, naRef me, int argc, naRef* args)
{
{ "resolvepath", f_resolveDataPath },
{ "finddata", f_findDataDir },
{ "parsexml", f_parsexml },
+ { "parse_markdown", f_parse_markdown },
+ { "md5", f_md5 },
{ "systime", f_systime },
{ 0, 0 }
};
initNasalPositioned(_globals, _context);
initNasalPositioned_cppbind(_globals, _context);
+ initNasalAircraft(_globals, _context);
NasalClipboard::init(this);
initNasalCanvas(_globals, _context);
initNasalCondition(_globals, _context);
_unloadList.pop()->unload();
}
+ // Destroy all queued ghosts
+ nasal::ghostProcessDestroyList();
+
// The global context is a legacy thing. We use dynamically
// created contexts for naCall() now, so that we can call them
// recursively. But there are still spots that want to use it for
const SGPropertyNode* cmdarg,
int argc, naRef* args)
{
- naRef code = parse(fileName, src, len);
- if(naIsNil(code))
+ naContext ctx = naNewContext();
+ naRef code = parse(ctx, fileName, src, len);
+ if(naIsNil(code)) {
+ naFreeContext(ctx);
return false;
+ }
- naContext ctx = naNewContext();
// See if we already have a module hash to use. This allows the
// user to, for example, add functions to the built-in math
_cmdArg = (SGPropertyNode*)cmdarg;
- call(code, argc, args, locals);
+ callWithContext(ctx, code, argc, args, locals);
hashset(_globals, moduleName, locals);
naFreeContext(ctx);
naFreeContext(ctx);
}
-naRef FGNasalSys::parse(const char* filename, const char* buf, int len)
+naRef FGNasalSys::parse(naContext ctx, const char* filename, const char* buf, int len)
{
int errLine = -1;
- naContext ctx = naNewContext();
naRef srcfile = naNewString(ctx);
naStr_fromdata(srcfile, (char*)filename, strlen(filename));
naRef code = naParseCode(ctx, srcfile, 1, (char*)buf, len, &errLine);
SG_LOG(SG_NASAL, SG_ALERT,
"Nasal parse error: " << naGetError(ctx) <<
" in "<< filename <<", line " << errLine);
- naFreeContext(ctx);
return naNil();
}
// Bind to the global namespace before returning
- naRef bound = naBindFunction(ctx, code, _globals);
- naFreeContext(ctx);
- return bound;
+ return naBindFunction(ctx, code, _globals);
}
bool FGNasalSys::handleCommand( const char* moduleName,
const char* src,
const SGPropertyNode* arg )
{
- naRef code = parse(fileName, src, strlen(src));
- if(naIsNil(code)) return false;
+ naContext ctx = naNewContext();
+ naRef code = parse(ctx, fileName, src, strlen(src));
+ if(naIsNil(code)) {
+ naFreeContext(ctx);
+ return false;
+ }
// Commands can be run "in" a module. Make sure that module
// exists, and set it up as the local variables hash for the
// command.
naRef locals = naNil();
if(moduleName[0]) {
- naContext ctx = naNewContext();
naRef modname = naNewString(ctx);
naStr_fromdata(modname, (char*)moduleName, strlen(moduleName));
if(!naHash_get(_globals, modname, &locals)) {
locals = naNewHash(ctx);
naHash_set(_globals, modname, locals);
}
- naFreeContext(ctx);
}
// Cache this command's argument for inspection via cmdarg(). For
// code doesn't need it.
_cmdArg = (SGPropertyNode*)arg;
- call(code, 0, 0, locals);
+ callWithContext(ctx, code, 0, 0, locals);
+ naFreeContext(ctx);
return true;
}
projects / flightgear.git / blobdiff