Skip to content

Commit 56f2602

Browse files
author
hartsantler
committed
fixed init empty list(), added tuple type and test, regenerated runtime.
1 parent 1bdaf9e commit 56f2602

7 files changed

Lines changed: 356 additions & 48 deletions

File tree

pythonscript.js

Lines changed: 189 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// PythonScript Runtime - regenerated on: Wed Oct 9 06:17:34 2013
1+
// PythonScript Runtime - regenerated on: Wed Oct 9 08:04:44 2013
22
var jsrange = function(num) {
33
"Emulates Python's range function";
44
var i, r;
@@ -535,13 +535,13 @@ var num = arguments['num'];
535535
"Emulates Python's range function";
536536
var i, r;
537537
i = 0;
538-
r = list(create_array(), Object());
538+
r = get_attribute(list, "__call__")(create_array(), Object());
539539
while(i < num) {
540540
var __args_0, __kwargs_0;
541541
__args_0 = create_array(i);
542542
__kwargs_0 = Object();
543543
get_attribute(get_attribute(r, "append"), "__call__")(__args_0, __kwargs_0);
544-
i = i + 1;
544+
i += 1
545545
}
546546
return r;
547547
}
@@ -579,7 +579,7 @@ signature = {"kwargs": Object(), "args": create_array("func", "objs")};
579579
arguments = get_arguments(signature, args, kwargs);
580580
var func = arguments['func'];
581581
var objs = arguments['objs'];
582-
out = list(create_array(), Object());
582+
out = get_attribute(list, "__call__")(create_array(), Object());
583583
var __args_1, __kwargs_1;
584584
__args_1 = create_array(func, get_attribute(objs, "js_object"));
585585
__kwargs_1 = Object();
@@ -633,6 +633,131 @@ window["__Iterator_next"] = __Iterator_next
633633
__Iterator_next.pythonscript_function = true;
634634
window["__Iterator_attrs"]["next"] = __Iterator_next;
635635
Iterator = create_class("Iterator", window["__Iterator_parents"], window["__Iterator_attrs"]);
636+
var tuple, __tuple_attrs, __tuple_parents;
637+
window["__tuple_attrs"] = Object();
638+
window["__tuple_parents"] = create_array();
639+
var __tuple___init__ = function(args, kwargs) {
640+
var signature, arguments;
641+
signature = {"kwargs": {"js_object": undefined}, "args": create_array("self", "js_object")};
642+
arguments = get_arguments(signature, args, kwargs);
643+
var self = arguments['self'];
644+
var js_object = arguments['js_object'];
645+
if(js_object) {
646+
self["__dict__"]["js_object"] = js_object;
647+
}
648+
else {
649+
self["__dict__"]["js_object"] = create_array();
650+
}
651+
652+
}
653+
window["__tuple___init__"] = __tuple___init__
654+
655+
__tuple___init__.pythonscript_function = true;
656+
window["__tuple_attrs"]["__init__"] = __tuple___init__;
657+
var __tuple___getitem__ = function(args, kwargs) {
658+
var __array;
659+
var signature, arguments;
660+
signature = {"kwargs": Object(), "args": create_array("self", "index")};
661+
arguments = get_arguments(signature, args, kwargs);
662+
var self = arguments['self'];
663+
var index = arguments['index'];
664+
__array = self["__dict__"]["js_object"];
665+
return __array[index];
666+
}
667+
window["__tuple___getitem__"] = __tuple___getitem__
668+
669+
__tuple___getitem__.pythonscript_function = true;
670+
window["__tuple_attrs"]["__getitem__"] = __tuple___getitem__;
671+
var __tuple___iter__ = function(args, kwargs) {
672+
var signature, arguments;
673+
signature = {"kwargs": Object(), "args": create_array("self")};
674+
arguments = get_arguments(signature, args, kwargs);
675+
var self = arguments['self'];
676+
var __args_4, __kwargs_4;
677+
__args_4 = create_array(self, 0);
678+
__kwargs_4 = Object();
679+
return get_attribute(Iterator, "__call__")(__args_4, __kwargs_4);
680+
}
681+
window["__tuple___iter__"] = __tuple___iter__
682+
683+
__tuple___iter__.pythonscript_function = true;
684+
window["__tuple_attrs"]["__iter__"] = __tuple___iter__;
685+
var __tuple___len__ = function(args, kwargs) {
686+
var __array;
687+
var signature, arguments;
688+
signature = {"kwargs": Object(), "args": create_array("self")};
689+
arguments = get_arguments(signature, args, kwargs);
690+
var self = arguments['self'];
691+
var __array;
692+
__array = self["__dict__"]["js_object"];
693+
return __array.length;
694+
}
695+
window["__tuple___len__"] = __tuple___len__
696+
697+
__tuple___len__.pythonscript_function = true;
698+
window["__tuple_attrs"]["__len__"] = __tuple___len__;
699+
var __tuple_index = function(args, kwargs) {
700+
var __array;
701+
var signature, arguments;
702+
signature = {"kwargs": Object(), "args": create_array("self", "obj")};
703+
arguments = get_arguments(signature, args, kwargs);
704+
var self = arguments['self'];
705+
var obj = arguments['obj'];
706+
__array = self["__dict__"]["js_object"];
707+
return __array.indexOf(obj);
708+
}
709+
window["__tuple_index"] = __tuple_index
710+
711+
__tuple_index.pythonscript_function = true;
712+
window["__tuple_attrs"]["index"] = __tuple_index;
713+
var __tuple_count = function(args, kwargs) {
714+
var i;
715+
var signature, arguments;
716+
signature = {"kwargs": Object(), "args": create_array("self", "obj")};
717+
arguments = get_arguments(signature, args, kwargs);
718+
var self = arguments['self'];
719+
var obj = arguments['obj'];
720+
i = 0;
721+
var __iterator__, other;
722+
__iterator__ = get_attribute(get_attribute(self, "__iter__"), "__call__")(create_array(), Object());
723+
try {
724+
other = get_attribute(__iterator__, "next")(create_array(), Object());
725+
while(true) {
726+
if(other == obj) {
727+
i = i + 1;
728+
}
729+
730+
other = get_attribute(__iterator__, "next")(create_array(), Object());
731+
}
732+
}
733+
catch(__exception__) {
734+
if (__exception__ == StopIteration || isinstance([__exception__, StopIteration])) {
735+
736+
}
737+
738+
}
739+
740+
return i;
741+
}
742+
window["__tuple_count"] = __tuple_count
743+
744+
__tuple_count.pythonscript_function = true;
745+
window["__tuple_attrs"]["count"] = __tuple_count;
746+
var __tuple_get = function(args, kwargs) {
747+
var __array;
748+
var signature, arguments;
749+
signature = {"kwargs": Object(), "args": create_array("self", "index")};
750+
arguments = get_arguments(signature, args, kwargs);
751+
var self = arguments['self'];
752+
var index = arguments['index'];
753+
__array = self["__dict__"]["js_object"];
754+
return __array[index];
755+
}
756+
window["__tuple_get"] = __tuple_get
757+
758+
__tuple_get.pythonscript_function = true;
759+
window["__tuple_attrs"]["get"] = __tuple_get;
760+
tuple = create_class("tuple", window["__tuple_parents"], window["__tuple_attrs"]);
636761
var list, __list_attrs, __list_parents;
637762
window["__list_attrs"] = Object();
638763
window["__list_parents"] = create_array();
@@ -643,17 +768,46 @@ arguments = get_arguments(signature, args, kwargs);
643768
var self = arguments['self'];
644769
var js_object = arguments['js_object'];
645770
if(js_object) {
646-
self["__dict__"]["js_object"] = js_object;
771+
set_attribute(self, "js_object", js_object);
647772
}
648773
else {
649-
self["__dict__"]["js_object"] = create_array();
774+
set_attribute(self, "js_object", create_array());
650775
}
651776

