xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Eliot Horowitz
2009-04-28 08:48:30 -04:00
parent 3ca02da7e3 ce91c67c40
commit 1542f33dda
30 changed files with 775 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripting/engine_spidermonkey.cpp
View File

@@ -172,7 +172,19 @@ namespace mongo {
// ---- functions -----
JSFunction * compileFunction( const char * code ){
return JS_CompileFunction( _context , 0 , "anonymous" , 0 , 0 , code , strlen( code ) , "nofile" , 0 );
if ( strstr( code , "function(" ) != code )
return JS_CompileFunction( _context , 0 , "anonymous" , 0 , 0 , code , strlen( code ) , "nofile" , 0 );
// TODO: there must be a way in spider monkey to do this - this is a total hack
string s = "return ";
s += code;
s += ";";
JSFunction * func = JS_CompileFunction( _context , 0 , "anonymous" , 0 , 0 , s.c_str() , strlen( s.c_str() ) , "nofile" , 0 );
jsval ret;
JS_CallFunction( _context , 0 , func , 0 , 0 , &ret );
return JS_ValueToFunction( _context , ret );
}
ScriptingFunction createFunction( const char * code ){
@@ -182,6 +194,7 @@ namespace mongo {
int invoke( JSFunction * func , const BSONObj& args ){
jsval rval;
JS_CallFunction( _context , 0 , func , 0 , 0 , &rval );
assert( JS_SetProperty( _context , _global , "return" , &rval ) );
return 0;
}