Skip to content

Commit

Permalink
Speed improvements in function args parsing and instance creation
Browse files Browse the repository at this point in the history
  • Loading branch information
@PierreQuentel
PierreQuentel committed Sep 11, 2014
1 parent ce59a86 commit 9e6e023
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 94 deletions.
37 changes: 8 additions & 29 deletions src/brython.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4329,9 +4329,10 @@ var factory=_b_.getattr(metaclass,'__new__').apply(null,[factory,class_name,base
_b_.getattr(metaclass,'__init__').apply(null,[factory,class_name,bases,cl_dict])
for(var member in metaclass.$dict){if(typeof metaclass.$dict[member]=='function' && member !='__new__'){metaclass.$dict[member].$type='classmethod'
}}
factory.__class__={__class__:$B.$type,$factory:metaclass,$is_func:true,is_class:true,__code__:{'__class__': $B.CodeDict},__mro__:metaclass.$dict.__mro__
factory.__class__={__class__:$B.$type,$factory:metaclass,is_class:true,__code__:{'__class__': $B.CodeDict},__mro__:metaclass.$dict.__mro__
}
factory.$dict.__class__=metaclass.$dict
factory.$is_func=true
return factory
}
_b_.type=function(name,bases,cl_dict){
Expand Down Expand Up @@ -4376,6 +4377,7 @@ var factory=(function(_class){return function(){return $instance_creator(_class)
}})(class_dict)
factory.__class__=$B.$factory
factory.$dict=class_dict
factory.$is_func=true
factory.__eq__=function(other){return other===factory.__class__}
class_dict.$factory=factory
return factory
Expand Down Expand Up @@ -4481,12 +4483,12 @@ return method
}}
function $instance_creator(klass){
return function(){var new_func=null,init_func=null,obj
try{new_func=_b_.getattr(klass,'__new__')
if(klass.__bases__.length==1 && klass.__new__==undefined){obj={__class__:klass}}else{try{new_func=_b_.getattr(klass,'__new__')
}catch(err){$B.$pop_exc()}
if(new_func!==null){var args=[klass.$factory]
for(var i=0;i<arguments.length;i++){args.push(arguments[i])}
obj=new_func.apply(null,args)
}
}}
if(!obj.__initialized__){try{init_func=_b_.getattr(klass,'__init__')}
catch(err){$B.$pop_exc()}
if(init_func!==null){var args=[obj]
Expand All @@ -4506,15 +4508,7 @@ $B.$InstanceMethodDict={__class__:$B.$type,__name__:'instancemethod',__mro__:[_b
}})(__BRYTHON__)
;(function($B){var _b_=$B.builtins
$B.$MakeArgs=function($fname,$args,$required,$defaults,$other_args,$other_kw,$after_star){
if($defaults.length==0 && $other_args===null && $other_kw===null &&
$after_star.length==0){var $ns={},flag=true
for(var i=0;i<$args.length;i++){var $arg=$args[i]
if(typeof $arg=='number' ||typeof $arg=='string'){$ns[$required[i]]=$arg
}else{flag=false
break
}}
if(flag){return $ns}}
var i=null,$set_vars=[],$ns={},$arg
var $set_vars=[],$ns={},$arg
if($other_args !=null){$ns[$other_args]=[]}
if($other_kw !=null){var $dict_keys=[];var $dict_values=[]}
var upargs=[]
Expand All @@ -4540,19 +4534,15 @@ for(var $i=0;$i<upargs.length;$i++){var $arg=upargs[$i]
var $PyVar=$B.$JS2Py($arg)
if($arg && $arg.$nat=='kw'){
$PyVar=$arg.value
if($set_vars.indexOf($arg.name)>-1){console.log($arg.name+' already set to '+$ns[$arg.name])
throw _b_.TypeError($fname+"() got multiple values for argument '"+$arg.name+"'")
if($ns[$arg.name]!==undefined){throw _b_.TypeError($fname+"() got multiple values for argument '"+$arg.name+"'")
}else if($required.indexOf($arg.name)>-1){var ix=$required.indexOf($arg.name)
eval('var '+$required[ix]+"=$PyVar")
$ns[$required[ix]]=$PyVar
$set_vars.push($required[ix])
}else if($other_args!==null && $after_star!==undefined &&
$after_star.indexOf($arg.name)>-1){var ix=$after_star.indexOf($arg.name)
eval('var '+$after_star[ix]+"=$PyVar")
$ns[$after_star[ix]]=$PyVar
$set_vars.push($after_star[ix])
}else if($defaults.indexOf($arg.name)>-1){$ns[$arg.name]=$PyVar
$set_vars.push($arg.name)
}else if($other_kw!=null){$dict_keys.push($arg.name)
$dict_values.push($PyVar)
}else{
Expand All @@ -4562,11 +4552,9 @@ var pos_def=$defaults.indexOf($arg.name)
if(pos_def!=-1){$defaults.splice(pos_def,1)}}else{
if($i<$required.length){eval('var '+$required[$i]+"=$PyVar")
$ns[$required[$i]]=$PyVar
$set_vars.push($required[$i])
}else if($other_args!==null){eval('$ns["'+$other_args+'"].push($PyVar)')
}else if($i<$required.length+$defaults.length){var $var_name=$defaults[$i-$required.length]
$ns[$var_name]=$PyVar
$set_vars.push($var_name)
}else{
console.log(''+$B.line_info)
msg=$fname+"() takes "+$required.length+' positional argument'
Expand All @@ -4575,7 +4563,7 @@ msg +=' but more were given'
throw _b_.TypeError(msg)
}}}
var missing=[]
for(var i=0;i<$required.length;i++){if($set_vars.indexOf($required[i])==-1){missing.push($required[i])}}
for(var i=0;i<$required.length;i++){if($ns[$required[i]]===undefined){missing.push($required[i])}}
if(missing.length==1){throw _b_.TypeError($fname+" missing 1 positional argument: '"+missing[0]+"'")
}else if(missing.length>1){var msg=$fname+" missing "+missing.length+" positional arguments: "
for(var i=0;i<missing.length-1;i++){msg +="'"+missing[i]+"', "}
Expand Down Expand Up @@ -4802,15 +4790,6 @@ exc.info +=$B.$syntax_err_line(module,pos)
throw exc
}
$B.$pop_exc=function(){$B.exception_stack.pop()}
$B.$Kw=function(name,value){return{
$nat:'kw',name:name,value:value
}}
$B.$ptuple=function(arg){return{
$nat:'ptuple',arg:arg
}}
$B.$pdict=function(arg){return{
$nat:'pdict',arg:arg
}}
$B.$test_item=function(expr){
$B.$test_result=expr
return _b_.bool(expr)
Expand Down
22 changes: 14 additions & 8 deletions src/py_type.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ $B.$class_constructor = function(class_name,class_obj,parents,parents_names,kwar
factory.__class__ = {
__class__:$B.$type,
$factory:metaclass,
$is_func:true,
is_class:true,
__code__: {'__class__': $B.CodeDict},
__mro__:metaclass.$dict.__mro__
}
factory.$dict.__class__ = metaclass.$dict
factory.$is_func = true
return factory
}

Expand Down Expand Up @@ -157,6 +157,7 @@ _b_.type = function(name,bases,cl_dict){
})(class_dict)
factory.__class__ = $B.$factory
factory.$dict = class_dict
factory.$is_func = true // to speed up calls

// factory compares equal to class_dict
// so that instance.__class__ compares equal to factory
Expand Down Expand Up @@ -361,13 +362,18 @@ function $instance_creator(klass){
return function(){
var new_func=null,init_func=null,obj
// apply __new__ to initialize the instance
try{
new_func = _b_.getattr(klass,'__new__')
}catch(err){$B.$pop_exc()}
if(new_func!==null){
var args = [klass.$factory]
for(var i=0;i<arguments.length;i++){args.push(arguments[i])}
obj = new_func.apply(null,args)
if(klass.__bases__.length==1 && klass.__new__==undefined){
obj = {__class__:klass}
}else{

try{
new_func = _b_.getattr(klass,'__new__')
}catch(err){$B.$pop_exc()}
if(new_func!==null){
var args = [klass.$factory]
for(var i=0;i<arguments.length;i++){args.push(arguments[i])}
obj = new_func.apply(null,args)
}
}
// __initialized__ is set in object.__new__ if klass has a method __init__
if(!obj.__initialized__){
Expand Down
67 changes: 10 additions & 57 deletions src/py_utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,12 @@ $B.$MakeArgs = function($fname,$args,$required,$defaults,$other_args,$other_kw,$
// builds a namespace from the arguments provided in $args
// in a function defined like foo(x,y,z=1,*args,u,v,**kw) the parameters are
// $required : ['x','y']
// $defaults : {'z':int(1)}
// $defaults : {'z':1}
// $other_args = 'args'
// $other_kw = 'kw'
// $after_star = ['u','v']

// simple case : only required arguments

if($defaults.length==0 && $other_args===null && $other_kw===null &&
$after_star.length==0){
var $ns = {}, flag = true
for(var i=0;i<$args.length;i++){
var $arg = $args[i]
if(typeof $arg=='number' || typeof $arg=='string'){
$ns[$required[i]]=$arg
}else{
flag = false
break
}
}
if(flag){return $ns}
}

var i=null,$set_vars = [],$ns = {},$arg
var $set_vars = [],$ns = {},$arg
if($other_args != null){$ns[$other_args]=[]}
if($other_kw != null){var $dict_keys=[];var $dict_values=[]}
// create new list of arguments in case some are packed
Expand Down Expand Up @@ -62,23 +45,22 @@ $B.$MakeArgs = function($fname,$args,$required,$defaults,$other_args,$other_kw,$
var $PyVar=$B.$JS2Py($arg)
if($arg && $arg.$nat=='kw'){ // keyword argument
$PyVar = $arg.value
if($set_vars.indexOf($arg.name)>-1){
console.log($arg.name+' already set to '+$ns[$arg.name])
if($ns[$arg.name]!==undefined){
throw _b_.TypeError($fname+"() got multiple values for argument '"+$arg.name+"'")
} else if($required.indexOf($arg.name)>-1){
}else if($required.indexOf($arg.name)>-1){
var ix = $required.indexOf($arg.name)
eval('var '+$required[ix]+"=$PyVar")
$ns[$required[ix]]=$PyVar
$set_vars.push($required[ix])
//$set_vars.push($required[ix])
}else if($other_args!==null && $after_star!==undefined &&
$after_star.indexOf($arg.name)>-1){
var ix = $after_star.indexOf($arg.name)
eval('var '+$after_star[ix]+"=$PyVar")
$ns[$after_star[ix]]=$PyVar
$set_vars.push($after_star[ix])
//$set_vars.push($after_star[ix])
} else if($defaults.indexOf($arg.name)>-1){
$ns[$arg.name]=$PyVar
$set_vars.push($arg.name)
//$set_vars.push($arg.name)
} else if($other_kw!=null){
$dict_keys.push($arg.name)
$dict_values.push($PyVar)
Expand All @@ -91,13 +73,13 @@ $B.$MakeArgs = function($fname,$args,$required,$defaults,$other_args,$other_kw,$
if($i<$required.length){
eval('var '+$required[$i]+"=$PyVar")
$ns[$required[$i]]=$PyVar
$set_vars.push($required[$i])
//$set_vars.push($required[$i])
} else if($other_args!==null){
eval('$ns["'+$other_args+'"].push($PyVar)')
} else if($i<$required.length+$defaults.length) {
var $var_name = $defaults[$i-$required.length]
$ns[$var_name]=$PyVar
$set_vars.push($var_name)
//$set_vars.push($var_name)
} else {
console.log(''+$B.line_info)
msg = $fname+"() takes "+$required.length+' positional argument'
Expand All @@ -110,7 +92,7 @@ $B.$MakeArgs = function($fname,$args,$required,$defaults,$other_args,$other_kw,$
// throw error if not all required positional arguments have been set
var missing = []
for(var i=0;i<$required.length;i++){
if($set_vars.indexOf($required[i])==-1){missing.push($required[i])}
if($ns[$required[i]]===undefined){missing.push($required[i])}
}
if(missing.length==1){
throw _b_.TypeError($fname+" missing 1 positional argument: '"+missing[0]+"'")
Expand Down Expand Up @@ -426,35 +408,6 @@ $B.$IndentationError = function(module,msg,pos) {
// function to remove internal exceptions from stack exposed to programs
$B.$pop_exc=function(){$B.exception_stack.pop()}

// classes used for passing parameters to functions
// keyword arguments : foo(x=1)

$B.$Kw = function(name,value){
return {
$nat:'kw',
name:name,
value:value
}
}

// packed tuple : foo(*args)

$B.$ptuple = function(arg){
return {
$nat:'ptuple',
arg:arg
}
}

// packed dict : foo(**kw)

$B.$pdict = function(arg){
return {
$nat:'pdict',
arg:arg
}
}

$B.$test_item = function(expr){
// used to evaluate expressions with "and" or "or"
// returns a Javascript boolean (true or false) and stores
Expand Down

0 comments on commit 9e6e023

Please sign in to comment.