652777
}
653778
window["__list___init__"] = __list___init__
654779

655780
__list___init__.pythonscript_function = true;
656781
window["__list_attrs"]["__init__"] = __list___init__;
782+
var __list___getitem__ = function(args, kwargs) {
783+
var __array;
784+
var signature, arguments;
785+
signature = {"kwargs": Object(), "args": create_array("self", "index")};
786+
arguments = get_arguments(signature, args, kwargs);
787+
var self = arguments['self'];
788+
var index = arguments['index'];
789+
__array = get_attribute(self, "js_object");
790+
return __array[index];
791+
}
792+
window["__list___getitem__"] = __list___getitem__
793+
794+
__list___getitem__.pythonscript_function = true;
795+
window["__list_attrs"]["__getitem__"] = __list___getitem__;
796+
var __list___setitem__ = function(args, kwargs) {
797+
var __array;
798+
var signature, arguments;
799+
signature = {"kwargs": Object(), "args": create_array("self", "index", "value")};
800+
arguments = get_arguments(signature, args, kwargs);
801+
var self = arguments['self'];
802+
var index = arguments['index'];
803+
var value = arguments['value'];
804+
__array = get_attribute(self, "js_object");
805+
__array[index] = value;
806+
}
807+
window["__list___setitem__"] = __list___setitem__
808+
809+
__list___setitem__.pythonscript_function = true;
810+
window["__list_attrs"]["__setitem__"] = __list___setitem__;
657811
var __list_append = function(args, kwargs) {
658812
var __array;
659813
var signature, arguments;
@@ -662,7 +816,7 @@ arguments = get_arguments(signature, args, kwargs);
662816
var self = arguments['self'];
663817
var obj = arguments['obj'];
664818
var __array;
665-
__array = self["__dict__"]["js_object"];
819+
__array = get_attribute(self, "js_object");
666820
__array.push(obj);
667821
}
668822
window["__list_append"] = __list_append
@@ -680,10 +834,10 @@ __iterator__ = get_attribute(get_attribute(other, "__iter__"), "__call__")(creat
680834
try {
681835
obj = get_attribute(__iterator__, "next")(create_array(), Object());
682836
while(true) {
683-
var __args_4, __kwargs_4;
684-
__args_4 = create_array(obj);
685-
__kwargs_4 = Object();
686-
get_attribute(get_attribute(self, "append"), "__call__")(__args_4, __kwargs_4);
837+
var __args_5, __kwargs_5;
838+
__args_5 = create_array(obj);
839+
__kwargs_5 = Object();
840+
get_attribute(get_attribute(self, "append"), "__call__")(__args_5, __kwargs_5);
687841
obj = get_attribute(__iterator__, "next")(create_array(), Object());
688842
}
689843
}
@@ -708,7 +862,7 @@ var self = arguments['self'];
708862
var index = arguments['index'];
709863
var obj = arguments['obj'];
710864
var __array;
711-
__array = self["__dict__"]["js_object"];
865+
__array = get_attribute(self, "js_object");
712866
__array.splice(index, 0, obj);
713867
}
714868
window["__list_insert"] = __list_insert
@@ -723,11 +877,11 @@ arguments = get_arguments(signature, args, kwargs);
723877
var self = arguments['self'];
724878
var obj = arguments['obj'];
725879
var __array;
726-
var __args_5, __kwargs_5;
727-
__args_5 = create_array(obj);
728-
__kwargs_5 = Object();
729-
index = get_attribute(get_attribute(self, "index"), "__call__")(__args_5, __kwargs_5);
730-
__array = self["__dict__"]["js_object"];
880+
var __args_6, __kwargs_6;
881+
__args_6 = create_array(obj);
882+
__kwargs_6 = Object();
883+
index = get_attribute(get_attribute(self, "index"), "__call__")(__args_6, __kwargs_6);
884+
__array = get_attribute(self, "js_object");
731885
__array.splice(index, 1);
732886
}
733887
window["__list_remove"] = __list_remove
@@ -741,7 +895,7 @@ signature = {"kwargs": Object(), "args": create_array("self")};
741895
arguments = get_arguments(signature, args, kwargs);
742896
var self = arguments['self'];
743897
var __array;
744-
__array = self["__dict__"]["js_object"];
898+
__array = get_attribute(self, "js_object");
745899
return __array.pop();
746900
}
747901
window["__list_pop"] = __list_pop
@@ -756,7 +910,7 @@ arguments = get_arguments(signature, args, kwargs);
756910
var self = arguments['self'];
757911
var obj = arguments['obj'];
758912
var __array;
759-
__array = self["__dict__"]["js_object"];
913+
__array = get_attribute(self, "js_object");
760914
return __array.indexOf(obj);
761915
}
762916
window["__list_index"] = __list_index
@@ -803,8 +957,8 @@ signature = {"kwargs": Object(), "args": create_array("self")};
803957
arguments = get_arguments(signature, args, kwargs);
804958
var self = arguments['self'];
805959
var __array;
806-
__array = self["__dict__"]["js_object"];
807-
self["__dict__"]["js_object"] = __array.reverse();
960+
__array = get_attribute(self, "js_object");
961+
set_attribute(self, "js_object", __array.reverse());
808962
}
809963
window["__list_reverse"] = __list_reverse
810964

