diff --git a/test/bytecode_2.3/01_boolean.pyc b/test/bytecode_2.3/01_boolean.pyc new file mode 100644 index 00000000..be62512d Binary files /dev/null and b/test/bytecode_2.3/01_boolean.pyc differ diff --git a/test/bytecode_2.3/01_class.pyc b/test/bytecode_2.3/01_class.pyc new file mode 100644 index 00000000..8671d6f9 Binary files /dev/null and b/test/bytecode_2.3/01_class.pyc differ diff --git a/test/bytecode_2.3/01_fns.pyc b/test/bytecode_2.3/01_fns.pyc new file mode 100644 index 00000000..cea9f7d3 Binary files /dev/null and b/test/bytecode_2.3/01_fns.pyc differ diff --git a/test/bytecode_2.3/01_positional.pyc b/test/bytecode_2.3/01_positional.pyc new file mode 100644 index 00000000..25e59554 Binary files /dev/null and b/test/bytecode_2.3/01_positional.pyc differ diff --git a/test/bytecode_2.3/02_closure.pyc b/test/bytecode_2.3/02_closure.pyc new file mode 100644 index 00000000..f5a2dc84 Binary files /dev/null and b/test/bytecode_2.3/02_closure.pyc differ diff --git a/test/bytecode_2.3/02_def.pyc b/test/bytecode_2.3/02_def.pyc new file mode 100644 index 00000000..8480c67f Binary files /dev/null and b/test/bytecode_2.3/02_def.pyc differ diff --git a/test/bytecode_2.3/02_slice.pyc b/test/bytecode_2.3/02_slice.pyc new file mode 100644 index 00000000..bfd9692a Binary files /dev/null and b/test/bytecode_2.3/02_slice.pyc differ diff --git a/test/bytecode_2.3/03_if_elif.pyc b/test/bytecode_2.3/03_if_elif.pyc new file mode 100644 index 00000000..248b5dc3 Binary files /dev/null and b/test/bytecode_2.3/03_if_elif.pyc differ diff --git a/test/bytecode_2.3/04_raise.pyc b/test/bytecode_2.3/04_raise.pyc new file mode 100644 index 00000000..5155ad26 Binary files /dev/null and b/test/bytecode_2.3/04_raise.pyc differ diff --git a/test/bytecode_2.3/05-ret-or.pyc b/test/bytecode_2.3/05-ret-or.pyc new file mode 100644 index 00000000..f10720a2 Binary files /dev/null and b/test/bytecode_2.3/05-ret-or.pyc differ diff --git a/test/bytecode_2.3/05_abc_class.pyc b/test/bytecode_2.3/05_abc_class.pyc new file mode 100644 index 00000000..4ea24abb Binary files /dev/null and b/test/bytecode_2.3/05_abc_class.pyc differ diff --git a/test/bytecode_2.3/05_dup_top_two.pyc b/test/bytecode_2.3/05_dup_top_two.pyc new file mode 100644 index 00000000..8951efdc Binary files /dev/null and b/test/bytecode_2.3/05_dup_top_two.pyc differ diff --git a/test/bytecode_2.3/05_if.pyc b/test/bytecode_2.3/05_if.pyc new file mode 100644 index 00000000..19036ffa Binary files /dev/null and b/test/bytecode_2.3/05_if.pyc differ diff --git a/test/bytecode_2.3/05_ifelse.pyc b/test/bytecode_2.3/05_ifelse.pyc new file mode 100644 index 00000000..fda07e13 Binary files /dev/null and b/test/bytecode_2.3/05_ifelse.pyc differ diff --git a/test/bytecode_2.3/06_classbug.pyc b/test/bytecode_2.3/06_classbug.pyc new file mode 100644 index 00000000..210ad6f5 Binary files /dev/null and b/test/bytecode_2.3/06_classbug.pyc differ diff --git a/test/bytecode_2.3/06_for_break.pyc b/test/bytecode_2.3/06_for_break.pyc new file mode 100644 index 00000000..d3bed53f Binary files /dev/null and b/test/bytecode_2.3/06_for_break.pyc differ diff --git a/test/bytecode_2.3/06_return_bug.pyc b/test/bytecode_2.3/06_return_bug.pyc new file mode 100644 index 00000000..6b049bbc Binary files /dev/null and b/test/bytecode_2.3/06_return_bug.pyc differ diff --git a/test/bytecode_2.3/06_return_if.pyc b/test/bytecode_2.3/06_return_if.pyc new file mode 100644 index 00000000..d004b969 Binary files /dev/null and b/test/bytecode_2.3/06_return_if.pyc differ diff --git a/test/bytecode_2.3/07_classderef.pyc b/test/bytecode_2.3/07_classderef.pyc new file mode 100644 index 00000000..f18e77f7 Binary files /dev/null and b/test/bytecode_2.3/07_classderef.pyc differ diff --git a/test/bytecode_2.3/07_classparam.pyc b/test/bytecode_2.3/07_classparam.pyc new file mode 100644 index 00000000..5aeb6295 Binary files /dev/null and b/test/bytecode_2.3/07_classparam.pyc differ diff --git a/test/bytecode_2.3/07_for_if_continue.pyc b/test/bytecode_2.3/07_for_if_continue.pyc new file mode 100644 index 00000000..bf2fbc5b Binary files /dev/null and b/test/bytecode_2.3/07_for_if_continue.pyc differ diff --git a/test/bytecode_2.3/07_if_return_bug.pyc b/test/bytecode_2.3/07_if_return_bug.pyc new file mode 100644 index 00000000..ffde9b98 Binary files /dev/null and b/test/bytecode_2.3/07_if_return_bug.pyc differ diff --git a/test/bytecode_2.3/07_try_pass.pyc b/test/bytecode_2.3/07_try_pass.pyc new file mode 100644 index 00000000..231ae33c Binary files /dev/null and b/test/bytecode_2.3/07_try_pass.pyc differ diff --git a/test/bytecode_2.3/09_class_closure.pyc b/test/bytecode_2.3/09_class_closure.pyc new file mode 100644 index 00000000..b908d0c3 Binary files /dev/null and b/test/bytecode_2.3/09_class_closure.pyc differ diff --git a/test/bytecode_2.3/09_whiletrue_bug.pyc b/test/bytecode_2.3/09_whiletrue_bug.pyc new file mode 100644 index 00000000..09b3a9bb Binary files /dev/null and b/test/bytecode_2.3/09_whiletrue_bug.pyc differ diff --git a/test/bytecode_2.3/10_class.pyc b/test/bytecode_2.3/10_class.pyc new file mode 100644 index 00000000..993201c6 Binary files /dev/null and b/test/bytecode_2.3/10_class.pyc differ diff --git a/test/bytecode_2.3/10_del.pyc b/test/bytecode_2.3/10_del.pyc new file mode 100644 index 00000000..d6f6977e Binary files /dev/null and b/test/bytecode_2.3/10_del.pyc differ diff --git a/test/bytecode_2.3/10_if_break_finally.pyc b/test/bytecode_2.3/10_if_break_finally.pyc new file mode 100644 index 00000000..c1fb2dda Binary files /dev/null and b/test/bytecode_2.3/10_if_break_finally.pyc differ diff --git a/test/bytecode_2.3/10_if_pass.pyc b/test/bytecode_2.3/10_if_pass.pyc new file mode 100644 index 00000000..1f5778cb Binary files /dev/null and b/test/bytecode_2.3/10_if_pass.pyc differ diff --git a/test/bytecode_2.3/10_keyword.pyc b/test/bytecode_2.3/10_keyword.pyc new file mode 100644 index 00000000..104dffa1 Binary files /dev/null and b/test/bytecode_2.3/10_keyword.pyc differ diff --git a/test/bytecode_2.3/10_mixed_boolean.pyc b/test/bytecode_2.3/10_mixed_boolean.pyc new file mode 100644 index 00000000..fa1f8067 Binary files /dev/null and b/test/bytecode_2.3/10_mixed_boolean.pyc differ diff --git a/test/bytecode_2.3/11_classbug.pyc b/test/bytecode_2.3/11_classbug.pyc new file mode 100644 index 00000000..bd775351 Binary files /dev/null and b/test/bytecode_2.3/11_classbug.pyc differ diff --git a/test/bytecode_2.3/11_classbug_subclass_fn.pyc b/test/bytecode_2.3/11_classbug_subclass_fn.pyc new file mode 100644 index 00000000..8fdd0ce3 Binary files /dev/null and b/test/bytecode_2.3/11_classbug_subclass_fn.pyc differ diff --git a/test/bytecode_2.3/11_return_val.pyc b/test/bytecode_2.3/11_return_val.pyc new file mode 100644 index 00000000..d19abae4 Binary files /dev/null and b/test/bytecode_2.3/11_return_val.pyc differ diff --git a/test/bytecode_2.3/15_assert.pyc b/test/bytecode_2.3/15_assert.pyc new file mode 100644 index 00000000..88a20de6 Binary files /dev/null and b/test/bytecode_2.3/15_assert.pyc differ diff --git a/test/bytecode_2.3/15_for_if.pyc b/test/bytecode_2.3/15_for_if.pyc new file mode 100644 index 00000000..ddfd0b88 Binary files /dev/null and b/test/bytecode_2.3/15_for_if.pyc differ diff --git a/test/bytecode_2.3/20_try_except.pyc b/test/bytecode_2.3/20_try_except.pyc new file mode 100644 index 00000000..c7e562d7 Binary files /dev/null and b/test/bytecode_2.3/20_try_except.pyc differ diff --git a/test/bytecode_2.4/00_assign.pyc b/test/bytecode_2.4/00_assign.pyc index 1241c3d2..a93c60f2 100644 Binary files a/test/bytecode_2.4/00_assign.pyc and b/test/bytecode_2.4/00_assign.pyc differ diff --git a/test/bytecode_2.4/00_import.pyc b/test/bytecode_2.4/00_import.pyc index da1da2f3..abf33a9e 100644 Binary files a/test/bytecode_2.4/00_import.pyc and b/test/bytecode_2.4/00_import.pyc differ diff --git a/test/bytecode_2.4/00_pass.pyc b/test/bytecode_2.4/00_pass.pyc index ae58da1b..2dafc849 100644 Binary files a/test/bytecode_2.4/00_pass.pyc and b/test/bytecode_2.4/00_pass.pyc differ diff --git a/test/bytecode_2.4/01_boolean.pyc b/test/bytecode_2.4/01_boolean.pyc new file mode 100644 index 00000000..fc980a3f Binary files /dev/null and b/test/bytecode_2.4/01_boolean.pyc differ diff --git a/test/bytecode_2.4/01_class.pyc b/test/bytecode_2.4/01_class.pyc index 29ac52d9..50f33d00 100644 Binary files a/test/bytecode_2.4/01_class.pyc and b/test/bytecode_2.4/01_class.pyc differ diff --git a/test/bytecode_2.4/01_fns.pyc b/test/bytecode_2.4/01_fns.pyc new file mode 100644 index 00000000..93eae296 Binary files /dev/null and b/test/bytecode_2.4/01_fns.pyc differ diff --git a/test/bytecode_2.4/01_list_comprehension.pyc b/test/bytecode_2.4/01_list_comprehension.pyc index aaac0067..2a990941 100644 Binary files a/test/bytecode_2.4/01_list_comprehension.pyc and b/test/bytecode_2.4/01_list_comprehension.pyc differ diff --git a/test/bytecode_2.4/01_positional.pyc b/test/bytecode_2.4/01_positional.pyc new file mode 100644 index 00000000..e260d4bb Binary files /dev/null and b/test/bytecode_2.4/01_positional.pyc differ diff --git a/test/bytecode_2.4/02_closure.pyc b/test/bytecode_2.4/02_closure.pyc index b94f25e0..f26299a0 100644 Binary files a/test/bytecode_2.4/02_closure.pyc and b/test/bytecode_2.4/02_closure.pyc differ diff --git a/test/bytecode_2.4/02_complex.pyc b/test/bytecode_2.4/02_complex.pyc new file mode 100644 index 00000000..e9407c43 Binary files /dev/null and b/test/bytecode_2.4/02_complex.pyc differ diff --git a/test/bytecode_2.4/02_def.pyc b/test/bytecode_2.4/02_def.pyc index 1394ec73..1e44dda5 100644 Binary files a/test/bytecode_2.4/02_def.pyc and b/test/bytecode_2.4/02_def.pyc differ diff --git a/test/bytecode_2.4/02_slice.pyc b/test/bytecode_2.4/02_slice.pyc new file mode 100644 index 00000000..dcd9f37d Binary files /dev/null and b/test/bytecode_2.4/02_slice.pyc differ diff --git a/test/bytecode_2.4/03_if_elif.pyc b/test/bytecode_2.4/03_if_elif.pyc index e5e5511c..1b138dc7 100644 Binary files a/test/bytecode_2.4/03_if_elif.pyc and b/test/bytecode_2.4/03_if_elif.pyc differ diff --git a/test/bytecode_2.4/03_map.pyc b/test/bytecode_2.4/03_map.pyc new file mode 100644 index 00000000..acf30eb5 Binary files /dev/null and b/test/bytecode_2.4/03_map.pyc differ diff --git a/test/bytecode_2.4/04_raise.pyc b/test/bytecode_2.4/04_raise.pyc index 70547e8d..93445a4a 100644 Binary files a/test/bytecode_2.4/04_raise.pyc and b/test/bytecode_2.4/04_raise.pyc differ diff --git a/test/bytecode_2.4/05-ret-or.pyc b/test/bytecode_2.4/05-ret-or.pyc new file mode 100644 index 00000000..349dec54 Binary files /dev/null and b/test/bytecode_2.4/05-ret-or.pyc differ diff --git a/test/bytecode_2.4/05_abc_class.pyc b/test/bytecode_2.4/05_abc_class.pyc index c56d832b..d384ed69 100644 Binary files a/test/bytecode_2.4/05_abc_class.pyc and b/test/bytecode_2.4/05_abc_class.pyc differ diff --git a/test/bytecode_2.4/05_closure_bug.pyc b/test/bytecode_2.4/05_closure_bug.pyc index 57bd49f6..acdeadb1 100644 Binary files a/test/bytecode_2.4/05_closure_bug.pyc and b/test/bytecode_2.4/05_closure_bug.pyc differ diff --git a/test/bytecode_2.4/05_const_map.pyc b/test/bytecode_2.4/05_const_map.pyc new file mode 100644 index 00000000..75890121 Binary files /dev/null and b/test/bytecode_2.4/05_const_map.pyc differ diff --git a/test/bytecode_2.4/05_dup_top_two.pyc b/test/bytecode_2.4/05_dup_top_two.pyc new file mode 100644 index 00000000..ce304e9e Binary files /dev/null and b/test/bytecode_2.4/05_dup_top_two.pyc differ diff --git a/test/bytecode_2.4/05_for_for.pyc b/test/bytecode_2.4/05_for_for.pyc index 888d72a4..c8687b7c 100644 Binary files a/test/bytecode_2.4/05_for_for.pyc and b/test/bytecode_2.4/05_for_for.pyc differ diff --git a/test/bytecode_2.4/05_if.pyc b/test/bytecode_2.4/05_if.pyc new file mode 100644 index 00000000..5b7fadfc Binary files /dev/null and b/test/bytecode_2.4/05_if.pyc differ diff --git a/test/bytecode_2.4/05_ifelse.pyc b/test/bytecode_2.4/05_ifelse.pyc new file mode 100644 index 00000000..8cac1c8d Binary files /dev/null and b/test/bytecode_2.4/05_ifelse.pyc differ diff --git a/test/bytecode_2.4/05_long_list.pyc b/test/bytecode_2.4/05_long_list.pyc new file mode 100644 index 00000000..9bb42c5d Binary files /dev/null and b/test/bytecode_2.4/05_long_list.pyc differ diff --git a/test/bytecode_2.4/05_static_method.pyc b/test/bytecode_2.4/05_static_method.pyc new file mode 100644 index 00000000..59f0fe97 Binary files /dev/null and b/test/bytecode_2.4/05_static_method.pyc differ diff --git a/test/bytecode_2.4/05_try_finally_pass.pyc b/test/bytecode_2.4/05_try_finally_pass.pyc index d8c7bbb5..74d51774 100644 Binary files a/test/bytecode_2.4/05_try_finally_pass.pyc and b/test/bytecode_2.4/05_try_finally_pass.pyc differ diff --git a/test/bytecode_2.4/06_classbug.pyc b/test/bytecode_2.4/06_classbug.pyc index d74a0a2b..5a3b25e4 100644 Binary files a/test/bytecode_2.4/06_classbug.pyc and b/test/bytecode_2.4/06_classbug.pyc differ diff --git a/test/bytecode_2.4/06_for_break.pyc b/test/bytecode_2.4/06_for_break.pyc index 12739804..0005936e 100644 Binary files a/test/bytecode_2.4/06_for_break.pyc and b/test/bytecode_2.4/06_for_break.pyc differ diff --git a/test/bytecode_2.4/06_list_ifnot.pyc b/test/bytecode_2.4/06_list_ifnot.pyc index bc039ba2..0772b760 100644 Binary files a/test/bytecode_2.4/06_list_ifnot.pyc and b/test/bytecode_2.4/06_list_ifnot.pyc differ diff --git a/test/bytecode_2.4/06_list_ifnot_and.pyc b/test/bytecode_2.4/06_list_ifnot_and.pyc index d959e9ba..d5ba334f 100644 Binary files a/test/bytecode_2.4/06_list_ifnot_and.pyc and b/test/bytecode_2.4/06_list_ifnot_and.pyc differ diff --git a/test/bytecode_2.4/06_return_bug.pyc b/test/bytecode_2.4/06_return_bug.pyc index dafa5b74..c9781df5 100644 Binary files a/test/bytecode_2.4/06_return_bug.pyc and b/test/bytecode_2.4/06_return_bug.pyc differ diff --git a/test/bytecode_2.4/06_return_if.pyc b/test/bytecode_2.4/06_return_if.pyc index 77d4899d..b2b87852 100644 Binary files a/test/bytecode_2.4/06_return_if.pyc and b/test/bytecode_2.4/06_return_if.pyc differ diff --git a/test/bytecode_2.4/06_setif_comprehension.pyc b/test/bytecode_2.4/06_setif_comprehension.pyc new file mode 100644 index 00000000..f77a1fe7 Binary files /dev/null and b/test/bytecode_2.4/06_setif_comprehension.pyc differ diff --git a/test/bytecode_2.4/07_classderef.pyc b/test/bytecode_2.4/07_classderef.pyc index 55c7ec0a..d2f1c017 100644 Binary files a/test/bytecode_2.4/07_classderef.pyc and b/test/bytecode_2.4/07_classderef.pyc differ diff --git a/test/bytecode_2.4/07_classparam.pyc b/test/bytecode_2.4/07_classparam.pyc index 16f40253..680a60bc 100644 Binary files a/test/bytecode_2.4/07_classparam.pyc and b/test/bytecode_2.4/07_classparam.pyc differ diff --git a/test/bytecode_2.4/07_for_if_continue.pyc b/test/bytecode_2.4/07_for_if_continue.pyc index 20b541f6..fe67bd7b 100644 Binary files a/test/bytecode_2.4/07_for_if_continue.pyc and b/test/bytecode_2.4/07_for_if_continue.pyc differ diff --git a/test/bytecode_2.4/07_if_return_bug.pyc b/test/bytecode_2.4/07_if_return_bug.pyc new file mode 100644 index 00000000..6d6a1359 Binary files /dev/null and b/test/bytecode_2.4/07_if_return_bug.pyc differ diff --git a/test/bytecode_2.4/07_return_end_if.pyc b/test/bytecode_2.4/07_return_end_if.pyc new file mode 100644 index 00000000..524aa43d Binary files /dev/null and b/test/bytecode_2.4/07_return_end_if.pyc differ diff --git a/test/bytecode_2.4/07_try_pass.pyc b/test/bytecode_2.4/07_try_pass.pyc new file mode 100644 index 00000000..52089f13 Binary files /dev/null and b/test/bytecode_2.4/07_try_pass.pyc differ diff --git a/test/bytecode_2.4/08_genexpr.pyc b/test/bytecode_2.4/08_genexpr.pyc new file mode 100644 index 00000000..1209c7d2 Binary files /dev/null and b/test/bytecode_2.4/08_genexpr.pyc differ diff --git a/test/bytecode_2.4/08_while1_if_continue.pyc b/test/bytecode_2.4/08_while1_if_continue.pyc new file mode 100644 index 00000000..96166f79 Binary files /dev/null and b/test/bytecode_2.4/08_while1_if_continue.pyc differ diff --git a/test/bytecode_2.4/08_while_except_bug.pyc b/test/bytecode_2.4/08_while_except_bug.pyc new file mode 100644 index 00000000..877a157e Binary files /dev/null and b/test/bytecode_2.4/08_while_except_bug.pyc differ diff --git a/test/bytecode_2.4/09_class_closure.pyc b/test/bytecode_2.4/09_class_closure.pyc index 40863646..60fff2cf 100644 Binary files a/test/bytecode_2.4/09_class_closure.pyc and b/test/bytecode_2.4/09_class_closure.pyc differ diff --git a/test/bytecode_2.4/09_if_whiletrue_bug.pyc b/test/bytecode_2.4/09_if_whiletrue_bug.pyc new file mode 100644 index 00000000..bb3de950 Binary files /dev/null and b/test/bytecode_2.4/09_if_whiletrue_bug.pyc differ diff --git a/test/bytecode_2.4/09_whiletrue_bug.pyc b/test/bytecode_2.4/09_whiletrue_bug.pyc index dee157da..f8ce2c3a 100644 Binary files a/test/bytecode_2.4/09_whiletrue_bug.pyc and b/test/bytecode_2.4/09_whiletrue_bug.pyc differ diff --git a/test/bytecode_2.4/10_class.pyc b/test/bytecode_2.4/10_class.pyc index 114c54b4..5ad6a8b9 100644 Binary files a/test/bytecode_2.4/10_class.pyc and b/test/bytecode_2.4/10_class.pyc differ diff --git a/test/bytecode_2.4/10_del.pyc b/test/bytecode_2.4/10_del.pyc index 40dddb2f..febf095f 100644 Binary files a/test/bytecode_2.4/10_del.pyc and b/test/bytecode_2.4/10_del.pyc differ diff --git a/test/bytecode_2.4/10_for.pyc b/test/bytecode_2.4/10_for.pyc new file mode 100644 index 00000000..0ac4cabc Binary files /dev/null and b/test/bytecode_2.4/10_for.pyc differ diff --git a/test/bytecode_2.4/10_for_if_loopback.pyc b/test/bytecode_2.4/10_for_if_loopback.pyc new file mode 100644 index 00000000..de25a2ef Binary files /dev/null and b/test/bytecode_2.4/10_for_if_loopback.pyc differ diff --git a/test/bytecode_2.4/10_genexpr.pyc b/test/bytecode_2.4/10_genexpr.pyc new file mode 100644 index 00000000..30de1435 Binary files /dev/null and b/test/bytecode_2.4/10_genexpr.pyc differ diff --git a/test/bytecode_2.4/10_if_break_finally.pyc b/test/bytecode_2.4/10_if_break_finally.pyc index cc6823f8..f33b3a21 100644 Binary files a/test/bytecode_2.4/10_if_break_finally.pyc and b/test/bytecode_2.4/10_if_break_finally.pyc differ diff --git a/test/bytecode_2.4/10_if_pass.pyc b/test/bytecode_2.4/10_if_pass.pyc new file mode 100644 index 00000000..d92ee764 Binary files /dev/null and b/test/bytecode_2.4/10_if_pass.pyc differ diff --git a/test/bytecode_2.4/10_keyword.pyc b/test/bytecode_2.4/10_keyword.pyc new file mode 100644 index 00000000..477bab58 Binary files /dev/null and b/test/bytecode_2.4/10_keyword.pyc differ diff --git a/test/bytecode_2.4/10_load_assert.pyc b/test/bytecode_2.4/10_load_assert.pyc new file mode 100644 index 00000000..9b416bb8 Binary files /dev/null and b/test/bytecode_2.4/10_load_assert.pyc differ diff --git a/test/bytecode_2.4/10_mixed_boolean.pyc b/test/bytecode_2.4/10_mixed_boolean.pyc new file mode 100644 index 00000000..c1c12c5c Binary files /dev/null and b/test/bytecode_2.4/10_mixed_boolean.pyc differ diff --git a/test/bytecode_2.4/10_while.pyc b/test/bytecode_2.4/10_while.pyc new file mode 100644 index 00000000..53a7d447 Binary files /dev/null and b/test/bytecode_2.4/10_while.pyc differ diff --git a/test/bytecode_2.4/11-list-if.pyc b/test/bytecode_2.4/11-list-if.pyc index 910a9f58..cfffcd01 100644 Binary files a/test/bytecode_2.4/11-list-if.pyc and b/test/bytecode_2.4/11-list-if.pyc differ diff --git a/test/bytecode_2.4/11_classbug.pyc b/test/bytecode_2.4/11_classbug.pyc index 334562d3..29ee38ff 100644 Binary files a/test/bytecode_2.4/11_classbug.pyc and b/test/bytecode_2.4/11_classbug.pyc differ diff --git a/test/bytecode_2.4/11_classbug_subclass_fn.pyc b/test/bytecode_2.4/11_classbug_subclass_fn.pyc index 87fb7b2e..84edf924 100644 Binary files a/test/bytecode_2.4/11_classbug_subclass_fn.pyc and b/test/bytecode_2.4/11_classbug_subclass_fn.pyc differ diff --git a/test/bytecode_2.4/11_for_if_loopback2.pyc b/test/bytecode_2.4/11_for_if_loopback2.pyc new file mode 100644 index 00000000..cb52f14d Binary files /dev/null and b/test/bytecode_2.4/11_for_if_loopback2.pyc differ diff --git a/test/bytecode_2.4/11_if_while_bug.pyc b/test/bytecode_2.4/11_if_while_bug.pyc new file mode 100644 index 00000000..af21be3f Binary files /dev/null and b/test/bytecode_2.4/11_if_while_bug.pyc differ diff --git a/test/bytecode_2.4/11_multi_genexpr.pyc b/test/bytecode_2.4/11_multi_genexpr.pyc new file mode 100644 index 00000000..6a85bb80 Binary files /dev/null and b/test/bytecode_2.4/11_multi_genexpr.pyc differ diff --git a/test/bytecode_2.4/11_return_val.pyc b/test/bytecode_2.4/11_return_val.pyc index 1baefd7e..7f0664b7 100644 Binary files a/test/bytecode_2.4/11_return_val.pyc and b/test/bytecode_2.4/11_return_val.pyc differ diff --git a/test/bytecode_2.4/12_if_while_bug.pyc b/test/bytecode_2.4/12_if_while_bug.pyc new file mode 100644 index 00000000..fed33939 Binary files /dev/null and b/test/bytecode_2.4/12_if_while_bug.pyc differ diff --git a/test/bytecode_2.4/15_assert.pyc b/test/bytecode_2.4/15_assert.pyc index 8f81f73f..0555acbe 100644 Binary files a/test/bytecode_2.4/15_assert.pyc and b/test/bytecode_2.4/15_assert.pyc differ diff --git a/test/bytecode_2.4/15_for_if.pyc b/test/bytecode_2.4/15_for_if.pyc index b0ac01ff..a785b3ca 100644 Binary files a/test/bytecode_2.4/15_for_if.pyc and b/test/bytecode_2.4/15_for_if.pyc differ diff --git a/test/bytecode_2.4/20_try_except.pyc b/test/bytecode_2.4/20_try_except.pyc new file mode 100644 index 00000000..1818e886 Binary files /dev/null and b/test/bytecode_2.4/20_try_except.pyc differ diff --git a/test/bytecode_2.6/00_assign.pyc b/test/bytecode_2.6/00_assign.pyc index 4cef78ad..92020aec 100644 Binary files a/test/bytecode_2.6/00_assign.pyc and b/test/bytecode_2.6/00_assign.pyc differ diff --git a/test/bytecode_2.6/00_import.pyc b/test/bytecode_2.6/00_import.pyc index cf123864..da09e5d8 100644 Binary files a/test/bytecode_2.6/00_import.pyc and b/test/bytecode_2.6/00_import.pyc differ diff --git a/test/bytecode_2.6/00_pass.pyc b/test/bytecode_2.6/00_pass.pyc index 38f418f4..09e68d1b 100644 Binary files a/test/bytecode_2.6/00_pass.pyc and b/test/bytecode_2.6/00_pass.pyc differ diff --git a/test/bytecode_2.6/01_boolean.pyc b/test/bytecode_2.6/01_boolean.pyc new file mode 100644 index 00000000..d65f0347 Binary files /dev/null and b/test/bytecode_2.6/01_boolean.pyc differ diff --git a/test/bytecode_2.6/01_class.pyc b/test/bytecode_2.6/01_class.pyc index 414fb4af..cf040bbd 100644 Binary files a/test/bytecode_2.6/01_class.pyc and b/test/bytecode_2.6/01_class.pyc differ diff --git a/test/bytecode_2.6/01_fns.pyc b/test/bytecode_2.6/01_fns.pyc new file mode 100644 index 00000000..132f9ac7 Binary files /dev/null and b/test/bytecode_2.6/01_fns.pyc differ diff --git a/test/bytecode_2.6/01_list_comprehension.pyc b/test/bytecode_2.6/01_list_comprehension.pyc index a72e9959..b053367b 100644 Binary files a/test/bytecode_2.6/01_list_comprehension.pyc and b/test/bytecode_2.6/01_list_comprehension.pyc differ diff --git a/test/bytecode_2.6/01_positional.pyc b/test/bytecode_2.6/01_positional.pyc index adb8adae..9052ccca 100644 Binary files a/test/bytecode_2.6/01_positional.pyc and b/test/bytecode_2.6/01_positional.pyc differ diff --git a/test/bytecode_2.6/01_try_except.pyc b/test/bytecode_2.6/01_try_except.pyc index 2de09a48..c3113446 100644 Binary files a/test/bytecode_2.6/01_try_except.pyc and b/test/bytecode_2.6/01_try_except.pyc differ diff --git a/test/bytecode_2.6/02_closure.pyc b/test/bytecode_2.6/02_closure.pyc index 9fdd25da..fca448d5 100644 Binary files a/test/bytecode_2.6/02_closure.pyc and b/test/bytecode_2.6/02_closure.pyc differ diff --git a/test/bytecode_2.6/02_complex.pyc b/test/bytecode_2.6/02_complex.pyc new file mode 100644 index 00000000..371d3b79 Binary files /dev/null and b/test/bytecode_2.6/02_complex.pyc differ diff --git a/test/bytecode_2.6/02_def.pyc b/test/bytecode_2.6/02_def.pyc index 44af341f..44379bcd 100644 Binary files a/test/bytecode_2.6/02_def.pyc and b/test/bytecode_2.6/02_def.pyc differ diff --git a/test/bytecode_2.6/02_slice.pyc b/test/bytecode_2.6/02_slice.pyc index d4a76805..aeb0ccba 100644 Binary files a/test/bytecode_2.6/02_slice.pyc and b/test/bytecode_2.6/02_slice.pyc differ diff --git a/test/bytecode_2.6/03_if_elif.pyc b/test/bytecode_2.6/03_if_elif.pyc index ea2a2e6d..591f03b1 100644 Binary files a/test/bytecode_2.6/03_if_elif.pyc and b/test/bytecode_2.6/03_if_elif.pyc differ diff --git a/test/bytecode_2.6/03_map.pyc b/test/bytecode_2.6/03_map.pyc new file mode 100644 index 00000000..e0b1419e Binary files /dev/null and b/test/bytecode_2.6/03_map.pyc differ diff --git a/test/bytecode_2.6/04_raise.pyc b/test/bytecode_2.6/04_raise.pyc index d0d3f6a1..d149c556 100644 Binary files a/test/bytecode_2.6/04_raise.pyc and b/test/bytecode_2.6/04_raise.pyc differ diff --git a/test/bytecode_2.6/04_withas.pyc b/test/bytecode_2.6/04_withas.pyc index 1d8470a5..56344384 100644 Binary files a/test/bytecode_2.6/04_withas.pyc and b/test/bytecode_2.6/04_withas.pyc differ diff --git a/test/bytecode_2.6/05-ret-or.pyc b/test/bytecode_2.6/05-ret-or.pyc new file mode 100644 index 00000000..86cab4dd Binary files /dev/null and b/test/bytecode_2.6/05-ret-or.pyc differ diff --git a/test/bytecode_2.6/05_abc_class.pyc b/test/bytecode_2.6/05_abc_class.pyc index 4993cad3..9e311bde 100644 Binary files a/test/bytecode_2.6/05_abc_class.pyc and b/test/bytecode_2.6/05_abc_class.pyc differ diff --git a/test/bytecode_2.6/05_closure_bug.pyc b/test/bytecode_2.6/05_closure_bug.pyc index 4ca8af31..7b54aa32 100644 Binary files a/test/bytecode_2.6/05_closure_bug.pyc and b/test/bytecode_2.6/05_closure_bug.pyc differ diff --git a/test/bytecode_2.6/05_const_map.pyc b/test/bytecode_2.6/05_const_map.pyc new file mode 100644 index 00000000..cb7737d0 Binary files /dev/null and b/test/bytecode_2.6/05_const_map.pyc differ diff --git a/test/bytecode_2.6/05_dup_top_two.pyc b/test/bytecode_2.6/05_dup_top_two.pyc new file mode 100644 index 00000000..f09cceff Binary files /dev/null and b/test/bytecode_2.6/05_dup_top_two.pyc differ diff --git a/test/bytecode_2.6/05_for_for.pyc b/test/bytecode_2.6/05_for_for.pyc index 00fe7ffa..6b3e877b 100644 Binary files a/test/bytecode_2.6/05_for_for.pyc and b/test/bytecode_2.6/05_for_for.pyc differ diff --git a/test/bytecode_2.6/05_if.pyc b/test/bytecode_2.6/05_if.pyc index 18c3e2dc..89ec07ab 100644 Binary files a/test/bytecode_2.6/05_if.pyc and b/test/bytecode_2.6/05_if.pyc differ diff --git a/test/bytecode_2.6/05_if_assign.pyc b/test/bytecode_2.6/05_if_assign.pyc new file mode 100644 index 00000000..c1c57143 Binary files /dev/null and b/test/bytecode_2.6/05_if_assign.pyc differ diff --git a/test/bytecode_2.6/05_ifelse.pyc b/test/bytecode_2.6/05_ifelse.pyc index 44a4a73d..babe2894 100644 Binary files a/test/bytecode_2.6/05_ifelse.pyc and b/test/bytecode_2.6/05_ifelse.pyc differ diff --git a/test/bytecode_2.6/05_list_comprehension.pyc b/test/bytecode_2.6/05_list_comprehension.pyc index d4a147f1..7f0f07a9 100644 Binary files a/test/bytecode_2.6/05_list_comprehension.pyc and b/test/bytecode_2.6/05_list_comprehension.pyc differ diff --git a/test/bytecode_2.6/05_long_list.pyc b/test/bytecode_2.6/05_long_list.pyc new file mode 100644 index 00000000..ecd716b1 Binary files /dev/null and b/test/bytecode_2.6/05_long_list.pyc differ diff --git a/test/bytecode_2.6/05_static_method.pyc b/test/bytecode_2.6/05_static_method.pyc new file mode 100644 index 00000000..ad56efa5 Binary files /dev/null and b/test/bytecode_2.6/05_static_method.pyc differ diff --git a/test/bytecode_2.6/05_try_except.pyc b/test/bytecode_2.6/05_try_except.pyc index cde9ffd2..cdaf8467 100644 Binary files a/test/bytecode_2.6/05_try_except.pyc and b/test/bytecode_2.6/05_try_except.pyc differ diff --git a/test/bytecode_2.6/05_try_finally_pass.pyc b/test/bytecode_2.6/05_try_finally_pass.pyc new file mode 100644 index 00000000..990c0826 Binary files /dev/null and b/test/bytecode_2.6/05_try_finally_pass.pyc differ diff --git a/test/bytecode_2.6/05_with.pyc b/test/bytecode_2.6/05_with.pyc index 5845d4ce..7f3c025f 100644 Binary files a/test/bytecode_2.6/05_with.pyc and b/test/bytecode_2.6/05_with.pyc differ diff --git a/test/bytecode_2.6/06_classbug.pyc b/test/bytecode_2.6/06_classbug.pyc index 0cad7910..9a148b7d 100644 Binary files a/test/bytecode_2.6/06_classbug.pyc and b/test/bytecode_2.6/06_classbug.pyc differ diff --git a/test/bytecode_2.6/06_for_break.pyc b/test/bytecode_2.6/06_for_break.pyc index c78b3fa1..91fce7ee 100644 Binary files a/test/bytecode_2.6/06_for_break.pyc and b/test/bytecode_2.6/06_for_break.pyc differ diff --git a/test/bytecode_2.6/06_ifTrue_optimize_bug.pyc b/test/bytecode_2.6/06_ifTrue_optimize_bug.pyc index c4f617d4..618e2144 100644 Binary files a/test/bytecode_2.6/06_ifTrue_optimize_bug.pyc and b/test/bytecode_2.6/06_ifTrue_optimize_bug.pyc differ diff --git a/test/bytecode_2.6/06_list_ifnot.pyc b/test/bytecode_2.6/06_list_ifnot.pyc index f703aba0..830a5ffa 100644 Binary files a/test/bytecode_2.6/06_list_ifnot.pyc and b/test/bytecode_2.6/06_list_ifnot.pyc differ diff --git a/test/bytecode_2.6/06_list_ifnot_and.pyc b/test/bytecode_2.6/06_list_ifnot_and.pyc index f194f8aa..a83a14c6 100644 Binary files a/test/bytecode_2.6/06_list_ifnot_and.pyc and b/test/bytecode_2.6/06_list_ifnot_and.pyc differ diff --git a/test/bytecode_2.6/06_return_bug.pyc b/test/bytecode_2.6/06_return_bug.pyc index 3e5a11b2..fcbf5fb6 100644 Binary files a/test/bytecode_2.6/06_return_bug.pyc and b/test/bytecode_2.6/06_return_bug.pyc differ diff --git a/test/bytecode_2.6/06_return_if.pyc b/test/bytecode_2.6/06_return_if.pyc index 5179c4c1..6a2eba23 100644 Binary files a/test/bytecode_2.6/06_return_if.pyc and b/test/bytecode_2.6/06_return_if.pyc differ diff --git a/test/bytecode_2.6/06_setif_comprehension.pyc b/test/bytecode_2.6/06_setif_comprehension.pyc index 11c0222e..a7256e4a 100644 Binary files a/test/bytecode_2.6/06_setif_comprehension.pyc and b/test/bytecode_2.6/06_setif_comprehension.pyc differ diff --git a/test/bytecode_2.6/06_tryifelse.pyc b/test/bytecode_2.6/06_tryifelse.pyc new file mode 100644 index 00000000..45866556 Binary files /dev/null and b/test/bytecode_2.6/06_tryifelse.pyc differ diff --git a/test/bytecode_2.6/07_classderef.pyc b/test/bytecode_2.6/07_classderef.pyc index f8c0c360..2d889c04 100644 Binary files a/test/bytecode_2.6/07_classderef.pyc and b/test/bytecode_2.6/07_classderef.pyc differ diff --git a/test/bytecode_2.6/07_classparam.pyc b/test/bytecode_2.6/07_classparam.pyc index 16359ee1..1c54dbf7 100644 Binary files a/test/bytecode_2.6/07_classparam.pyc and b/test/bytecode_2.6/07_classparam.pyc differ diff --git a/test/bytecode_2.6/07_closure_bug2.pyc b/test/bytecode_2.6/07_closure_bug2.pyc index d7a39163..716d7202 100644 Binary files a/test/bytecode_2.6/07_closure_bug2.pyc and b/test/bytecode_2.6/07_closure_bug2.pyc differ diff --git a/test/bytecode_2.6/07_for_if_continue.pyc b/test/bytecode_2.6/07_for_if_continue.pyc index 6aae3bef..bdeacfb6 100644 Binary files a/test/bytecode_2.6/07_for_if_continue.pyc and b/test/bytecode_2.6/07_for_if_continue.pyc differ diff --git a/test/bytecode_2.6/07_if_return_bug.pyc b/test/bytecode_2.6/07_if_return_bug.pyc new file mode 100644 index 00000000..593a6558 Binary files /dev/null and b/test/bytecode_2.6/07_if_return_bug.pyc differ diff --git a/test/bytecode_2.6/07_return_end_if.pyc b/test/bytecode_2.6/07_return_end_if.pyc index 8d836ddf..e75d17e0 100644 Binary files a/test/bytecode_2.6/07_return_end_if.pyc and b/test/bytecode_2.6/07_return_end_if.pyc differ diff --git a/test/bytecode_2.6/07_try_pass.pyc b/test/bytecode_2.6/07_try_pass.pyc index 87e2f7d1..90bb7e72 100644 Binary files a/test/bytecode_2.6/07_try_pass.pyc and b/test/bytecode_2.6/07_try_pass.pyc differ diff --git a/test/bytecode_2.6/07_withstmt_fn.pyc b/test/bytecode_2.6/07_withstmt_fn.pyc index a9d141d5..dba6ff95 100644 Binary files a/test/bytecode_2.6/07_withstmt_fn.pyc and b/test/bytecode_2.6/07_withstmt_fn.pyc differ diff --git a/test/bytecode_2.6/08_for_if_for.pyc b/test/bytecode_2.6/08_for_if_for.pyc index 59f579dd..fb781657 100644 Binary files a/test/bytecode_2.6/08_for_if_for.pyc and b/test/bytecode_2.6/08_for_if_for.pyc differ diff --git a/test/bytecode_2.6/08_genexpr.pyc b/test/bytecode_2.6/08_genexpr.pyc new file mode 100644 index 00000000..e26c6fbd Binary files /dev/null and b/test/bytecode_2.6/08_genexpr.pyc differ diff --git a/test/bytecode_2.6/08_while1_if_continue.pyc b/test/bytecode_2.6/08_while1_if_continue.pyc index 51685e7d..5c87045d 100644 Binary files a/test/bytecode_2.6/08_while1_if_continue.pyc and b/test/bytecode_2.6/08_while1_if_continue.pyc differ diff --git a/test/bytecode_2.6/08_while_except_bug.pyc b/test/bytecode_2.6/08_while_except_bug.pyc new file mode 100644 index 00000000..7cdc242b Binary files /dev/null and b/test/bytecode_2.6/08_while_except_bug.pyc differ diff --git a/test/bytecode_2.6/09_class_closure.pyc b/test/bytecode_2.6/09_class_closure.pyc index 226beae1..ce25d627 100644 Binary files a/test/bytecode_2.6/09_class_closure.pyc and b/test/bytecode_2.6/09_class_closure.pyc differ diff --git a/test/bytecode_2.6/09_if_whiletrue_bug.pyc b/test/bytecode_2.6/09_if_whiletrue_bug.pyc new file mode 100644 index 00000000..ca025d86 Binary files /dev/null and b/test/bytecode_2.6/09_if_whiletrue_bug.pyc differ diff --git a/test/bytecode_2.6/09_whiletrue_bug.pyc b/test/bytecode_2.6/09_whiletrue_bug.pyc new file mode 100644 index 00000000..d085eac1 Binary files /dev/null and b/test/bytecode_2.6/09_whiletrue_bug.pyc differ diff --git a/test/bytecode_2.6/10_class.pyc b/test/bytecode_2.6/10_class.pyc index a7107e7e..0dbd11de 100644 Binary files a/test/bytecode_2.6/10_class.pyc and b/test/bytecode_2.6/10_class.pyc differ diff --git a/test/bytecode_2.6/10_class_deco.pyc b/test/bytecode_2.6/10_class_deco.pyc index 3d6a7c0a..fdb9b51e 100644 Binary files a/test/bytecode_2.6/10_class_deco.pyc and b/test/bytecode_2.6/10_class_deco.pyc differ diff --git a/test/bytecode_2.6/10_classdec.pyc b/test/bytecode_2.6/10_classdec.pyc index dcff84f3..de18a51a 100644 Binary files a/test/bytecode_2.6/10_classdec.pyc and b/test/bytecode_2.6/10_classdec.pyc differ diff --git a/test/bytecode_2.6/10_del.pyc b/test/bytecode_2.6/10_del.pyc new file mode 100644 index 00000000..68414033 Binary files /dev/null and b/test/bytecode_2.6/10_del.pyc differ diff --git a/test/bytecode_2.6/10_for.pyc b/test/bytecode_2.6/10_for.pyc index 3e3d22c3..557d270c 100644 Binary files a/test/bytecode_2.6/10_for.pyc and b/test/bytecode_2.6/10_for.pyc differ diff --git a/test/bytecode_2.6/10_for_if_loopback.pyc b/test/bytecode_2.6/10_for_if_loopback.pyc new file mode 100644 index 00000000..c620d9ba Binary files /dev/null and b/test/bytecode_2.6/10_for_if_loopback.pyc differ diff --git a/test/bytecode_2.6/10_genexpr.pyc b/test/bytecode_2.6/10_genexpr.pyc new file mode 100644 index 00000000..0b0cf1d7 Binary files /dev/null and b/test/bytecode_2.6/10_genexpr.pyc differ diff --git a/test/bytecode_2.6/10_if_break_finally.pyc b/test/bytecode_2.6/10_if_break_finally.pyc new file mode 100644 index 00000000..0e679106 Binary files /dev/null and b/test/bytecode_2.6/10_if_break_finally.pyc differ diff --git a/test/bytecode_2.6/10_if_else_ternary.pyc b/test/bytecode_2.6/10_if_else_ternary.pyc index 1a483ec7..b26e9b73 100644 Binary files a/test/bytecode_2.6/10_if_else_ternary.pyc and b/test/bytecode_2.6/10_if_else_ternary.pyc differ diff --git a/test/bytecode_2.6/10_if_pass.pyc b/test/bytecode_2.6/10_if_pass.pyc new file mode 100644 index 00000000..2cf36c6a Binary files /dev/null and b/test/bytecode_2.6/10_if_pass.pyc differ diff --git a/test/bytecode_2.6/10_keyword.pyc b/test/bytecode_2.6/10_keyword.pyc index 631a580c..10f3c0f5 100644 Binary files a/test/bytecode_2.6/10_keyword.pyc and b/test/bytecode_2.6/10_keyword.pyc differ diff --git a/test/bytecode_2.6/10_lambda.pyc b/test/bytecode_2.6/10_lambda.pyc new file mode 100644 index 00000000..63e2a408 Binary files /dev/null and b/test/bytecode_2.6/10_lambda.pyc differ diff --git a/test/bytecode_2.6/10_load_assert.pyc b/test/bytecode_2.6/10_load_assert.pyc new file mode 100644 index 00000000..e177bb18 Binary files /dev/null and b/test/bytecode_2.6/10_load_assert.pyc differ diff --git a/test/bytecode_2.6/10_mixed_boolean.pyc b/test/bytecode_2.6/10_mixed_boolean.pyc index 6ff4d38c..e6eab302 100644 Binary files a/test/bytecode_2.6/10_mixed_boolean.pyc and b/test/bytecode_2.6/10_mixed_boolean.pyc differ diff --git a/test/bytecode_2.6/10_try_continue_bug.pyc b/test/bytecode_2.6/10_try_continue_bug.pyc new file mode 100644 index 00000000..5305d566 Binary files /dev/null and b/test/bytecode_2.6/10_try_continue_bug.pyc differ diff --git a/test/bytecode_2.6/10_while.pyc b/test/bytecode_2.6/10_while.pyc index 33da3ad1..f5f80669 100644 Binary files a/test/bytecode_2.6/10_while.pyc and b/test/bytecode_2.6/10_while.pyc differ diff --git a/test/bytecode_2.6/11-list-if.pyc b/test/bytecode_2.6/11-list-if.pyc index 540d809b..f8051262 100644 Binary files a/test/bytecode_2.6/11-list-if.pyc and b/test/bytecode_2.6/11-list-if.pyc differ diff --git a/test/bytecode_2.6/11_classbug.pyc b/test/bytecode_2.6/11_classbug.pyc index 2adaa3a4..1ef853dc 100644 Binary files a/test/bytecode_2.6/11_classbug.pyc and b/test/bytecode_2.6/11_classbug.pyc differ diff --git a/test/bytecode_2.6/11_classbug_subclass_fn.pyc b/test/bytecode_2.6/11_classbug_subclass_fn.pyc index 90cbce78..7a174cac 100644 Binary files a/test/bytecode_2.6/11_classbug_subclass_fn.pyc and b/test/bytecode_2.6/11_classbug_subclass_fn.pyc differ diff --git a/test/bytecode_2.6/11_for_if_loopback2.pyc b/test/bytecode_2.6/11_for_if_loopback2.pyc new file mode 100644 index 00000000..6003718f Binary files /dev/null and b/test/bytecode_2.6/11_for_if_loopback2.pyc differ diff --git a/test/bytecode_2.6/11_if_while_bug.pyc b/test/bytecode_2.6/11_if_while_bug.pyc new file mode 100644 index 00000000..d12906ff Binary files /dev/null and b/test/bytecode_2.6/11_if_while_bug.pyc differ diff --git a/test/bytecode_2.6/11_multi_genexpr.pyc b/test/bytecode_2.6/11_multi_genexpr.pyc new file mode 100644 index 00000000..0f959a38 Binary files /dev/null and b/test/bytecode_2.6/11_multi_genexpr.pyc differ diff --git a/test/bytecode_2.6/11_return_val.pyc b/test/bytecode_2.6/11_return_val.pyc index 11cf1636..81f77511 100644 Binary files a/test/bytecode_2.6/11_return_val.pyc and b/test/bytecode_2.6/11_return_val.pyc differ diff --git a/test/bytecode_2.6/12_if_while_bug.pyc b/test/bytecode_2.6/12_if_while_bug.pyc new file mode 100644 index 00000000..70402328 Binary files /dev/null and b/test/bytecode_2.6/12_if_while_bug.pyc differ diff --git a/test/bytecode_2.6/15_assert.pyc b/test/bytecode_2.6/15_assert.pyc index c556f4d6..c8759948 100644 Binary files a/test/bytecode_2.6/15_assert.pyc and b/test/bytecode_2.6/15_assert.pyc differ diff --git a/test/bytecode_2.6/15_for_if.pyc b/test/bytecode_2.6/15_for_if.pyc index 560007c9..c0f7cb75 100644 Binary files a/test/bytecode_2.6/15_for_if.pyc and b/test/bytecode_2.6/15_for_if.pyc differ diff --git a/test/bytecode_2.6/20_try_except.pyc b/test/bytecode_2.6/20_try_except.pyc index 3d08de81..03171f7a 100644 Binary files a/test/bytecode_2.6/20_try_except.pyc and b/test/bytecode_2.6/20_try_except.pyc differ diff --git a/test/bytecode_2.6/25_try_except.pyc b/test/bytecode_2.6/25_try_except.pyc index 0f2cee80..3f858315 100644 Binary files a/test/bytecode_2.6/25_try_except.pyc and b/test/bytecode_2.6/25_try_except.pyc differ diff --git a/test/bytecode_2.7/01_list_comprehension.pyc b/test/bytecode_2.7/01_list_comprehension.pyc index a412cca3..ef97df9c 100644 Binary files a/test/bytecode_2.7/01_list_comprehension.pyc and b/test/bytecode_2.7/01_list_comprehension.pyc differ diff --git a/test/bytecode_2.7/01_try_except.pyc b/test/bytecode_2.7/01_try_except.pyc index d68fa8dd..dbcb2a55 100644 Binary files a/test/bytecode_2.7/01_try_except.pyc and b/test/bytecode_2.7/01_try_except.pyc differ diff --git a/test/bytecode_2.7/06_list_ifnot.pyc b/test/bytecode_2.7/06_list_ifnot.pyc index 529bb92a..f813fe19 100644 Binary files a/test/bytecode_2.7/06_list_ifnot.pyc and b/test/bytecode_2.7/06_list_ifnot.pyc differ diff --git a/test/bytecode_2.7/06_return_bug.pyc b/test/bytecode_2.7/06_return_bug.pyc index b78466ca..5cb39af3 100644 Binary files a/test/bytecode_2.7/06_return_bug.pyc and b/test/bytecode_2.7/06_return_bug.pyc differ diff --git a/test/bytecode_2.7/10_class.pyc b/test/bytecode_2.7/10_class.pyc index 44b9bb9b..3be38498 100644 Binary files a/test/bytecode_2.7/10_class.pyc and b/test/bytecode_2.7/10_class.pyc differ diff --git a/test/bytecode_2.7/10_classdec.pyc b/test/bytecode_2.7/10_classdec.pyc index f3abe91d..f0317e3d 100644 Binary files a/test/bytecode_2.7/10_classdec.pyc and b/test/bytecode_2.7/10_classdec.pyc differ diff --git a/test/bytecode_2.7/20_try_except.pyc b/test/bytecode_2.7/20_try_except.pyc index 01af3fd1..28e88d02 100644 Binary files a/test/bytecode_2.7/20_try_except.pyc and b/test/bytecode_2.7/20_try_except.pyc differ diff --git a/test/bytecode_2.7/25_try_except.pyc b/test/bytecode_2.7/25_try_except.pyc index 0a67b044..a8443f15 100644 Binary files a/test/bytecode_2.7/25_try_except.pyc and b/test/bytecode_2.7/25_try_except.pyc differ diff --git a/test/simple_source/comprehension/01_list_comprehension.py b/test/simple_source/comprehension/01_list_comprehension.py index 20b44acd..6bc04a96 100644 --- a/test/simple_source/comprehension/01_list_comprehension.py +++ b/test/simple_source/comprehension/01_list_comprehension.py @@ -7,7 +7,7 @@ # list_iter ::= lc_body # lc_body ::= expr LIST_APPEND # -# Python3 grammar includes: +# Python 3 grammar includes: # listcomp ::= LOAD_LISTCOMP LOAD_CONST MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1 [ i for i in (1, 2, 3, 4) ] diff --git a/test/simple_source/operation_binary/add.py b/test/simple_source/operation_binary/add.py deleted file mode 100644 index b38c6ea7..00000000 --- a/test/simple_source/operation_binary/add.py +++ /dev/null @@ -1,5 +0,0 @@ -# Tests: -# assign ::= expr designator -# binary_expr ::= expr expr binary_op -# for binary_op = '+' -a = b + c diff --git a/test/simple_source/operation_binary/and.py b/test/simple_source/operation_binary/and.py deleted file mode 100644 index d5f3d26b..00000000 --- a/test/simple_source/operation_binary/and.py +++ /dev/null @@ -1,5 +0,0 @@ -# Tests: -# assign ::= expr designator -# binary_expr ::= expr expr binary_op -# for binary_op = '&' -a = b & c diff --git a/test/simple_source/operation_binary/divide_floor.py b/test/simple_source/operation_binary/divide_floor.py deleted file mode 100644 index cc0ab6fc..00000000 --- a/test/simple_source/operation_binary/divide_floor.py +++ /dev/null @@ -1 +0,0 @@ -a = b // c diff --git a/test/simple_source/operation_binary/divide_true.py b/test/simple_source/operation_binary/divide_true.py deleted file mode 100644 index ca252501..00000000 --- a/test/simple_source/operation_binary/divide_true.py +++ /dev/null @@ -1 +0,0 @@ -a = b / c diff --git a/test/simple_source/operation_binary/modulo.py b/test/simple_source/operation_binary/modulo.py deleted file mode 100644 index 74467bd1..00000000 --- a/test/simple_source/operation_binary/modulo.py +++ /dev/null @@ -1 +0,0 @@ -a = b % c diff --git a/test/simple_source/operation_binary/multiply.py b/test/simple_source/operation_binary/multiply.py deleted file mode 100644 index dbb590ed..00000000 --- a/test/simple_source/operation_binary/multiply.py +++ /dev/null @@ -1 +0,0 @@ -a = b * c diff --git a/test/simple_source/operation_binary/or.py b/test/simple_source/operation_binary/or.py deleted file mode 100644 index 0d0d5926..00000000 --- a/test/simple_source/operation_binary/or.py +++ /dev/null @@ -1 +0,0 @@ -a = b | c diff --git a/test/simple_source/operation_binary/power.py b/test/simple_source/operation_binary/power.py deleted file mode 100644 index 55af6117..00000000 --- a/test/simple_source/operation_binary/power.py +++ /dev/null @@ -1 +0,0 @@ -a = b ** c diff --git a/test/simple_source/operation_binary/shift_left.py b/test/simple_source/operation_binary/shift_left.py deleted file mode 100644 index ce1e5fa2..00000000 --- a/test/simple_source/operation_binary/shift_left.py +++ /dev/null @@ -1 +0,0 @@ -a = b << c diff --git a/test/simple_source/operation_binary/shift_right.py b/test/simple_source/operation_binary/shift_right.py deleted file mode 100644 index f5f12630..00000000 --- a/test/simple_source/operation_binary/shift_right.py +++ /dev/null @@ -1 +0,0 @@ -a = b >> c diff --git a/test/simple_source/operation_binary/subscription.py b/test/simple_source/operation_binary/subscription.py deleted file mode 100644 index c82b29ce..00000000 --- a/test/simple_source/operation_binary/subscription.py +++ /dev/null @@ -1 +0,0 @@ -a = b[c] diff --git a/test/simple_source/operation_binary/subtract.py b/test/simple_source/operation_binary/subtract.py deleted file mode 100644 index 5665b9a0..00000000 --- a/test/simple_source/operation_binary/subtract.py +++ /dev/null @@ -1 +0,0 @@ -a = b - c diff --git a/test/simple_source/operation_binary/xor.py b/test/simple_source/operation_binary/xor.py deleted file mode 100644 index 74ac990b..00000000 --- a/test/simple_source/operation_binary/xor.py +++ /dev/null @@ -1 +0,0 @@ -a = b ^ c diff --git a/test/simple_source/operation_comparison/equal.py b/test/simple_source/operation_comparison/equal.py deleted file mode 100644 index 3868da7a..00000000 --- a/test/simple_source/operation_comparison/equal.py +++ /dev/null @@ -1 +0,0 @@ -a == b diff --git a/test/simple_source/operation_comparison/greater.py b/test/simple_source/operation_comparison/greater.py deleted file mode 100644 index 4fb63b4b..00000000 --- a/test/simple_source/operation_comparison/greater.py +++ /dev/null @@ -1 +0,0 @@ -a > b diff --git a/test/simple_source/operation_comparison/greater_equal.py b/test/simple_source/operation_comparison/greater_equal.py deleted file mode 100644 index c85dc864..00000000 --- a/test/simple_source/operation_comparison/greater_equal.py +++ /dev/null @@ -1 +0,0 @@ -a >= b diff --git a/test/simple_source/operation_comparison/less.py b/test/simple_source/operation_comparison/less.py deleted file mode 100644 index ec87be75..00000000 --- a/test/simple_source/operation_comparison/less.py +++ /dev/null @@ -1 +0,0 @@ -a < b diff --git a/test/simple_source/operation_comparison/less_equal.py b/test/simple_source/operation_comparison/less_equal.py deleted file mode 100644 index 6228539c..00000000 --- a/test/simple_source/operation_comparison/less_equal.py +++ /dev/null @@ -1 +0,0 @@ -a <= b diff --git a/test/simple_source/operation_comparison/notequal.py b/test/simple_source/operation_comparison/notequal.py deleted file mode 100644 index 22a319fb..00000000 --- a/test/simple_source/operation_comparison/notequal.py +++ /dev/null @@ -1 +0,0 @@ -a != b diff --git a/test/simple_source/operation_inplace/add.py b/test/simple_source/operation_inplace/add.py deleted file mode 100644 index d1e399dd..00000000 --- a/test/simple_source/operation_inplace/add.py +++ /dev/null @@ -1 +0,0 @@ -a += b diff --git a/test/simple_source/operation_inplace/and.py b/test/simple_source/operation_inplace/and.py deleted file mode 100644 index 59af58ce..00000000 --- a/test/simple_source/operation_inplace/and.py +++ /dev/null @@ -1 +0,0 @@ -a &= b diff --git a/test/simple_source/operation_inplace/divide_floor.py b/test/simple_source/operation_inplace/divide_floor.py deleted file mode 100644 index 94ec2e03..00000000 --- a/test/simple_source/operation_inplace/divide_floor.py +++ /dev/null @@ -1 +0,0 @@ -a //= b diff --git a/test/simple_source/operation_inplace/divide_true.py b/test/simple_source/operation_inplace/divide_true.py deleted file mode 100644 index 1c9955c3..00000000 --- a/test/simple_source/operation_inplace/divide_true.py +++ /dev/null @@ -1 +0,0 @@ -a /= b diff --git a/test/simple_source/operation_inplace/modulo.py b/test/simple_source/operation_inplace/modulo.py deleted file mode 100644 index 0ec49076..00000000 --- a/test/simple_source/operation_inplace/modulo.py +++ /dev/null @@ -1 +0,0 @@ -a %= b diff --git a/test/simple_source/operation_inplace/multiply.py b/test/simple_source/operation_inplace/multiply.py deleted file mode 100644 index 14afe669..00000000 --- a/test/simple_source/operation_inplace/multiply.py +++ /dev/null @@ -1 +0,0 @@ -a *= b diff --git a/test/simple_source/operation_inplace/or.py b/test/simple_source/operation_inplace/or.py deleted file mode 100644 index ab5d8855..00000000 --- a/test/simple_source/operation_inplace/or.py +++ /dev/null @@ -1 +0,0 @@ -a |= b diff --git a/test/simple_source/operation_inplace/power.py b/test/simple_source/operation_inplace/power.py deleted file mode 100644 index b8a5cf99..00000000 --- a/test/simple_source/operation_inplace/power.py +++ /dev/null @@ -1 +0,0 @@ -a **= b diff --git a/test/simple_source/operation_inplace/shift_left.py b/test/simple_source/operation_inplace/shift_left.py deleted file mode 100644 index 13ce5cbf..00000000 --- a/test/simple_source/operation_inplace/shift_left.py +++ /dev/null @@ -1 +0,0 @@ -a <<= b diff --git a/test/simple_source/operation_inplace/shift_right.py b/test/simple_source/operation_inplace/shift_right.py deleted file mode 100644 index 0ec678a7..00000000 --- a/test/simple_source/operation_inplace/shift_right.py +++ /dev/null @@ -1 +0,0 @@ -a >>= b diff --git a/test/simple_source/operation_inplace/subtract.py b/test/simple_source/operation_inplace/subtract.py deleted file mode 100644 index 19bd84cb..00000000 --- a/test/simple_source/operation_inplace/subtract.py +++ /dev/null @@ -1 +0,0 @@ -a -= b diff --git a/test/simple_source/operation_inplace/xor.py b/test/simple_source/operation_inplace/xor.py deleted file mode 100644 index 01cce8c5..00000000 --- a/test/simple_source/operation_inplace/xor.py +++ /dev/null @@ -1 +0,0 @@ -a ^= b diff --git a/test/simple_source/operation_unary/invert.py b/test/simple_source/operation_unary/invert.py deleted file mode 100644 index ad6c9b69..00000000 --- a/test/simple_source/operation_unary/invert.py +++ /dev/null @@ -1 +0,0 @@ -a = ~b diff --git a/test/simple_source/operation_unary/iter.py b/test/simple_source/operation_unary/iter.py deleted file mode 100644 index b0f8ac90..00000000 --- a/test/simple_source/operation_unary/iter.py +++ /dev/null @@ -1 +0,0 @@ -a = iter(b) diff --git a/test/simple_source/operation_unary/negative.py b/test/simple_source/operation_unary/negative.py deleted file mode 100644 index 5e8d8884..00000000 --- a/test/simple_source/operation_unary/negative.py +++ /dev/null @@ -1 +0,0 @@ -a = -b diff --git a/test/simple_source/operation_unary/not.py b/test/simple_source/operation_unary/not.py deleted file mode 100644 index 8f7dc251..00000000 --- a/test/simple_source/operation_unary/not.py +++ /dev/null @@ -1 +0,0 @@ -a = not b diff --git a/test/simple_source/operation_unary/positive.py b/test/simple_source/operation_unary/positive.py deleted file mode 100644 index 0ad022f8..00000000 --- a/test/simple_source/operation_unary/positive.py +++ /dev/null @@ -1 +0,0 @@ -a = +b diff --git a/test/simple_source/precedence/left.py b/test/simple_source/precedence/left.py deleted file mode 100644 index fcc8b9fb..00000000 --- a/test/simple_source/precedence/left.py +++ /dev/null @@ -1,2 +0,0 @@ -a = (b + c) * d -a = b + c * d diff --git a/test/simple_source/precedence/right.py b/test/simple_source/precedence/right.py deleted file mode 100644 index fa7722ca..00000000 --- a/test/simple_source/precedence/right.py +++ /dev/null @@ -1,2 +0,0 @@ -a = b * (c + d) -a = b * c + d diff --git a/test/simple_source/precedence/structure.py b/test/simple_source/precedence/structure.py deleted file mode 100644 index d7e170a0..00000000 --- a/test/simple_source/precedence/structure.py +++ /dev/null @@ -1,2 +0,0 @@ -a = b + c + d + e -a = b + c + (d + e) diff --git a/test/simple_source/stmts/00_import.py b/test/simple_source/stmts/00_import.py index 5c611426..de09e2bb 100644 --- a/test/simple_source/stmts/00_import.py +++ b/test/simple_source/stmts/00_import.py @@ -2,3 +2,4 @@ import sys from os import path +from os import * diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py index 0285d032..3e97efd8 100644 --- a/uncompyle6/parsers/parse2.py +++ b/uncompyle6/parsers/parse2.py @@ -239,7 +239,6 @@ class Python2Parser(PythonParser): expr ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP ''' for k, v in list(customize.items()): - op = k[:k.rfind('_')] if op in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'): thousands = (v//1024) diff --git a/uncompyle6/parsers/parse23.py b/uncompyle6/parsers/parse23.py index 22f6c0df..fbb54d87 100644 --- a/uncompyle6/parsers/parse23.py +++ b/uncompyle6/parsers/parse23.py @@ -16,7 +16,10 @@ class Python23Parser(Python24Parser): ''' _while1test ::= JUMP_FORWARD JUMP_IF_FALSE POP_TOP COME_FROM - while1stmt ::= SETUP_LOOP _while1test l_stmts JUMP_BACK COME_FROM POP_TOP POP_BLOCK COME_FROM + while1stmt ::= SETUP_LOOP _while1test l_stmts JUMP_BACK + COME_FROM POP_TOP POP_BLOCK COME_FROM + + list_compr ::= BUILD_LIST_0 DUP_TOP LOAD_ATTR designator list_iter del_stmt ''' class Python23ParserSingle(Python23Parser, PythonParserSingle): diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py index 0f8671ab..29eeefe7 100644 --- a/uncompyle6/parsers/parse25.py +++ b/uncompyle6/parsers/parse25.py @@ -20,7 +20,7 @@ class Python25Parser(Python26Parser): return_if_stmt ::= ret_expr RETURN_END_IF JUMP_BACK - # Pyython 2.6 uses ROT_TWO instead of the STORE_xxx + # Python 2.6 uses ROT_TWO instead of the STORE_xxx setupwithas ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0 setup_finally diff --git a/uncompyle6/scanners/scanner26.py b/uncompyle6/scanners/scanner26.py index 904cc098..a28e4c6f 100755 --- a/uncompyle6/scanners/scanner26.py +++ b/uncompyle6/scanners/scanner26.py @@ -215,7 +215,7 @@ class Scanner26(scan.Scanner2): # FIXME: this is a hack to catch stuff like: # if x: continue # the "continue" is not on a new line. - if tokens[-1].type == 'JUMP_BACK': + if len(tokens) and tokens[-1].type == 'JUMP_BACK': tokens[-1].type = intern('CONTINUE') elif op in self.opc.hasjabs: