Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

- Get/SetGlobal() added

Browse Source 
- Made CreateCustomObject call the constructor (JS_NewObject =>
JS_ConstructObject)
- Made the JS error reporter work even before the console has been
constructed

This was SVN commit r620.
This commit is contained in:
Simon Brenner 2004-07-04 15:35:04 +00:00
parent b137e965f3
commit 3109d4361a
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/scripting/ScriptingHost.cpp
View File

@ -231,7 +231,7 @@ JSObject * ScriptingHost::CreateCustomObject(const std::string & typeName)
throw std::string("Tried to create a type that doesn't exist");
}
return JS_NewObject(m_Context, (*it).second.m_Class, (*it).second.m_Object, NULL);
return JS_ConstructObject(m_Context, (*it).second.m_Class, (*it).second.m_Object, NULL);
}
@ -247,6 +247,18 @@ jsval ScriptingHost::GetObjectProperty( JSObject* object, const std::string& pro
return( vp );
}
void ScriptingHost::SetGlobal(const std::string &globalName, jsval value)
{
JS_SetProperty(m_Context, m_GlobalObject, globalName.c_str(), &value);
}
jsval ScriptingHost::GetGlobal(const std::string &globalName)
{
jsval vp;
JS_GetProperty(m_Context, m_GlobalObject, globalName.c_str(), &vp);
return vp;
}
int ScriptingHost::ValueToInt(const jsval value)
{
int32 i = 0;
@ -298,13 +310,16 @@ double ScriptingHost::ValueToDouble(const jsval value)
void ScriptingHost::ErrorReporter(JSContext * context, const char * message, JSErrorReport * report)
{
g_Console->InsertMessage( L"%S ( %d )", report->filename, report->lineno );
if( message )
if (g_Console)
{
g_Console->InsertMessage( L"%S", message );
g_Console->InsertMessage( L"%S ( %d )", report->filename, report->lineno );
if( message )
{
g_Console->InsertMessage( L"%S", message );
}
else
g_Console->InsertMessage( L"No error message available" );
}
else
g_Console->InsertMessage( L"No error message available" );
if (report->filename != NULL)
{

3
source/scripting/ScriptingHost.h
View File

@ -72,6 +72,9 @@ public:
void SetObjectProperty(JSObject * object, const std::string & propertyName, jsval value);
jsval GetObjectProperty( JSObject* object, const std::string& propertyName );
void SetGlobal(const std::string& globalName, jsval value);
jsval GetGlobal(const std::string& globalName);
int ValueToInt(const jsval value);
bool ValueToBool(const jsval value);
std::string ValueToString(const jsval value);