@@ -817,7 +971,7 @@ signature = {"kwargs": Object(), "args": create_array("self")};
817971
arguments = get_arguments(signature, args, kwargs);
818972
var self = arguments['self'];
819973
var __array;
820-
__array = self["__dict__"]["js_object"];
974+
__array = get_attribute(self, "js_object");
821975
return __array.shift();
822976
}
823977
window["__list_shift"] = __list_shift
@@ -833,7 +987,7 @@ var self = arguments['self'];
833987
var start = arguments['start'];
834988
var end = arguments['end'];
835989
var __array;
836-
__array = self["__dict__"]["js_object"];
990+
__array = get_attribute(self, "js_object");
837991
return __array.slice(start, end);
838992
}
839993
window["__list_slice"] = __list_slice
@@ -845,10 +999,10 @@ var signature, arguments;
845999
signature = {"kwargs": Object(), "args": create_array("self")};
8461000
arguments = get_arguments(signature, args, kwargs);
8471001
var self = arguments['self'];
848-
var __args_6, __kwargs_6;
849-
__args_6 = create_array(self, 0);
850-
__kwargs_6 = Object();
851-
return get_attribute(Iterator, "__call__")(__args_6, __kwargs_6);
1002+
var __args_7, __kwargs_7;
1003+
__args_7 = create_array(self, 0);
1004+
__kwargs_7 = Object();
1005+
return get_attribute(Iterator, "__call__")(__args_7, __kwargs_7);
8521006
}
8531007
window["__list___iter__"] = __list___iter__
8541008

@@ -862,7 +1016,7 @@ arguments = get_arguments(signature, args, kwargs);
8621016
var self = arguments['self'];
8631017
var index = arguments['index'];
8641018
var __array;
865-
__array = self["__dict__"]["js_object"];
1019+
__array = get_attribute(self, "js_object");
8661020
return __array[index];
8671021
}
8681022
window["__list_get"] = __list_get
@@ -878,7 +1032,7 @@ var self = arguments['self'];
8781032
var index = arguments['index'];
8791033
var value = arguments['value'];
8801034
var __array;
881-
__array = self["__dict__"]["js_object"];
1035+
__array = get_attribute(self, "js_object");
8821036
__array[index] = value;
8831037
}
8841038
window["__list_set"] = __list_set
@@ -892,7 +1046,7 @@ signature = {"kwargs": Object(), "args": create_array("self")};
8921046
arguments = get_arguments(signature, args, kwargs);
8931047
var self = arguments['self'];
8941048
var __array;
895-
__array = self["__dict__"]["js_object"];
1049+
__array = get_attribute(self, "js_object");
8961050
return __array.length;
8971051
}
8981052
window["__list___len__"] = __list___len__
@@ -981,7 +1135,7 @@ var __dict, out;
9811135
__dict = self["__dict__"]["js_object"];
9821136
__keys = Object.keys(__dict);
9831137
out = get_attribute(list, "__call__")(create_array(), Object());
984-
out["__dict__"]["js_object"] = __keys;
1138+
set_attribute(out, "js_object", __keys);
9851139
return out;
9861140
}
9871141
window["__dict_keys"] = __dict_keys
@@ -1038,10 +1192,10 @@ var signature, arguments;
10381192
signature = {"kwargs": Object(), "args": create_array("self")};
10391193
arguments = get_arguments(signature, args, kwargs);
10401194
var self = arguments['self'];
1041-
var __args_7, __kwargs_7;
1042-
__args_7 = create_array(self["__dict__"]["jsstring"], 0);
1043-
__kwargs_7 = Object();
1044-
return get_attribute(Iterator, "__call__")(__args_7, __kwargs_7);
1195+
var __args_8, __kwargs_8;
1196+
__args_8 = create_array(self["__dict__"]["jsstring"], 0);
1197+
__kwargs_8 = Object();
1198+
return get_attribute(Iterator, "__call__")(__args_8, __kwargs_8);
10451199
}
10461200
window["__str___iter__"] = __str___iter__
10471201

0 commit comments

Comments
 (0)