X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2Fnasal-props.cxx;h=6112144f2af2c0b4e4495942deb21261c24ccefe;hb=1d99401c0427a2a4faae651995736d569f8bbd5e;hp=b2de4d02b1adf9698ae42caa4b57863f465aff94;hpb=200abfef2d2427923657ef949093be41db940a43;p=flightgear.git diff --git a/src/Scripting/nasal-props.cxx b/src/Scripting/nasal-props.cxx index b2de4d02b..6112144f2 100644 --- a/src/Scripting/nasal-props.cxx +++ b/src/Scripting/nasal-props.cxx @@ -3,13 +3,18 @@ # include "config.h" #endif +#include + #include #include +#include #include
#include "NasalSys.hxx" +using namespace std; + // Implementation of a Nasal wrapper for the SGPropertyNode class, // using the Nasal "ghost" (er... Garbage collection Handle for // OutSide Thingy) facility. @@ -26,7 +31,7 @@ static void propNodeGhostDestroy(void* ghost) delete prop; } -naGhostType PropNodeGhostType = { propNodeGhostDestroy }; +naGhostType PropNodeGhostType = { propNodeGhostDestroy, "prop" }; static naRef propNodeGhostCreate(naContext c, SGPropertyNode* n) { @@ -40,6 +45,15 @@ naRef FGNasalSys::propNodeGhost(SGPropertyNode* handle) return propNodeGhostCreate(_context, handle); } +SGPropertyNode* ghostToPropNode(naRef ref) +{ + if (!naIsGhost(ref) || (naGhost_type(ref) != &PropNodeGhostType)) + return NULL; + + SGPropertyNode_ptr* pp = (SGPropertyNode_ptr*) naGhost_ptr(ref); + return pp->ptr(); +} + #define NASTR(s) s ? naStr_fromdata(naNewString(c),(char*)(s),strlen(s)) : naNil() // @@ -49,27 +63,34 @@ naRef FGNasalSys::propNodeGhost(SGPropertyNode* handle) // array. This allows the Nasal handlers to do things like: // Node.getChild = func { _getChild(me.ghost, arg) } // -#define NODEARG() \ +#define NODENOARG() \ if(argc < 2 || !naIsGhost(args[0]) || \ naGhost_type(args[0]) != &PropNodeGhostType) \ naRuntimeError(c, "bad argument to props function"); \ - SGPropertyNode_ptr* node = (SGPropertyNode_ptr*)naGhost_ptr(args[0]); \ + SGPropertyNode_ptr* node = (SGPropertyNode_ptr*)naGhost_ptr(args[0]); + +#define NODEARG() \ + NODENOARG(); \ naRef argv = args[1] static naRef f_getType(naContext c, naRef me, int argc, naRef* args) { - NODEARG(); - char* t = "unknown"; + using namespace simgear; + NODENOARG(); + const char* t = "unknown"; switch((*node)->getType()) { - case SGPropertyNode::NONE: t = "NONE"; break; - case SGPropertyNode::ALIAS: t = "ALIAS"; break; - case SGPropertyNode::BOOL: t = "BOOL"; break; - case SGPropertyNode::INT: t = "INT"; break; - case SGPropertyNode::LONG: t = "LONG"; break; - case SGPropertyNode::FLOAT: t = "FLOAT"; break; - case SGPropertyNode::DOUBLE: t = "DOUBLE"; break; - case SGPropertyNode::STRING: t = "STRING"; break; - case SGPropertyNode::UNSPECIFIED: t = "UNSPECIFIED"; break; + case props::NONE: t = "NONE"; break; + case props::ALIAS: t = "ALIAS"; break; + case props::BOOL: t = "BOOL"; break; + case props::INT: t = "INT"; break; + case props::LONG: t = "LONG"; break; + case props::FLOAT: t = "FLOAT"; break; + case props::DOUBLE: t = "DOUBLE"; break; + case props::STRING: t = "STRING"; break; + case props::UNSPECIFIED: t = "UNSPECIFIED"; break; + case props::VEC3D: t = "VEC3D"; break; + case props::VEC4D: t = "VEC4D"; break; + case props::EXTENDED: t = "EXTENDED"; break; // shouldn't happen } return NASTR(t); } @@ -77,21 +98,24 @@ static naRef f_getType(naContext c, naRef me, int argc, naRef* args) static naRef f_getAttribute(naContext c, naRef me, int argc, naRef* args) { NODEARG(); - if(naVec_size(argv) == 0) return naNum((*node)->getAttributes()); + if(naVec_size(argv) == 0) return naNum(unsigned((*node)->getAttributes())); naRef val = naVec_get(argv, 0); - char *a = naStr_data(val); + const char *a = naStr_data(val); SGPropertyNode::Attribute attr; if(!a) a = ""; - if(!strcmp(a, "children")) return naNum((*node)->nChildren()); + if(!strcmp(a, "last")) return naNum(SGPropertyNode::LAST_USED_ATTRIBUTE); + else if(!strcmp(a, "children")) return naNum((*node)->nChildren()); else if(!strcmp(a, "listeners")) return naNum((*node)->nListeners()); + else if(!strcmp(a, "references")) return naNum(node->getNumRefs()); else if(!strcmp(a, "tied")) return naNum((*node)->isTied()); else if(!strcmp(a, "alias")) return naNum((*node)->isAlias()); - else if(!strcmp(a, "read")) attr = SGPropertyNode::READ; - else if(!strcmp(a, "write")) attr = SGPropertyNode::WRITE; + else if(!strcmp(a, "readable")) attr = SGPropertyNode::READ; + else if(!strcmp(a, "writable")) attr = SGPropertyNode::WRITE; else if(!strcmp(a, "archive")) attr = SGPropertyNode::ARCHIVE; else if(!strcmp(a, "trace-read")) attr = SGPropertyNode::TRACE_READ; else if(!strcmp(a, "trace-write")) attr = SGPropertyNode::TRACE_WRITE; else if(!strcmp(a, "userarchive")) attr = SGPropertyNode::USERARCHIVE; + else if(!strcmp(a, "preserve")) attr = SGPropertyNode::PRESERVE; else { naRuntimeError(c, "props.getAttribute() with invalid attribute"); return naNil(); @@ -109,14 +133,15 @@ static naRef f_setAttribute(naContext c, naRef me, int argc, naRef* args) return ret; } SGPropertyNode::Attribute attr; - char *a = naStr_data(val); + const char *a = naStr_data(val); if(!a) a = ""; - if(!strcmp(a, "read")) attr = SGPropertyNode::READ; - else if(!strcmp(a, "write")) attr = SGPropertyNode::WRITE; + if(!strcmp(a, "readable")) attr = SGPropertyNode::READ; + else if(!strcmp(a, "writable")) attr = SGPropertyNode::WRITE; else if(!strcmp(a, "archive")) attr = SGPropertyNode::ARCHIVE; else if(!strcmp(a, "trace-read")) attr = SGPropertyNode::TRACE_READ; else if(!strcmp(a, "trace-write")) attr = SGPropertyNode::TRACE_WRITE; else if(!strcmp(a, "userarchive")) attr = SGPropertyNode::USERARCHIVE; + else if(!strcmp(a, "preserve")) attr = SGPropertyNode::PRESERVE; else { naRuntimeError(c, "props.setAttribute() with invalid attribute"); return naNil(); @@ -128,44 +153,102 @@ static naRef f_setAttribute(naContext c, naRef me, int argc, naRef* args) static naRef f_getName(naContext c, naRef me, int argc, naRef* args) { - NODEARG(); + NODENOARG(); return NASTR((*node)->getName()); } static naRef f_getIndex(naContext c, naRef me, int argc, naRef* args) { - NODEARG(); + NODENOARG(); return naNum((*node)->getIndex()); } +template +naRef makeVectorFromVec(naContext c, const T& vec) +{ + const int num_components + = sizeof(vec.data()) / sizeof(typename T::value_type); + naRef vector = naNewVector(c); + naVec_setsize(c, vector, num_components); + for (int i = 0; i < num_components; ++i) + naVec_set(vector, i, naNum(vec[i])); + return vector; +} + static naRef f_getValue(naContext c, naRef me, int argc, naRef* args) { - NODEARG(); + using namespace simgear; + NODENOARG(); switch((*node)->getType()) { - case SGPropertyNode::BOOL: case SGPropertyNode::INT: - case SGPropertyNode::LONG: case SGPropertyNode::FLOAT: - case SGPropertyNode::DOUBLE: - return naNum((*node)->getDoubleValue()); - case SGPropertyNode::STRING: - case SGPropertyNode::UNSPECIFIED: + case props::BOOL: case props::INT: + case props::LONG: case props::FLOAT: + case props::DOUBLE: + { + double dv = (*node)->getDoubleValue(); + if (SGMisc::isNaN(dv)) { + SG_LOG(SG_NASAL, SG_ALERT, "Nasal getValue: property " << (*node)->getPath() << " is NaN"); + return naNil(); + } + + return naNum(dv); + } + + case props::STRING: + case props::UNSPECIFIED: return NASTR((*node)->getStringValue()); + case props::VEC3D: + return makeVectorFromVec(c, (*node)->getValue()); + case props::VEC4D: + return makeVectorFromVec(c, (*node)->getValue()); default: return naNil(); } } +template +T makeVecFromVector(naRef vector) +{ + T vec; + const int num_components + = sizeof(vec.data()) / sizeof(typename T::value_type); + int size = naVec_size(vector); + + for (int i = 0; i < num_components && i < size; ++i) { + naRef element = naVec_get(vector, i); + naRef n = naNumValue(element); + if (!naIsNil(n)) + vec[i] = n.num; + } + return vec; +} + static naRef f_setValue(naContext c, naRef me, int argc, naRef* args) { NODEARG(); naRef val = naVec_get(argv, 0); - if(naIsString(val)) (*node)->setStringValue(naStr_data(val)); - else { + bool result = false; + if(naIsString(val)) { + result = (*node)->setStringValue(naStr_data(val)); + } else if(naIsVector(val)) { + if(naVec_size(val) == 3) + result = (*node)->setValue(makeVecFromVector(val)); + else if(naVec_size(val) == 4) + result = (*node)->setValue(makeVecFromVector(val)); + else + naRuntimeError(c, "props.setValue() vector value has wrong size"); + } else { naRef n = naNumValue(val); if(naIsNil(n)) naRuntimeError(c, "props.setValue() with non-number"); - (*node)->setDoubleValue(naNumValue(val).num); + + double d = naNumValue(val).num; + if (SGMisc::isNaN(d)) { + naRuntimeError(c, "props.setValue() passed a NaN"); + } + + result = (*node)->setDoubleValue(d); } - return naNil(); + return naNum(result); } static naRef f_setIntValue(naContext c, naRef me, int argc, naRef* args) @@ -182,31 +265,33 @@ static naRef f_setIntValue(naContext c, naRef me, int argc, naRef* args) double tmp2 = tmp1.num; int iv = (int)tmp2; - (*node)->setIntValue(iv); - return naNil(); + return naNum((*node)->setIntValue(iv)); } static naRef f_setBoolValue(naContext c, naRef me, int argc, naRef* args) { NODEARG(); naRef val = naVec_get(argv, 0); - (*node)->setBoolValue(naTrue(val) ? true : false); - return naNil(); + return naNum((*node)->setBoolValue(naTrue(val) ? true : false)); } static naRef f_setDoubleValue(naContext c, naRef me, int argc, naRef* args) { NODEARG(); naRef r = naNumValue(naVec_get(argv, 0)); - if(naIsNil(r)) + if (naIsNil(r)) naRuntimeError(c, "props.setDoubleValue() with non-number"); - (*node)->setDoubleValue(r.num); - return naNil(); + + if (SGMisc::isNaN(r.num)) { + naRuntimeError(c, "props.setDoubleValue() passed a NaN"); + } + + return naNum((*node)->setDoubleValue(r.num)); } static naRef f_getParent(naContext c, naRef me, int argc, naRef* args) { - NODEARG(); + NODENOARG(); SGPropertyNode* n = (*node)->getParent(); if(!n) return naNil(); return propNodeGhostCreate(c, n); @@ -218,7 +303,7 @@ static naRef f_getChild(naContext c, naRef me, int argc, naRef* args) naRef child = naVec_get(argv, 0); if(!naIsString(child)) return naNil(); naRef idx = naNumValue(naVec_get(argv, 1)); - bool create = naTrue(naVec_get(argv, 2)); + bool create = naTrue(naVec_get(argv, 2)) != 0; SGPropertyNode* n; try { if(naIsNil(idx) || !naIsNum(idx)) { @@ -259,18 +344,87 @@ static naRef f_getChildren(naContext c, naRef me, int argc, naRef* args) return result; } +static naRef f_addChild(naContext c, naRef me, int argc, naRef* args) +{ + NODEARG(); + naRef child = naVec_get(argv, 0); + if(!naIsString(child)) return naNil(); + naRef ref_min_index = naNumValue(naVec_get(argv, 1)); + naRef ref_append = naVec_get(argv, 2); + SGPropertyNode* n; + try + { + int min_index = 0; + if( !naIsNil(ref_min_index) && naIsNum(ref_min_index) ) + min_index = ref_min_index.num; + + bool append = true; + if( !naIsNil(ref_append) ) + append = naTrue(ref_append) != 0; + + n = (*node)->addChild(naStr_data(child), min_index, append); + } + catch (const string& err) + { + naRuntimeError(c, (char *)err.c_str()); + return naNil(); + } + + return propNodeGhostCreate(c, n); +} + +static naRef f_addChildren(naContext c, naRef me, int argc, naRef* args) +{ + NODEARG(); + naRef child = naVec_get(argv, 0); + if(!naIsString(child)) return naNil(); + naRef ref_count = naNumValue(naVec_get(argv, 1)); + naRef ref_min_index = naNumValue(naVec_get(argv, 2)); + naRef ref_append = naVec_get(argv, 3); + try + { + size_t count = 0; + if( !naIsNum(ref_count) ) + throw string("props.addChildren() missing number of children"); + count = ref_count.num; + + int min_index = 0; + if( !naIsNil(ref_min_index) && naIsNum(ref_min_index) ) + min_index = ref_min_index.num; + + bool append = true; + if( !naIsNil(ref_append) ) + append = naTrue(ref_append) != 0; + + const simgear::PropertyList& nodes = + (*node)->addChildren(naStr_data(child), count, min_index, append); + + naRef result = naNewVector(c); + for( size_t i = 0; i < nodes.size(); ++i ) + naVec_append(result, propNodeGhostCreate(c, nodes[i])); + return result; + } + catch (const string& err) + { + naRuntimeError(c, (char *)err.c_str()); + } + + return naNil(); +} + static naRef f_removeChild(naContext c, naRef me, int argc, naRef* args) { NODEARG(); naRef child = naVec_get(argv, 0); naRef index = naVec_get(argv, 1); if(!naIsString(child) || !naIsNum(index)) return naNil(); + SGPropertyNode_ptr n = 0; try { - (*node)->removeChild(naStr_data(child), (int)index.num, false); + n = (*node)->removeChild(naStr_data(child), (int)index.num, false); } catch (const string& err) { naRuntimeError(c, (char *)err.c_str()); } - return naNil(); + return propNodeGhostCreate(c, n); } static naRef f_removeChildren(naContext c, naRef me, int argc, naRef* args) @@ -280,7 +434,7 @@ static naRef f_removeChildren(naContext c, naRef me, int argc, naRef* args) if(naIsNil(argv) || naVec_size(argv) == 0) { // Remove all children for(int i = (*node)->nChildren() - 1; i >=0; i--) - naVec_append(result, propNodeGhostCreate(c, (*node)->removeChild(i))); + naVec_append(result, propNodeGhostCreate(c, (*node)->removeChild(i, false))); } else { // Remove all children of a specified name naRef name = naVec_get(argv, 0); @@ -298,11 +452,39 @@ static naRef f_removeChildren(naContext c, naRef me, int argc, naRef* args) return result; } +static naRef f_alias(naContext c, naRef me, int argc, naRef* args) +{ + NODEARG(); + SGPropertyNode* al; + naRef prop = naVec_get(argv, 0); + try { + if(naIsString(prop)) al = globals->get_props()->getNode(naStr_data(prop), true); + else if(naIsGhost(prop)) al = *(SGPropertyNode_ptr*)naGhost_ptr(prop); + else throw string("props.alias() with bad argument"); + } catch (const string& err) { + naRuntimeError(c, (char *)err.c_str()); + return naNil(); + } + return naNum((*node)->alias(al)); +} + +static naRef f_unalias(naContext c, naRef me, int argc, naRef* args) +{ + NODENOARG(); + return naNum((*node)->unalias()); +} + +static naRef f_getAliasTarget(naContext c, naRef me, int argc, naRef* args) +{ + NODENOARG(); + return propNodeGhostCreate(c, (*node)->getAliasTarget()); +} + static naRef f_getNode(naContext c, naRef me, int argc, naRef* args) { NODEARG(); naRef path = naVec_get(argv, 0); - bool create = naTrue(naVec_get(argv, 1)); + bool create = naTrue(naVec_get(argv, 1)) != 0; if(!naIsString(path)) return naNil(); SGPropertyNode* n; try { @@ -341,8 +523,13 @@ static struct { { f_getParent, "_getParent" }, { f_getChild, "_getChild" }, { f_getChildren, "_getChildren" }, + { f_addChild, "_addChild" }, + { f_addChildren, "_addChildren" }, { f_removeChild, "_removeChild" }, { f_removeChildren, "_removeChildren" }, + { f_alias, "_alias" }, + { f_unalias, "_unalias" }, + { f_getAliasTarget, "_getAliasTarget" }, { f_getNode, "_getNode" }, { f_new, "_new" }, { f_globals, "_globals" },