[svn:parrot] r49701 - in branches/remove_charset_ops: . include/parrot include/parrot/oplib src/ops src/string

nwellnhof at svn.parrot.org nwellnhof at svn.parrot.org
Wed Oct 27 21:51:17 UTC 2010


Author: nwellnhof
Date: Wed Oct 27 21:51:16 2010
New Revision: 49701
URL: https://trac.parrot.org/parrot/changeset/49701

Log:
[ops] Remove charset ops

Modified:
   branches/remove_charset_ops/PBC_COMPAT
   branches/remove_charset_ops/include/parrot/oplib/core_ops.h
   branches/remove_charset_ops/include/parrot/oplib/ops.h
   branches/remove_charset_ops/include/parrot/opsenum.h
   branches/remove_charset_ops/include/parrot/string_funcs.h
   branches/remove_charset_ops/src/ops/core_ops.c
   branches/remove_charset_ops/src/ops/string.ops
   branches/remove_charset_ops/src/string/api.c

Modified: branches/remove_charset_ops/PBC_COMPAT
==============================================================================
--- branches/remove_charset_ops/PBC_COMPAT	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/PBC_COMPAT	Wed Oct 27 21:51:16 2010	(r49701)
@@ -28,6 +28,7 @@
 
 # please insert tab separated entries at the top of the list
 
+9.1	2010.10.27	nwellnhof	remove charset ops
 9.0	2010.10.19	gerd	released 2.9.0
 8.0	2010.07.20	coke	released 2.6.0
 7.0	2010.04.20	gerd	released 2.3.0 (version # added ex post facto, as all previous version #s were published)

Modified: branches/remove_charset_ops/include/parrot/oplib/core_ops.h
==============================================================================
--- branches/remove_charset_ops/include/parrot/oplib/core_ops.h	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/include/parrot/oplib/core_ops.h	Wed Oct 27 21:51:16 2010	(r49701)
@@ -904,16 +904,6 @@
  opcode_t * Parrot_split_p_sc_s(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_split_p_s_sc(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_split_p_sc_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_charset_i_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_charset_i_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_charsetname_s_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_charsetname_s_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_find_charset_i_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_find_charset_i_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_trans_charset_s_s_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_trans_charset_s_sc_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_trans_charset_s_s_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_trans_charset_s_sc_ic(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_encoding_i_s(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_encoding_i_sc(opcode_t *, PARROT_INTERP);
  opcode_t * Parrot_encodingname_s_i(opcode_t *, PARROT_INTERP);

Modified: branches/remove_charset_ops/include/parrot/oplib/ops.h
==============================================================================
--- branches/remove_charset_ops/include/parrot/oplib/ops.h	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/include/parrot/oplib/ops.h	Wed Oct 27 21:51:16 2010	(r49701)
@@ -898,208 +898,198 @@
     PARROT_OP_split_p_sc_s,                    /* 878 */
     PARROT_OP_split_p_s_sc,                    /* 879 */
     PARROT_OP_split_p_sc_sc,                   /* 880 */
-    PARROT_OP_charset_i_s,                     /* 881 */
-    PARROT_OP_charset_i_sc,                    /* 882 */
-    PARROT_OP_charsetname_s_i,                 /* 883 */
-    PARROT_OP_charsetname_s_ic,                /* 884 */
-    PARROT_OP_find_charset_i_s,                /* 885 */
-    PARROT_OP_find_charset_i_sc,               /* 886 */
-    PARROT_OP_trans_charset_s_s_i,             /* 887 */
-    PARROT_OP_trans_charset_s_sc_i,            /* 888 */
-    PARROT_OP_trans_charset_s_s_ic,            /* 889 */
-    PARROT_OP_trans_charset_s_sc_ic,           /* 890 */
-    PARROT_OP_encoding_i_s,                    /* 891 */
-    PARROT_OP_encoding_i_sc,                   /* 892 */
-    PARROT_OP_encodingname_s_i,                /* 893 */
-    PARROT_OP_encodingname_s_ic,               /* 894 */
-    PARROT_OP_find_encoding_i_s,               /* 895 */
-    PARROT_OP_find_encoding_i_sc,              /* 896 */
-    PARROT_OP_trans_encoding_s_s_i,            /* 897 */
-    PARROT_OP_trans_encoding_s_sc_i,           /* 898 */
-    PARROT_OP_trans_encoding_s_s_ic,           /* 899 */
-    PARROT_OP_trans_encoding_s_sc_ic,          /* 900 */
-    PARROT_OP_is_cclass_i_i_s_i,               /* 901 */
-    PARROT_OP_is_cclass_i_ic_s_i,              /* 902 */
-    PARROT_OP_is_cclass_i_i_sc_i,              /* 903 */
-    PARROT_OP_is_cclass_i_ic_sc_i,             /* 904 */
-    PARROT_OP_is_cclass_i_i_s_ic,              /* 905 */
-    PARROT_OP_is_cclass_i_ic_s_ic,             /* 906 */
-    PARROT_OP_is_cclass_i_i_sc_ic,             /* 907 */
-    PARROT_OP_is_cclass_i_ic_sc_ic,            /* 908 */
-    PARROT_OP_find_cclass_i_i_s_i_i,           /* 909 */
-    PARROT_OP_find_cclass_i_ic_s_i_i,          /* 910 */
-    PARROT_OP_find_cclass_i_i_sc_i_i,          /* 911 */
-    PARROT_OP_find_cclass_i_ic_sc_i_i,         /* 912 */
-    PARROT_OP_find_cclass_i_i_s_ic_i,          /* 913 */
-    PARROT_OP_find_cclass_i_ic_s_ic_i,         /* 914 */
-    PARROT_OP_find_cclass_i_i_sc_ic_i,         /* 915 */
-    PARROT_OP_find_cclass_i_ic_sc_ic_i,        /* 916 */
-    PARROT_OP_find_cclass_i_i_s_i_ic,          /* 917 */
-    PARROT_OP_find_cclass_i_ic_s_i_ic,         /* 918 */
-    PARROT_OP_find_cclass_i_i_sc_i_ic,         /* 919 */
-    PARROT_OP_find_cclass_i_ic_sc_i_ic,        /* 920 */
-    PARROT_OP_find_cclass_i_i_s_ic_ic,         /* 921 */
-    PARROT_OP_find_cclass_i_ic_s_ic_ic,        /* 922 */
-    PARROT_OP_find_cclass_i_i_sc_ic_ic,        /* 923 */
-    PARROT_OP_find_cclass_i_ic_sc_ic_ic,       /* 924 */
-    PARROT_OP_find_not_cclass_i_i_s_i_i,       /* 925 */
-    PARROT_OP_find_not_cclass_i_ic_s_i_i,      /* 926 */
-    PARROT_OP_find_not_cclass_i_i_sc_i_i,      /* 927 */
-    PARROT_OP_find_not_cclass_i_ic_sc_i_i,     /* 928 */
-    PARROT_OP_find_not_cclass_i_i_s_ic_i,      /* 929 */
-    PARROT_OP_find_not_cclass_i_ic_s_ic_i,     /* 930 */
-    PARROT_OP_find_not_cclass_i_i_sc_ic_i,     /* 931 */
-    PARROT_OP_find_not_cclass_i_ic_sc_ic_i,    /* 932 */
-    PARROT_OP_find_not_cclass_i_i_s_i_ic,      /* 933 */
-    PARROT_OP_find_not_cclass_i_ic_s_i_ic,     /* 934 */
-    PARROT_OP_find_not_cclass_i_i_sc_i_ic,     /* 935 */
-    PARROT_OP_find_not_cclass_i_ic_sc_i_ic,    /* 936 */
-    PARROT_OP_find_not_cclass_i_i_s_ic_ic,     /* 937 */
-    PARROT_OP_find_not_cclass_i_ic_s_ic_ic,    /* 938 */
-    PARROT_OP_find_not_cclass_i_i_sc_ic_ic,    /* 939 */
-    PARROT_OP_find_not_cclass_i_ic_sc_ic_ic,   /* 940 */
-    PARROT_OP_escape_s_s,                      /* 941 */
-    PARROT_OP_compose_s_s,                     /* 942 */
-    PARROT_OP_compose_s_sc,                    /* 943 */
-    PARROT_OP_spawnw_i_s,                      /* 944 */
-    PARROT_OP_spawnw_i_sc,                     /* 945 */
-    PARROT_OP_spawnw_i_p,                      /* 946 */
-    PARROT_OP_err_i,                           /* 947 */
-    PARROT_OP_err_s,                           /* 948 */
-    PARROT_OP_err_s_i,                         /* 949 */
-    PARROT_OP_err_s_ic,                        /* 950 */
-    PARROT_OP_time_i,                          /* 951 */
-    PARROT_OP_time_n,                          /* 952 */
-    PARROT_OP_sleep_i,                         /* 953 */
-    PARROT_OP_sleep_ic,                        /* 954 */
-    PARROT_OP_sleep_n,                         /* 955 */
-    PARROT_OP_sleep_nc,                        /* 956 */
-    PARROT_OP_store_lex_s_p,                   /* 957 */
-    PARROT_OP_store_lex_sc_p,                  /* 958 */
-    PARROT_OP_store_dynamic_lex_s_p,           /* 959 */
-    PARROT_OP_store_dynamic_lex_sc_p,          /* 960 */
-    PARROT_OP_find_lex_p_s,                    /* 961 */
-    PARROT_OP_find_lex_p_sc,                   /* 962 */
-    PARROT_OP_find_dynamic_lex_p_s,            /* 963 */
-    PARROT_OP_find_dynamic_lex_p_sc,           /* 964 */
-    PARROT_OP_find_caller_lex_p_s,             /* 965 */
-    PARROT_OP_find_caller_lex_p_sc,            /* 966 */
-    PARROT_OP_get_namespace_p,                 /* 967 */
-    PARROT_OP_get_namespace_p_p,               /* 968 */
-    PARROT_OP_get_namespace_p_pc,              /* 969 */
-    PARROT_OP_get_hll_namespace_p,             /* 970 */
-    PARROT_OP_get_hll_namespace_p_p,           /* 971 */
-    PARROT_OP_get_hll_namespace_p_pc,          /* 972 */
-    PARROT_OP_get_root_namespace_p,            /* 973 */
-    PARROT_OP_get_root_namespace_p_p,          /* 974 */
-    PARROT_OP_get_root_namespace_p_pc,         /* 975 */
-    PARROT_OP_get_global_p_s,                  /* 976 */
-    PARROT_OP_get_global_p_sc,                 /* 977 */
-    PARROT_OP_get_global_p_p_s,                /* 978 */
-    PARROT_OP_get_global_p_pc_s,               /* 979 */
-    PARROT_OP_get_global_p_p_sc,               /* 980 */
-    PARROT_OP_get_global_p_pc_sc,              /* 981 */
-    PARROT_OP_get_hll_global_p_s,              /* 982 */
-    PARROT_OP_get_hll_global_p_sc,             /* 983 */
-    PARROT_OP_get_hll_global_p_p_s,            /* 984 */
-    PARROT_OP_get_hll_global_p_pc_s,           /* 985 */
-    PARROT_OP_get_hll_global_p_p_sc,           /* 986 */
-    PARROT_OP_get_hll_global_p_pc_sc,          /* 987 */
-    PARROT_OP_get_root_global_p_s,             /* 988 */
-    PARROT_OP_get_root_global_p_sc,            /* 989 */
-    PARROT_OP_get_root_global_p_p_s,           /* 990 */
-    PARROT_OP_get_root_global_p_pc_s,          /* 991 */
-    PARROT_OP_get_root_global_p_p_sc,          /* 992 */
-    PARROT_OP_get_root_global_p_pc_sc,         /* 993 */
-    PARROT_OP_set_global_s_p,                  /* 994 */
-    PARROT_OP_set_global_sc_p,                 /* 995 */
-    PARROT_OP_set_global_p_s_p,                /* 996 */
-    PARROT_OP_set_global_pc_s_p,               /* 997 */
-    PARROT_OP_set_global_p_sc_p,               /* 998 */
-    PARROT_OP_set_global_pc_sc_p,              /* 999 */
-    PARROT_OP_set_hll_global_s_p,              /* 1000 */
-    PARROT_OP_set_hll_global_sc_p,             /* 1001 */
-    PARROT_OP_set_hll_global_p_s_p,            /* 1002 */
-    PARROT_OP_set_hll_global_pc_s_p,           /* 1003 */
-    PARROT_OP_set_hll_global_p_sc_p,           /* 1004 */
-    PARROT_OP_set_hll_global_pc_sc_p,          /* 1005 */
-    PARROT_OP_set_root_global_s_p,             /* 1006 */
-    PARROT_OP_set_root_global_sc_p,            /* 1007 */
-    PARROT_OP_set_root_global_p_s_p,           /* 1008 */
-    PARROT_OP_set_root_global_pc_s_p,          /* 1009 */
-    PARROT_OP_set_root_global_p_sc_p,          /* 1010 */
-    PARROT_OP_set_root_global_pc_sc_p,         /* 1011 */
-    PARROT_OP_find_name_p_s,                   /* 1012 */
-    PARROT_OP_find_name_p_sc,                  /* 1013 */
-    PARROT_OP_find_sub_not_null_p_s,           /* 1014 */
-    PARROT_OP_find_sub_not_null_p_sc,          /* 1015 */
-    PARROT_OP_trap,                            /* 1016 */
-    PARROT_OP_set_label_p_ic,                  /* 1017 */
-    PARROT_OP_get_label_i_p,                   /* 1018 */
-    PARROT_OP_fetch_p_p_p_p,                   /* 1019 */
-    PARROT_OP_fetch_p_pc_p_p,                  /* 1020 */
-    PARROT_OP_fetch_p_p_pc_p,                  /* 1021 */
-    PARROT_OP_fetch_p_pc_pc_p,                 /* 1022 */
-    PARROT_OP_fetch_p_p_p_pc,                  /* 1023 */
-    PARROT_OP_fetch_p_pc_p_pc,                 /* 1024 */
-    PARROT_OP_fetch_p_p_pc_pc,                 /* 1025 */
-    PARROT_OP_fetch_p_pc_pc_pc,                /* 1026 */
-    PARROT_OP_fetch_p_p_i_p,                   /* 1027 */
-    PARROT_OP_fetch_p_pc_i_p,                  /* 1028 */
-    PARROT_OP_fetch_p_p_ic_p,                  /* 1029 */
-    PARROT_OP_fetch_p_pc_ic_p,                 /* 1030 */
-    PARROT_OP_fetch_p_p_i_pc,                  /* 1031 */
-    PARROT_OP_fetch_p_pc_i_pc,                 /* 1032 */
-    PARROT_OP_fetch_p_p_ic_pc,                 /* 1033 */
-    PARROT_OP_fetch_p_pc_ic_pc,                /* 1034 */
-    PARROT_OP_fetch_p_p_s_p,                   /* 1035 */
-    PARROT_OP_fetch_p_pc_s_p,                  /* 1036 */
-    PARROT_OP_fetch_p_p_sc_p,                  /* 1037 */
-    PARROT_OP_fetch_p_pc_sc_p,                 /* 1038 */
-    PARROT_OP_fetch_p_p_s_pc,                  /* 1039 */
-    PARROT_OP_fetch_p_pc_s_pc,                 /* 1040 */
-    PARROT_OP_fetch_p_p_sc_pc,                 /* 1041 */
-    PARROT_OP_fetch_p_pc_sc_pc,                /* 1042 */
-    PARROT_OP_vivify_p_p_p_p,                  /* 1043 */
-    PARROT_OP_vivify_p_pc_p_p,                 /* 1044 */
-    PARROT_OP_vivify_p_p_pc_p,                 /* 1045 */
-    PARROT_OP_vivify_p_pc_pc_p,                /* 1046 */
-    PARROT_OP_vivify_p_p_p_pc,                 /* 1047 */
-    PARROT_OP_vivify_p_pc_p_pc,                /* 1048 */
-    PARROT_OP_vivify_p_p_pc_pc,                /* 1049 */
-    PARROT_OP_vivify_p_pc_pc_pc,               /* 1050 */
-    PARROT_OP_vivify_p_p_i_p,                  /* 1051 */
-    PARROT_OP_vivify_p_pc_i_p,                 /* 1052 */
-    PARROT_OP_vivify_p_p_ic_p,                 /* 1053 */
-    PARROT_OP_vivify_p_pc_ic_p,                /* 1054 */
-    PARROT_OP_vivify_p_p_i_pc,                 /* 1055 */
-    PARROT_OP_vivify_p_pc_i_pc,                /* 1056 */
-    PARROT_OP_vivify_p_p_ic_pc,                /* 1057 */
-    PARROT_OP_vivify_p_pc_ic_pc,               /* 1058 */
-    PARROT_OP_vivify_p_p_s_p,                  /* 1059 */
-    PARROT_OP_vivify_p_pc_s_p,                 /* 1060 */
-    PARROT_OP_vivify_p_p_sc_p,                 /* 1061 */
-    PARROT_OP_vivify_p_pc_sc_p,                /* 1062 */
-    PARROT_OP_vivify_p_p_s_pc,                 /* 1063 */
-    PARROT_OP_vivify_p_pc_s_pc,                /* 1064 */
-    PARROT_OP_vivify_p_p_sc_pc,                /* 1065 */
-    PARROT_OP_vivify_p_pc_sc_pc,               /* 1066 */
-    PARROT_OP_new_p_s_i,                       /* 1067 */
-    PARROT_OP_new_p_sc_i,                      /* 1068 */
-    PARROT_OP_new_p_s_ic,                      /* 1069 */
-    PARROT_OP_new_p_sc_ic,                     /* 1070 */
-    PARROT_OP_new_p_p_i,                       /* 1071 */
-    PARROT_OP_new_p_pc_i,                      /* 1072 */
-    PARROT_OP_new_p_p_ic,                      /* 1073 */
-    PARROT_OP_new_p_pc_ic,                     /* 1074 */
-    PARROT_OP_root_new_p_p_i,                  /* 1075 */
-    PARROT_OP_root_new_p_pc_i,                 /* 1076 */
-    PARROT_OP_root_new_p_p_ic,                 /* 1077 */
-    PARROT_OP_root_new_p_pc_ic,                /* 1078 */
-    PARROT_OP_find_codepoint_i_s,              /* 1079 */
-    PARROT_OP_find_codepoint_i_sc,             /* 1080 */
-    PARROT_OP_finalize_p,                      /* 1081 */
-    PARROT_OP_finalize_pc                      /* 1082 */
+    PARROT_OP_encoding_i_s,                    /* 881 */
+    PARROT_OP_encoding_i_sc,                   /* 882 */
+    PARROT_OP_encodingname_s_i,                /* 883 */
+    PARROT_OP_encodingname_s_ic,               /* 884 */
+    PARROT_OP_find_encoding_i_s,               /* 885 */
+    PARROT_OP_find_encoding_i_sc,              /* 886 */
+    PARROT_OP_trans_encoding_s_s_i,            /* 887 */
+    PARROT_OP_trans_encoding_s_sc_i,           /* 888 */
+    PARROT_OP_trans_encoding_s_s_ic,           /* 889 */
+    PARROT_OP_trans_encoding_s_sc_ic,          /* 890 */
+    PARROT_OP_is_cclass_i_i_s_i,               /* 891 */
+    PARROT_OP_is_cclass_i_ic_s_i,              /* 892 */
+    PARROT_OP_is_cclass_i_i_sc_i,              /* 893 */
+    PARROT_OP_is_cclass_i_ic_sc_i,             /* 894 */
+    PARROT_OP_is_cclass_i_i_s_ic,              /* 895 */
+    PARROT_OP_is_cclass_i_ic_s_ic,             /* 896 */
+    PARROT_OP_is_cclass_i_i_sc_ic,             /* 897 */
+    PARROT_OP_is_cclass_i_ic_sc_ic,            /* 898 */
+    PARROT_OP_find_cclass_i_i_s_i_i,           /* 899 */
+    PARROT_OP_find_cclass_i_ic_s_i_i,          /* 900 */
+    PARROT_OP_find_cclass_i_i_sc_i_i,          /* 901 */
+    PARROT_OP_find_cclass_i_ic_sc_i_i,         /* 902 */
+    PARROT_OP_find_cclass_i_i_s_ic_i,          /* 903 */
+    PARROT_OP_find_cclass_i_ic_s_ic_i,         /* 904 */
+    PARROT_OP_find_cclass_i_i_sc_ic_i,         /* 905 */
+    PARROT_OP_find_cclass_i_ic_sc_ic_i,        /* 906 */
+    PARROT_OP_find_cclass_i_i_s_i_ic,          /* 907 */
+    PARROT_OP_find_cclass_i_ic_s_i_ic,         /* 908 */
+    PARROT_OP_find_cclass_i_i_sc_i_ic,         /* 909 */
+    PARROT_OP_find_cclass_i_ic_sc_i_ic,        /* 910 */
+    PARROT_OP_find_cclass_i_i_s_ic_ic,         /* 911 */
+    PARROT_OP_find_cclass_i_ic_s_ic_ic,        /* 912 */
+    PARROT_OP_find_cclass_i_i_sc_ic_ic,        /* 913 */
+    PARROT_OP_find_cclass_i_ic_sc_ic_ic,       /* 914 */
+    PARROT_OP_find_not_cclass_i_i_s_i_i,       /* 915 */
+    PARROT_OP_find_not_cclass_i_ic_s_i_i,      /* 916 */
+    PARROT_OP_find_not_cclass_i_i_sc_i_i,      /* 917 */
+    PARROT_OP_find_not_cclass_i_ic_sc_i_i,     /* 918 */
+    PARROT_OP_find_not_cclass_i_i_s_ic_i,      /* 919 */
+    PARROT_OP_find_not_cclass_i_ic_s_ic_i,     /* 920 */
+    PARROT_OP_find_not_cclass_i_i_sc_ic_i,     /* 921 */
+    PARROT_OP_find_not_cclass_i_ic_sc_ic_i,    /* 922 */
+    PARROT_OP_find_not_cclass_i_i_s_i_ic,      /* 923 */
+    PARROT_OP_find_not_cclass_i_ic_s_i_ic,     /* 924 */
+    PARROT_OP_find_not_cclass_i_i_sc_i_ic,     /* 925 */
+    PARROT_OP_find_not_cclass_i_ic_sc_i_ic,    /* 926 */
+    PARROT_OP_find_not_cclass_i_i_s_ic_ic,     /* 927 */
+    PARROT_OP_find_not_cclass_i_ic_s_ic_ic,    /* 928 */
+    PARROT_OP_find_not_cclass_i_i_sc_ic_ic,    /* 929 */
+    PARROT_OP_find_not_cclass_i_ic_sc_ic_ic,   /* 930 */
+    PARROT_OP_escape_s_s,                      /* 931 */
+    PARROT_OP_compose_s_s,                     /* 932 */
+    PARROT_OP_compose_s_sc,                    /* 933 */
+    PARROT_OP_spawnw_i_s,                      /* 934 */
+    PARROT_OP_spawnw_i_sc,                     /* 935 */
+    PARROT_OP_spawnw_i_p,                      /* 936 */
+    PARROT_OP_err_i,                           /* 937 */
+    PARROT_OP_err_s,                           /* 938 */
+    PARROT_OP_err_s_i,                         /* 939 */
+    PARROT_OP_err_s_ic,                        /* 940 */
+    PARROT_OP_time_i,                          /* 941 */
+    PARROT_OP_time_n,                          /* 942 */
+    PARROT_OP_sleep_i,                         /* 943 */
+    PARROT_OP_sleep_ic,                        /* 944 */
+    PARROT_OP_sleep_n,                         /* 945 */
+    PARROT_OP_sleep_nc,                        /* 946 */
+    PARROT_OP_store_lex_s_p,                   /* 947 */
+    PARROT_OP_store_lex_sc_p,                  /* 948 */
+    PARROT_OP_store_dynamic_lex_s_p,           /* 949 */
+    PARROT_OP_store_dynamic_lex_sc_p,          /* 950 */
+    PARROT_OP_find_lex_p_s,                    /* 951 */
+    PARROT_OP_find_lex_p_sc,                   /* 952 */
+    PARROT_OP_find_dynamic_lex_p_s,            /* 953 */
+    PARROT_OP_find_dynamic_lex_p_sc,           /* 954 */
+    PARROT_OP_find_caller_lex_p_s,             /* 955 */
+    PARROT_OP_find_caller_lex_p_sc,            /* 956 */
+    PARROT_OP_get_namespace_p,                 /* 957 */
+    PARROT_OP_get_namespace_p_p,               /* 958 */
+    PARROT_OP_get_namespace_p_pc,              /* 959 */
+    PARROT_OP_get_hll_namespace_p,             /* 960 */
+    PARROT_OP_get_hll_namespace_p_p,           /* 961 */
+    PARROT_OP_get_hll_namespace_p_pc,          /* 962 */
+    PARROT_OP_get_root_namespace_p,            /* 963 */
+    PARROT_OP_get_root_namespace_p_p,          /* 964 */
+    PARROT_OP_get_root_namespace_p_pc,         /* 965 */
+    PARROT_OP_get_global_p_s,                  /* 966 */
+    PARROT_OP_get_global_p_sc,                 /* 967 */
+    PARROT_OP_get_global_p_p_s,                /* 968 */
+    PARROT_OP_get_global_p_pc_s,               /* 969 */
+    PARROT_OP_get_global_p_p_sc,               /* 970 */
+    PARROT_OP_get_global_p_pc_sc,              /* 971 */
+    PARROT_OP_get_hll_global_p_s,              /* 972 */
+    PARROT_OP_get_hll_global_p_sc,             /* 973 */
+    PARROT_OP_get_hll_global_p_p_s,            /* 974 */
+    PARROT_OP_get_hll_global_p_pc_s,           /* 975 */
+    PARROT_OP_get_hll_global_p_p_sc,           /* 976 */
+    PARROT_OP_get_hll_global_p_pc_sc,          /* 977 */
+    PARROT_OP_get_root_global_p_s,             /* 978 */
+    PARROT_OP_get_root_global_p_sc,            /* 979 */
+    PARROT_OP_get_root_global_p_p_s,           /* 980 */
+    PARROT_OP_get_root_global_p_pc_s,          /* 981 */
+    PARROT_OP_get_root_global_p_p_sc,          /* 982 */
+    PARROT_OP_get_root_global_p_pc_sc,         /* 983 */
+    PARROT_OP_set_global_s_p,                  /* 984 */
+    PARROT_OP_set_global_sc_p,                 /* 985 */
+    PARROT_OP_set_global_p_s_p,                /* 986 */
+    PARROT_OP_set_global_pc_s_p,               /* 987 */
+    PARROT_OP_set_global_p_sc_p,               /* 988 */
+    PARROT_OP_set_global_pc_sc_p,              /* 989 */
+    PARROT_OP_set_hll_global_s_p,              /* 990 */
+    PARROT_OP_set_hll_global_sc_p,             /* 991 */
+    PARROT_OP_set_hll_global_p_s_p,            /* 992 */
+    PARROT_OP_set_hll_global_pc_s_p,           /* 993 */
+    PARROT_OP_set_hll_global_p_sc_p,           /* 994 */
+    PARROT_OP_set_hll_global_pc_sc_p,          /* 995 */
+    PARROT_OP_set_root_global_s_p,             /* 996 */
+    PARROT_OP_set_root_global_sc_p,            /* 997 */
+    PARROT_OP_set_root_global_p_s_p,           /* 998 */
+    PARROT_OP_set_root_global_pc_s_p,          /* 999 */
+    PARROT_OP_set_root_global_p_sc_p,          /* 1000 */
+    PARROT_OP_set_root_global_pc_sc_p,         /* 1001 */
+    PARROT_OP_find_name_p_s,                   /* 1002 */
+    PARROT_OP_find_name_p_sc,                  /* 1003 */
+    PARROT_OP_find_sub_not_null_p_s,           /* 1004 */
+    PARROT_OP_find_sub_not_null_p_sc,          /* 1005 */
+    PARROT_OP_trap,                            /* 1006 */
+    PARROT_OP_set_label_p_ic,                  /* 1007 */
+    PARROT_OP_get_label_i_p,                   /* 1008 */
+    PARROT_OP_fetch_p_p_p_p,                   /* 1009 */
+    PARROT_OP_fetch_p_pc_p_p,                  /* 1010 */
+    PARROT_OP_fetch_p_p_pc_p,                  /* 1011 */
+    PARROT_OP_fetch_p_pc_pc_p,                 /* 1012 */
+    PARROT_OP_fetch_p_p_p_pc,                  /* 1013 */
+    PARROT_OP_fetch_p_pc_p_pc,                 /* 1014 */
+    PARROT_OP_fetch_p_p_pc_pc,                 /* 1015 */
+    PARROT_OP_fetch_p_pc_pc_pc,                /* 1016 */
+    PARROT_OP_fetch_p_p_i_p,                   /* 1017 */
+    PARROT_OP_fetch_p_pc_i_p,                  /* 1018 */
+    PARROT_OP_fetch_p_p_ic_p,                  /* 1019 */
+    PARROT_OP_fetch_p_pc_ic_p,                 /* 1020 */
+    PARROT_OP_fetch_p_p_i_pc,                  /* 1021 */
+    PARROT_OP_fetch_p_pc_i_pc,                 /* 1022 */
+    PARROT_OP_fetch_p_p_ic_pc,                 /* 1023 */
+    PARROT_OP_fetch_p_pc_ic_pc,                /* 1024 */
+    PARROT_OP_fetch_p_p_s_p,                   /* 1025 */
+    PARROT_OP_fetch_p_pc_s_p,                  /* 1026 */
+    PARROT_OP_fetch_p_p_sc_p,                  /* 1027 */
+    PARROT_OP_fetch_p_pc_sc_p,                 /* 1028 */
+    PARROT_OP_fetch_p_p_s_pc,                  /* 1029 */
+    PARROT_OP_fetch_p_pc_s_pc,                 /* 1030 */
+    PARROT_OP_fetch_p_p_sc_pc,                 /* 1031 */
+    PARROT_OP_fetch_p_pc_sc_pc,                /* 1032 */
+    PARROT_OP_vivify_p_p_p_p,                  /* 1033 */
+    PARROT_OP_vivify_p_pc_p_p,                 /* 1034 */
+    PARROT_OP_vivify_p_p_pc_p,                 /* 1035 */
+    PARROT_OP_vivify_p_pc_pc_p,                /* 1036 */
+    PARROT_OP_vivify_p_p_p_pc,                 /* 1037 */
+    PARROT_OP_vivify_p_pc_p_pc,                /* 1038 */
+    PARROT_OP_vivify_p_p_pc_pc,                /* 1039 */
+    PARROT_OP_vivify_p_pc_pc_pc,               /* 1040 */
+    PARROT_OP_vivify_p_p_i_p,                  /* 1041 */
+    PARROT_OP_vivify_p_pc_i_p,                 /* 1042 */
+    PARROT_OP_vivify_p_p_ic_p,                 /* 1043 */
+    PARROT_OP_vivify_p_pc_ic_p,                /* 1044 */
+    PARROT_OP_vivify_p_p_i_pc,                 /* 1045 */
+    PARROT_OP_vivify_p_pc_i_pc,                /* 1046 */
+    PARROT_OP_vivify_p_p_ic_pc,                /* 1047 */
+    PARROT_OP_vivify_p_pc_ic_pc,               /* 1048 */
+    PARROT_OP_vivify_p_p_s_p,                  /* 1049 */
+    PARROT_OP_vivify_p_pc_s_p,                 /* 1050 */
+    PARROT_OP_vivify_p_p_sc_p,                 /* 1051 */
+    PARROT_OP_vivify_p_pc_sc_p,                /* 1052 */
+    PARROT_OP_vivify_p_p_s_pc,                 /* 1053 */
+    PARROT_OP_vivify_p_pc_s_pc,                /* 1054 */
+    PARROT_OP_vivify_p_p_sc_pc,                /* 1055 */
+    PARROT_OP_vivify_p_pc_sc_pc,               /* 1056 */
+    PARROT_OP_new_p_s_i,                       /* 1057 */
+    PARROT_OP_new_p_sc_i,                      /* 1058 */
+    PARROT_OP_new_p_s_ic,                      /* 1059 */
+    PARROT_OP_new_p_sc_ic,                     /* 1060 */
+    PARROT_OP_new_p_p_i,                       /* 1061 */
+    PARROT_OP_new_p_pc_i,                      /* 1062 */
+    PARROT_OP_new_p_p_ic,                      /* 1063 */
+    PARROT_OP_new_p_pc_ic,                     /* 1064 */
+    PARROT_OP_root_new_p_p_i,                  /* 1065 */
+    PARROT_OP_root_new_p_pc_i,                 /* 1066 */
+    PARROT_OP_root_new_p_p_ic,                 /* 1067 */
+    PARROT_OP_root_new_p_pc_ic,                /* 1068 */
+    PARROT_OP_find_codepoint_i_s,              /* 1069 */
+    PARROT_OP_find_codepoint_i_sc,             /* 1070 */
+    PARROT_OP_finalize_p,                      /* 1071 */
+    PARROT_OP_finalize_pc                      /* 1072 */
 
 } parrot_opcode_enums;
 

Modified: branches/remove_charset_ops/include/parrot/opsenum.h
==============================================================================
--- branches/remove_charset_ops/include/parrot/opsenum.h	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/include/parrot/opsenum.h	Wed Oct 27 21:51:16 2010	(r49701)
@@ -897,208 +897,198 @@
     enum_ops_split_p_sc_s                  =  878,
     enum_ops_split_p_s_sc                  =  879,
     enum_ops_split_p_sc_sc                 =  880,
-    enum_ops_charset_i_s                   =  881,
-    enum_ops_charset_i_sc                  =  882,
-    enum_ops_charsetname_s_i               =  883,
-    enum_ops_charsetname_s_ic              =  884,
-    enum_ops_find_charset_i_s              =  885,
-    enum_ops_find_charset_i_sc             =  886,
-    enum_ops_trans_charset_s_s_i           =  887,
-    enum_ops_trans_charset_s_sc_i          =  888,
-    enum_ops_trans_charset_s_s_ic          =  889,
-    enum_ops_trans_charset_s_sc_ic         =  890,
-    enum_ops_encoding_i_s                  =  891,
-    enum_ops_encoding_i_sc                 =  892,
-    enum_ops_encodingname_s_i              =  893,
-    enum_ops_encodingname_s_ic             =  894,
-    enum_ops_find_encoding_i_s             =  895,
-    enum_ops_find_encoding_i_sc            =  896,
-    enum_ops_trans_encoding_s_s_i          =  897,
-    enum_ops_trans_encoding_s_sc_i         =  898,
-    enum_ops_trans_encoding_s_s_ic         =  899,
-    enum_ops_trans_encoding_s_sc_ic        =  900,
-    enum_ops_is_cclass_i_i_s_i             =  901,
-    enum_ops_is_cclass_i_ic_s_i            =  902,
-    enum_ops_is_cclass_i_i_sc_i            =  903,
-    enum_ops_is_cclass_i_ic_sc_i           =  904,
-    enum_ops_is_cclass_i_i_s_ic            =  905,
-    enum_ops_is_cclass_i_ic_s_ic           =  906,
-    enum_ops_is_cclass_i_i_sc_ic           =  907,
-    enum_ops_is_cclass_i_ic_sc_ic          =  908,
-    enum_ops_find_cclass_i_i_s_i_i         =  909,
-    enum_ops_find_cclass_i_ic_s_i_i        =  910,
-    enum_ops_find_cclass_i_i_sc_i_i        =  911,
-    enum_ops_find_cclass_i_ic_sc_i_i       =  912,
-    enum_ops_find_cclass_i_i_s_ic_i        =  913,
-    enum_ops_find_cclass_i_ic_s_ic_i       =  914,
-    enum_ops_find_cclass_i_i_sc_ic_i       =  915,
-    enum_ops_find_cclass_i_ic_sc_ic_i      =  916,
-    enum_ops_find_cclass_i_i_s_i_ic        =  917,
-    enum_ops_find_cclass_i_ic_s_i_ic       =  918,
-    enum_ops_find_cclass_i_i_sc_i_ic       =  919,
-    enum_ops_find_cclass_i_ic_sc_i_ic      =  920,
-    enum_ops_find_cclass_i_i_s_ic_ic       =  921,
-    enum_ops_find_cclass_i_ic_s_ic_ic      =  922,
-    enum_ops_find_cclass_i_i_sc_ic_ic      =  923,
-    enum_ops_find_cclass_i_ic_sc_ic_ic     =  924,
-    enum_ops_find_not_cclass_i_i_s_i_i     =  925,
-    enum_ops_find_not_cclass_i_ic_s_i_i    =  926,
-    enum_ops_find_not_cclass_i_i_sc_i_i    =  927,
-    enum_ops_find_not_cclass_i_ic_sc_i_i   =  928,
-    enum_ops_find_not_cclass_i_i_s_ic_i    =  929,
-    enum_ops_find_not_cclass_i_ic_s_ic_i   =  930,
-    enum_ops_find_not_cclass_i_i_sc_ic_i   =  931,
-    enum_ops_find_not_cclass_i_ic_sc_ic_i  =  932,
-    enum_ops_find_not_cclass_i_i_s_i_ic    =  933,
-    enum_ops_find_not_cclass_i_ic_s_i_ic   =  934,
-    enum_ops_find_not_cclass_i_i_sc_i_ic   =  935,
-    enum_ops_find_not_cclass_i_ic_sc_i_ic  =  936,
-    enum_ops_find_not_cclass_i_i_s_ic_ic   =  937,
-    enum_ops_find_not_cclass_i_ic_s_ic_ic  =  938,
-    enum_ops_find_not_cclass_i_i_sc_ic_ic  =  939,
-    enum_ops_find_not_cclass_i_ic_sc_ic_ic =  940,
-    enum_ops_escape_s_s                    =  941,
-    enum_ops_compose_s_s                   =  942,
-    enum_ops_compose_s_sc                  =  943,
-    enum_ops_spawnw_i_s                    =  944,
-    enum_ops_spawnw_i_sc                   =  945,
-    enum_ops_spawnw_i_p                    =  946,
-    enum_ops_err_i                         =  947,
-    enum_ops_err_s                         =  948,
-    enum_ops_err_s_i                       =  949,
-    enum_ops_err_s_ic                      =  950,
-    enum_ops_time_i                        =  951,
-    enum_ops_time_n                        =  952,
-    enum_ops_sleep_i                       =  953,
-    enum_ops_sleep_ic                      =  954,
-    enum_ops_sleep_n                       =  955,
-    enum_ops_sleep_nc                      =  956,
-    enum_ops_store_lex_s_p                 =  957,
-    enum_ops_store_lex_sc_p                =  958,
-    enum_ops_store_dynamic_lex_s_p         =  959,
-    enum_ops_store_dynamic_lex_sc_p        =  960,
-    enum_ops_find_lex_p_s                  =  961,
-    enum_ops_find_lex_p_sc                 =  962,
-    enum_ops_find_dynamic_lex_p_s          =  963,
-    enum_ops_find_dynamic_lex_p_sc         =  964,
-    enum_ops_find_caller_lex_p_s           =  965,
-    enum_ops_find_caller_lex_p_sc          =  966,
-    enum_ops_get_namespace_p               =  967,
-    enum_ops_get_namespace_p_p             =  968,
-    enum_ops_get_namespace_p_pc            =  969,
-    enum_ops_get_hll_namespace_p           =  970,
-    enum_ops_get_hll_namespace_p_p         =  971,
-    enum_ops_get_hll_namespace_p_pc        =  972,
-    enum_ops_get_root_namespace_p          =  973,
-    enum_ops_get_root_namespace_p_p        =  974,
-    enum_ops_get_root_namespace_p_pc       =  975,
-    enum_ops_get_global_p_s                =  976,
-    enum_ops_get_global_p_sc               =  977,
-    enum_ops_get_global_p_p_s              =  978,
-    enum_ops_get_global_p_pc_s             =  979,
-    enum_ops_get_global_p_p_sc             =  980,
-    enum_ops_get_global_p_pc_sc            =  981,
-    enum_ops_get_hll_global_p_s            =  982,
-    enum_ops_get_hll_global_p_sc           =  983,
-    enum_ops_get_hll_global_p_p_s          =  984,
-    enum_ops_get_hll_global_p_pc_s         =  985,
-    enum_ops_get_hll_global_p_p_sc         =  986,
-    enum_ops_get_hll_global_p_pc_sc        =  987,
-    enum_ops_get_root_global_p_s           =  988,
-    enum_ops_get_root_global_p_sc          =  989,
-    enum_ops_get_root_global_p_p_s         =  990,
-    enum_ops_get_root_global_p_pc_s        =  991,
-    enum_ops_get_root_global_p_p_sc        =  992,
-    enum_ops_get_root_global_p_pc_sc       =  993,
-    enum_ops_set_global_s_p                =  994,
-    enum_ops_set_global_sc_p               =  995,
-    enum_ops_set_global_p_s_p              =  996,
-    enum_ops_set_global_pc_s_p             =  997,
-    enum_ops_set_global_p_sc_p             =  998,
-    enum_ops_set_global_pc_sc_p            =  999,
-    enum_ops_set_hll_global_s_p            = 1000,
-    enum_ops_set_hll_global_sc_p           = 1001,
-    enum_ops_set_hll_global_p_s_p          = 1002,
-    enum_ops_set_hll_global_pc_s_p         = 1003,
-    enum_ops_set_hll_global_p_sc_p         = 1004,
-    enum_ops_set_hll_global_pc_sc_p        = 1005,
-    enum_ops_set_root_global_s_p           = 1006,
-    enum_ops_set_root_global_sc_p          = 1007,
-    enum_ops_set_root_global_p_s_p         = 1008,
-    enum_ops_set_root_global_pc_s_p        = 1009,
-    enum_ops_set_root_global_p_sc_p        = 1010,
-    enum_ops_set_root_global_pc_sc_p       = 1011,
-    enum_ops_find_name_p_s                 = 1012,
-    enum_ops_find_name_p_sc                = 1013,
-    enum_ops_find_sub_not_null_p_s         = 1014,
-    enum_ops_find_sub_not_null_p_sc        = 1015,
-    enum_ops_trap                          = 1016,
-    enum_ops_set_label_p_ic                = 1017,
-    enum_ops_get_label_i_p                 = 1018,
-    enum_ops_fetch_p_p_p_p                 = 1019,
-    enum_ops_fetch_p_pc_p_p                = 1020,
-    enum_ops_fetch_p_p_pc_p                = 1021,
-    enum_ops_fetch_p_pc_pc_p               = 1022,
-    enum_ops_fetch_p_p_p_pc                = 1023,
-    enum_ops_fetch_p_pc_p_pc               = 1024,
-    enum_ops_fetch_p_p_pc_pc               = 1025,
-    enum_ops_fetch_p_pc_pc_pc              = 1026,
-    enum_ops_fetch_p_p_i_p                 = 1027,
-    enum_ops_fetch_p_pc_i_p                = 1028,
-    enum_ops_fetch_p_p_ic_p                = 1029,
-    enum_ops_fetch_p_pc_ic_p               = 1030,
-    enum_ops_fetch_p_p_i_pc                = 1031,
-    enum_ops_fetch_p_pc_i_pc               = 1032,
-    enum_ops_fetch_p_p_ic_pc               = 1033,
-    enum_ops_fetch_p_pc_ic_pc              = 1034,
-    enum_ops_fetch_p_p_s_p                 = 1035,
-    enum_ops_fetch_p_pc_s_p                = 1036,
-    enum_ops_fetch_p_p_sc_p                = 1037,
-    enum_ops_fetch_p_pc_sc_p               = 1038,
-    enum_ops_fetch_p_p_s_pc                = 1039,
-    enum_ops_fetch_p_pc_s_pc               = 1040,
-    enum_ops_fetch_p_p_sc_pc               = 1041,
-    enum_ops_fetch_p_pc_sc_pc              = 1042,
-    enum_ops_vivify_p_p_p_p                = 1043,
-    enum_ops_vivify_p_pc_p_p               = 1044,
-    enum_ops_vivify_p_p_pc_p               = 1045,
-    enum_ops_vivify_p_pc_pc_p              = 1046,
-    enum_ops_vivify_p_p_p_pc               = 1047,
-    enum_ops_vivify_p_pc_p_pc              = 1048,
-    enum_ops_vivify_p_p_pc_pc              = 1049,
-    enum_ops_vivify_p_pc_pc_pc             = 1050,
-    enum_ops_vivify_p_p_i_p                = 1051,
-    enum_ops_vivify_p_pc_i_p               = 1052,
-    enum_ops_vivify_p_p_ic_p               = 1053,
-    enum_ops_vivify_p_pc_ic_p              = 1054,
-    enum_ops_vivify_p_p_i_pc               = 1055,
-    enum_ops_vivify_p_pc_i_pc              = 1056,
-    enum_ops_vivify_p_p_ic_pc              = 1057,
-    enum_ops_vivify_p_pc_ic_pc             = 1058,
-    enum_ops_vivify_p_p_s_p                = 1059,
-    enum_ops_vivify_p_pc_s_p               = 1060,
-    enum_ops_vivify_p_p_sc_p               = 1061,
-    enum_ops_vivify_p_pc_sc_p              = 1062,
-    enum_ops_vivify_p_p_s_pc               = 1063,
-    enum_ops_vivify_p_pc_s_pc              = 1064,
-    enum_ops_vivify_p_p_sc_pc              = 1065,
-    enum_ops_vivify_p_pc_sc_pc             = 1066,
-    enum_ops_new_p_s_i                     = 1067,
-    enum_ops_new_p_sc_i                    = 1068,
-    enum_ops_new_p_s_ic                    = 1069,
-    enum_ops_new_p_sc_ic                   = 1070,
-    enum_ops_new_p_p_i                     = 1071,
-    enum_ops_new_p_pc_i                    = 1072,
-    enum_ops_new_p_p_ic                    = 1073,
-    enum_ops_new_p_pc_ic                   = 1074,
-    enum_ops_root_new_p_p_i                = 1075,
-    enum_ops_root_new_p_pc_i               = 1076,
-    enum_ops_root_new_p_p_ic               = 1077,
-    enum_ops_root_new_p_pc_ic              = 1078,
-    enum_ops_find_codepoint_i_s            = 1079,
-    enum_ops_find_codepoint_i_sc           = 1080,
-    enum_ops_finalize_p                    = 1081,
-    enum_ops_finalize_pc                   = 1082,
+    enum_ops_encoding_i_s                  =  881,
+    enum_ops_encoding_i_sc                 =  882,
+    enum_ops_encodingname_s_i              =  883,
+    enum_ops_encodingname_s_ic             =  884,
+    enum_ops_find_encoding_i_s             =  885,
+    enum_ops_find_encoding_i_sc            =  886,
+    enum_ops_trans_encoding_s_s_i          =  887,
+    enum_ops_trans_encoding_s_sc_i         =  888,
+    enum_ops_trans_encoding_s_s_ic         =  889,
+    enum_ops_trans_encoding_s_sc_ic        =  890,
+    enum_ops_is_cclass_i_i_s_i             =  891,
+    enum_ops_is_cclass_i_ic_s_i            =  892,
+    enum_ops_is_cclass_i_i_sc_i            =  893,
+    enum_ops_is_cclass_i_ic_sc_i           =  894,
+    enum_ops_is_cclass_i_i_s_ic            =  895,
+    enum_ops_is_cclass_i_ic_s_ic           =  896,
+    enum_ops_is_cclass_i_i_sc_ic           =  897,
+    enum_ops_is_cclass_i_ic_sc_ic          =  898,
+    enum_ops_find_cclass_i_i_s_i_i         =  899,
+    enum_ops_find_cclass_i_ic_s_i_i        =  900,
+    enum_ops_find_cclass_i_i_sc_i_i        =  901,
+    enum_ops_find_cclass_i_ic_sc_i_i       =  902,
+    enum_ops_find_cclass_i_i_s_ic_i        =  903,
+    enum_ops_find_cclass_i_ic_s_ic_i       =  904,
+    enum_ops_find_cclass_i_i_sc_ic_i       =  905,
+    enum_ops_find_cclass_i_ic_sc_ic_i      =  906,
+    enum_ops_find_cclass_i_i_s_i_ic        =  907,
+    enum_ops_find_cclass_i_ic_s_i_ic       =  908,
+    enum_ops_find_cclass_i_i_sc_i_ic       =  909,
+    enum_ops_find_cclass_i_ic_sc_i_ic      =  910,
+    enum_ops_find_cclass_i_i_s_ic_ic       =  911,
+    enum_ops_find_cclass_i_ic_s_ic_ic      =  912,
+    enum_ops_find_cclass_i_i_sc_ic_ic      =  913,
+    enum_ops_find_cclass_i_ic_sc_ic_ic     =  914,
+    enum_ops_find_not_cclass_i_i_s_i_i     =  915,
+    enum_ops_find_not_cclass_i_ic_s_i_i    =  916,
+    enum_ops_find_not_cclass_i_i_sc_i_i    =  917,
+    enum_ops_find_not_cclass_i_ic_sc_i_i   =  918,
+    enum_ops_find_not_cclass_i_i_s_ic_i    =  919,
+    enum_ops_find_not_cclass_i_ic_s_ic_i   =  920,
+    enum_ops_find_not_cclass_i_i_sc_ic_i   =  921,
+    enum_ops_find_not_cclass_i_ic_sc_ic_i  =  922,
+    enum_ops_find_not_cclass_i_i_s_i_ic    =  923,
+    enum_ops_find_not_cclass_i_ic_s_i_ic   =  924,
+    enum_ops_find_not_cclass_i_i_sc_i_ic   =  925,
+    enum_ops_find_not_cclass_i_ic_sc_i_ic  =  926,
+    enum_ops_find_not_cclass_i_i_s_ic_ic   =  927,
+    enum_ops_find_not_cclass_i_ic_s_ic_ic  =  928,
+    enum_ops_find_not_cclass_i_i_sc_ic_ic  =  929,
+    enum_ops_find_not_cclass_i_ic_sc_ic_ic =  930,
+    enum_ops_escape_s_s                    =  931,
+    enum_ops_compose_s_s                   =  932,
+    enum_ops_compose_s_sc                  =  933,
+    enum_ops_spawnw_i_s                    =  934,
+    enum_ops_spawnw_i_sc                   =  935,
+    enum_ops_spawnw_i_p                    =  936,
+    enum_ops_err_i                         =  937,
+    enum_ops_err_s                         =  938,
+    enum_ops_err_s_i                       =  939,
+    enum_ops_err_s_ic                      =  940,
+    enum_ops_time_i                        =  941,
+    enum_ops_time_n                        =  942,
+    enum_ops_sleep_i                       =  943,
+    enum_ops_sleep_ic                      =  944,
+    enum_ops_sleep_n                       =  945,
+    enum_ops_sleep_nc                      =  946,
+    enum_ops_store_lex_s_p                 =  947,
+    enum_ops_store_lex_sc_p                =  948,
+    enum_ops_store_dynamic_lex_s_p         =  949,
+    enum_ops_store_dynamic_lex_sc_p        =  950,
+    enum_ops_find_lex_p_s                  =  951,
+    enum_ops_find_lex_p_sc                 =  952,
+    enum_ops_find_dynamic_lex_p_s          =  953,
+    enum_ops_find_dynamic_lex_p_sc         =  954,
+    enum_ops_find_caller_lex_p_s           =  955,
+    enum_ops_find_caller_lex_p_sc          =  956,
+    enum_ops_get_namespace_p               =  957,
+    enum_ops_get_namespace_p_p             =  958,
+    enum_ops_get_namespace_p_pc            =  959,
+    enum_ops_get_hll_namespace_p           =  960,
+    enum_ops_get_hll_namespace_p_p         =  961,
+    enum_ops_get_hll_namespace_p_pc        =  962,
+    enum_ops_get_root_namespace_p          =  963,
+    enum_ops_get_root_namespace_p_p        =  964,
+    enum_ops_get_root_namespace_p_pc       =  965,
+    enum_ops_get_global_p_s                =  966,
+    enum_ops_get_global_p_sc               =  967,
+    enum_ops_get_global_p_p_s              =  968,
+    enum_ops_get_global_p_pc_s             =  969,
+    enum_ops_get_global_p_p_sc             =  970,
+    enum_ops_get_global_p_pc_sc            =  971,
+    enum_ops_get_hll_global_p_s            =  972,
+    enum_ops_get_hll_global_p_sc           =  973,
+    enum_ops_get_hll_global_p_p_s          =  974,
+    enum_ops_get_hll_global_p_pc_s         =  975,
+    enum_ops_get_hll_global_p_p_sc         =  976,
+    enum_ops_get_hll_global_p_pc_sc        =  977,
+    enum_ops_get_root_global_p_s           =  978,
+    enum_ops_get_root_global_p_sc          =  979,
+    enum_ops_get_root_global_p_p_s         =  980,
+    enum_ops_get_root_global_p_pc_s        =  981,
+    enum_ops_get_root_global_p_p_sc        =  982,
+    enum_ops_get_root_global_p_pc_sc       =  983,
+    enum_ops_set_global_s_p                =  984,
+    enum_ops_set_global_sc_p               =  985,
+    enum_ops_set_global_p_s_p              =  986,
+    enum_ops_set_global_pc_s_p             =  987,
+    enum_ops_set_global_p_sc_p             =  988,
+    enum_ops_set_global_pc_sc_p            =  989,
+    enum_ops_set_hll_global_s_p            =  990,
+    enum_ops_set_hll_global_sc_p           =  991,
+    enum_ops_set_hll_global_p_s_p          =  992,
+    enum_ops_set_hll_global_pc_s_p         =  993,
+    enum_ops_set_hll_global_p_sc_p         =  994,
+    enum_ops_set_hll_global_pc_sc_p        =  995,
+    enum_ops_set_root_global_s_p           =  996,
+    enum_ops_set_root_global_sc_p          =  997,
+    enum_ops_set_root_global_p_s_p         =  998,
+    enum_ops_set_root_global_pc_s_p        =  999,
+    enum_ops_set_root_global_p_sc_p        = 1000,
+    enum_ops_set_root_global_pc_sc_p       = 1001,
+    enum_ops_find_name_p_s                 = 1002,
+    enum_ops_find_name_p_sc                = 1003,
+    enum_ops_find_sub_not_null_p_s         = 1004,
+    enum_ops_find_sub_not_null_p_sc        = 1005,
+    enum_ops_trap                          = 1006,
+    enum_ops_set_label_p_ic                = 1007,
+    enum_ops_get_label_i_p                 = 1008,
+    enum_ops_fetch_p_p_p_p                 = 1009,
+    enum_ops_fetch_p_pc_p_p                = 1010,
+    enum_ops_fetch_p_p_pc_p                = 1011,
+    enum_ops_fetch_p_pc_pc_p               = 1012,
+    enum_ops_fetch_p_p_p_pc                = 1013,
+    enum_ops_fetch_p_pc_p_pc               = 1014,
+    enum_ops_fetch_p_p_pc_pc               = 1015,
+    enum_ops_fetch_p_pc_pc_pc              = 1016,
+    enum_ops_fetch_p_p_i_p                 = 1017,
+    enum_ops_fetch_p_pc_i_p                = 1018,
+    enum_ops_fetch_p_p_ic_p                = 1019,
+    enum_ops_fetch_p_pc_ic_p               = 1020,
+    enum_ops_fetch_p_p_i_pc                = 1021,
+    enum_ops_fetch_p_pc_i_pc               = 1022,
+    enum_ops_fetch_p_p_ic_pc               = 1023,
+    enum_ops_fetch_p_pc_ic_pc              = 1024,
+    enum_ops_fetch_p_p_s_p                 = 1025,
+    enum_ops_fetch_p_pc_s_p                = 1026,
+    enum_ops_fetch_p_p_sc_p                = 1027,
+    enum_ops_fetch_p_pc_sc_p               = 1028,
+    enum_ops_fetch_p_p_s_pc                = 1029,
+    enum_ops_fetch_p_pc_s_pc               = 1030,
+    enum_ops_fetch_p_p_sc_pc               = 1031,
+    enum_ops_fetch_p_pc_sc_pc              = 1032,
+    enum_ops_vivify_p_p_p_p                = 1033,
+    enum_ops_vivify_p_pc_p_p               = 1034,
+    enum_ops_vivify_p_p_pc_p               = 1035,
+    enum_ops_vivify_p_pc_pc_p              = 1036,
+    enum_ops_vivify_p_p_p_pc               = 1037,
+    enum_ops_vivify_p_pc_p_pc              = 1038,
+    enum_ops_vivify_p_p_pc_pc              = 1039,
+    enum_ops_vivify_p_pc_pc_pc             = 1040,
+    enum_ops_vivify_p_p_i_p                = 1041,
+    enum_ops_vivify_p_pc_i_p               = 1042,
+    enum_ops_vivify_p_p_ic_p               = 1043,
+    enum_ops_vivify_p_pc_ic_p              = 1044,
+    enum_ops_vivify_p_p_i_pc               = 1045,
+    enum_ops_vivify_p_pc_i_pc              = 1046,
+    enum_ops_vivify_p_p_ic_pc              = 1047,
+    enum_ops_vivify_p_pc_ic_pc             = 1048,
+    enum_ops_vivify_p_p_s_p                = 1049,
+    enum_ops_vivify_p_pc_s_p               = 1050,
+    enum_ops_vivify_p_p_sc_p               = 1051,
+    enum_ops_vivify_p_pc_sc_p              = 1052,
+    enum_ops_vivify_p_p_s_pc               = 1053,
+    enum_ops_vivify_p_pc_s_pc              = 1054,
+    enum_ops_vivify_p_p_sc_pc              = 1055,
+    enum_ops_vivify_p_pc_sc_pc             = 1056,
+    enum_ops_new_p_s_i                     = 1057,
+    enum_ops_new_p_sc_i                    = 1058,
+    enum_ops_new_p_s_ic                    = 1059,
+    enum_ops_new_p_sc_ic                   = 1060,
+    enum_ops_new_p_p_i                     = 1061,
+    enum_ops_new_p_pc_i                    = 1062,
+    enum_ops_new_p_p_ic                    = 1063,
+    enum_ops_new_p_pc_ic                   = 1064,
+    enum_ops_root_new_p_p_i                = 1065,
+    enum_ops_root_new_p_pc_i               = 1066,
+    enum_ops_root_new_p_p_ic               = 1067,
+    enum_ops_root_new_p_pc_ic              = 1068,
+    enum_ops_find_codepoint_i_s            = 1069,
+    enum_ops_find_codepoint_i_sc           = 1070,
+    enum_ops_finalize_p                    = 1071,
+    enum_ops_finalize_pc                   = 1072,
 };
 
 

Modified: branches/remove_charset_ops/include/parrot/string_funcs.h
==============================================================================
--- branches/remove_charset_ops/include/parrot/string_funcs.h	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/include/parrot/string_funcs.h	Wed Oct 27 21:51:16 2010	(r49701)
@@ -65,15 +65,6 @@
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
-STRING* Parrot_str_change_charset(PARROT_INTERP,
-    ARGMOD_NULLOK(STRING *src),
-    INTVAL charset_nr)
-        __attribute__nonnull__(1)
-        FUNC_MODIFIES(*src);
-
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
 STRING* Parrot_str_change_encoding(PARROT_INTERP,
     ARGMOD_NULLOK(STRING *src),
     INTVAL encoding_nr)
@@ -510,8 +501,6 @@
 #define ASSERT_ARGS_Parrot_str_boolean __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_str_byte_length __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
-#define ASSERT_ARGS_Parrot_str_change_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_str_change_encoding __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_str_chopn __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

Modified: branches/remove_charset_ops/src/ops/core_ops.c
==============================================================================
--- branches/remove_charset_ops/src/ops/core_ops.c	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/src/ops/core_ops.c	Wed Oct 27 21:51:16 2010	(r49701)
@@ -68,13 +68,13 @@
 
 
 
-INTVAL core_numops = 1084;
+INTVAL core_numops = 1074;
 
 /*
 ** Op Function Table:
 */
 
-static op_func_t core_op_func_table[1084] = {
+static op_func_t core_op_func_table[1074] = {
   Parrot_end,                                        /*      0 */
   Parrot_noop,                                       /*      1 */
   Parrot_check_events,                               /*      2 */
@@ -956,208 +956,198 @@
   Parrot_split_p_sc_s,                               /*    878 */
   Parrot_split_p_s_sc,                               /*    879 */
   Parrot_split_p_sc_sc,                              /*    880 */
-  Parrot_charset_i_s,                                /*    881 */
-  Parrot_charset_i_sc,                               /*    882 */
-  Parrot_charsetname_s_i,                            /*    883 */
-  Parrot_charsetname_s_ic,                           /*    884 */
-  Parrot_find_charset_i_s,                           /*    885 */
-  Parrot_find_charset_i_sc,                          /*    886 */
-  Parrot_trans_charset_s_s_i,                        /*    887 */
-  Parrot_trans_charset_s_sc_i,                       /*    888 */
-  Parrot_trans_charset_s_s_ic,                       /*    889 */
-  Parrot_trans_charset_s_sc_ic,                      /*    890 */
-  Parrot_encoding_i_s,                               /*    891 */
-  Parrot_encoding_i_sc,                              /*    892 */
-  Parrot_encodingname_s_i,                           /*    893 */
-  Parrot_encodingname_s_ic,                          /*    894 */
-  Parrot_find_encoding_i_s,                          /*    895 */
-  Parrot_find_encoding_i_sc,                         /*    896 */
-  Parrot_trans_encoding_s_s_i,                       /*    897 */
-  Parrot_trans_encoding_s_sc_i,                      /*    898 */
-  Parrot_trans_encoding_s_s_ic,                      /*    899 */
-  Parrot_trans_encoding_s_sc_ic,                     /*    900 */
-  Parrot_is_cclass_i_i_s_i,                          /*    901 */
-  Parrot_is_cclass_i_ic_s_i,                         /*    902 */
-  Parrot_is_cclass_i_i_sc_i,                         /*    903 */
-  Parrot_is_cclass_i_ic_sc_i,                        /*    904 */
-  Parrot_is_cclass_i_i_s_ic,                         /*    905 */
-  Parrot_is_cclass_i_ic_s_ic,                        /*    906 */
-  Parrot_is_cclass_i_i_sc_ic,                        /*    907 */
-  Parrot_is_cclass_i_ic_sc_ic,                       /*    908 */
-  Parrot_find_cclass_i_i_s_i_i,                      /*    909 */
-  Parrot_find_cclass_i_ic_s_i_i,                     /*    910 */
-  Parrot_find_cclass_i_i_sc_i_i,                     /*    911 */
-  Parrot_find_cclass_i_ic_sc_i_i,                    /*    912 */
-  Parrot_find_cclass_i_i_s_ic_i,                     /*    913 */
-  Parrot_find_cclass_i_ic_s_ic_i,                    /*    914 */
-  Parrot_find_cclass_i_i_sc_ic_i,                    /*    915 */
-  Parrot_find_cclass_i_ic_sc_ic_i,                   /*    916 */
-  Parrot_find_cclass_i_i_s_i_ic,                     /*    917 */
-  Parrot_find_cclass_i_ic_s_i_ic,                    /*    918 */
-  Parrot_find_cclass_i_i_sc_i_ic,                    /*    919 */
-  Parrot_find_cclass_i_ic_sc_i_ic,                   /*    920 */
-  Parrot_find_cclass_i_i_s_ic_ic,                    /*    921 */
-  Parrot_find_cclass_i_ic_s_ic_ic,                   /*    922 */
-  Parrot_find_cclass_i_i_sc_ic_ic,                   /*    923 */
-  Parrot_find_cclass_i_ic_sc_ic_ic,                  /*    924 */
-  Parrot_find_not_cclass_i_i_s_i_i,                  /*    925 */
-  Parrot_find_not_cclass_i_ic_s_i_i,                 /*    926 */
-  Parrot_find_not_cclass_i_i_sc_i_i,                 /*    927 */
-  Parrot_find_not_cclass_i_ic_sc_i_i,                /*    928 */
-  Parrot_find_not_cclass_i_i_s_ic_i,                 /*    929 */
-  Parrot_find_not_cclass_i_ic_s_ic_i,                /*    930 */
-  Parrot_find_not_cclass_i_i_sc_ic_i,                /*    931 */
-  Parrot_find_not_cclass_i_ic_sc_ic_i,               /*    932 */
-  Parrot_find_not_cclass_i_i_s_i_ic,                 /*    933 */
-  Parrot_find_not_cclass_i_ic_s_i_ic,                /*    934 */
-  Parrot_find_not_cclass_i_i_sc_i_ic,                /*    935 */
-  Parrot_find_not_cclass_i_ic_sc_i_ic,               /*    936 */
-  Parrot_find_not_cclass_i_i_s_ic_ic,                /*    937 */
-  Parrot_find_not_cclass_i_ic_s_ic_ic,               /*    938 */
-  Parrot_find_not_cclass_i_i_sc_ic_ic,               /*    939 */
-  Parrot_find_not_cclass_i_ic_sc_ic_ic,              /*    940 */
-  Parrot_escape_s_s,                                 /*    941 */
-  Parrot_compose_s_s,                                /*    942 */
-  Parrot_compose_s_sc,                               /*    943 */
-  Parrot_spawnw_i_s,                                 /*    944 */
-  Parrot_spawnw_i_sc,                                /*    945 */
-  Parrot_spawnw_i_p,                                 /*    946 */
-  Parrot_err_i,                                      /*    947 */
-  Parrot_err_s,                                      /*    948 */
-  Parrot_err_s_i,                                    /*    949 */
-  Parrot_err_s_ic,                                   /*    950 */
-  Parrot_time_i,                                     /*    951 */
-  Parrot_time_n,                                     /*    952 */
-  Parrot_sleep_i,                                    /*    953 */
-  Parrot_sleep_ic,                                   /*    954 */
-  Parrot_sleep_n,                                    /*    955 */
-  Parrot_sleep_nc,                                   /*    956 */
-  Parrot_store_lex_s_p,                              /*    957 */
-  Parrot_store_lex_sc_p,                             /*    958 */
-  Parrot_store_dynamic_lex_s_p,                      /*    959 */
-  Parrot_store_dynamic_lex_sc_p,                     /*    960 */
-  Parrot_find_lex_p_s,                               /*    961 */
-  Parrot_find_lex_p_sc,                              /*    962 */
-  Parrot_find_dynamic_lex_p_s,                       /*    963 */
-  Parrot_find_dynamic_lex_p_sc,                      /*    964 */
-  Parrot_find_caller_lex_p_s,                        /*    965 */
-  Parrot_find_caller_lex_p_sc,                       /*    966 */
-  Parrot_get_namespace_p,                            /*    967 */
-  Parrot_get_namespace_p_p,                          /*    968 */
-  Parrot_get_namespace_p_pc,                         /*    969 */
-  Parrot_get_hll_namespace_p,                        /*    970 */
-  Parrot_get_hll_namespace_p_p,                      /*    971 */
-  Parrot_get_hll_namespace_p_pc,                     /*    972 */
-  Parrot_get_root_namespace_p,                       /*    973 */
-  Parrot_get_root_namespace_p_p,                     /*    974 */
-  Parrot_get_root_namespace_p_pc,                    /*    975 */
-  Parrot_get_global_p_s,                             /*    976 */
-  Parrot_get_global_p_sc,                            /*    977 */
-  Parrot_get_global_p_p_s,                           /*    978 */
-  Parrot_get_global_p_pc_s,                          /*    979 */
-  Parrot_get_global_p_p_sc,                          /*    980 */
-  Parrot_get_global_p_pc_sc,                         /*    981 */
-  Parrot_get_hll_global_p_s,                         /*    982 */
-  Parrot_get_hll_global_p_sc,                        /*    983 */
-  Parrot_get_hll_global_p_p_s,                       /*    984 */
-  Parrot_get_hll_global_p_pc_s,                      /*    985 */
-  Parrot_get_hll_global_p_p_sc,                      /*    986 */
-  Parrot_get_hll_global_p_pc_sc,                     /*    987 */
-  Parrot_get_root_global_p_s,                        /*    988 */
-  Parrot_get_root_global_p_sc,                       /*    989 */
-  Parrot_get_root_global_p_p_s,                      /*    990 */
-  Parrot_get_root_global_p_pc_s,                     /*    991 */
-  Parrot_get_root_global_p_p_sc,                     /*    992 */
-  Parrot_get_root_global_p_pc_sc,                    /*    993 */
-  Parrot_set_global_s_p,                             /*    994 */
-  Parrot_set_global_sc_p,                            /*    995 */
-  Parrot_set_global_p_s_p,                           /*    996 */
-  Parrot_set_global_pc_s_p,                          /*    997 */
-  Parrot_set_global_p_sc_p,                          /*    998 */
-  Parrot_set_global_pc_sc_p,                         /*    999 */
-  Parrot_set_hll_global_s_p,                         /*   1000 */
-  Parrot_set_hll_global_sc_p,                        /*   1001 */
-  Parrot_set_hll_global_p_s_p,                       /*   1002 */
-  Parrot_set_hll_global_pc_s_p,                      /*   1003 */
-  Parrot_set_hll_global_p_sc_p,                      /*   1004 */
-  Parrot_set_hll_global_pc_sc_p,                     /*   1005 */
-  Parrot_set_root_global_s_p,                        /*   1006 */
-  Parrot_set_root_global_sc_p,                       /*   1007 */
-  Parrot_set_root_global_p_s_p,                      /*   1008 */
-  Parrot_set_root_global_pc_s_p,                     /*   1009 */
-  Parrot_set_root_global_p_sc_p,                     /*   1010 */
-  Parrot_set_root_global_pc_sc_p,                    /*   1011 */
-  Parrot_find_name_p_s,                              /*   1012 */
-  Parrot_find_name_p_sc,                             /*   1013 */
-  Parrot_find_sub_not_null_p_s,                      /*   1014 */
-  Parrot_find_sub_not_null_p_sc,                     /*   1015 */
-  Parrot_trap,                                       /*   1016 */
-  Parrot_set_label_p_ic,                             /*   1017 */
-  Parrot_get_label_i_p,                              /*   1018 */
-  Parrot_fetch_p_p_p_p,                              /*   1019 */
-  Parrot_fetch_p_pc_p_p,                             /*   1020 */
-  Parrot_fetch_p_p_pc_p,                             /*   1021 */
-  Parrot_fetch_p_pc_pc_p,                            /*   1022 */
-  Parrot_fetch_p_p_p_pc,                             /*   1023 */
-  Parrot_fetch_p_pc_p_pc,                            /*   1024 */
-  Parrot_fetch_p_p_pc_pc,                            /*   1025 */
-  Parrot_fetch_p_pc_pc_pc,                           /*   1026 */
-  Parrot_fetch_p_p_i_p,                              /*   1027 */
-  Parrot_fetch_p_pc_i_p,                             /*   1028 */
-  Parrot_fetch_p_p_ic_p,                             /*   1029 */
-  Parrot_fetch_p_pc_ic_p,                            /*   1030 */
-  Parrot_fetch_p_p_i_pc,                             /*   1031 */
-  Parrot_fetch_p_pc_i_pc,                            /*   1032 */
-  Parrot_fetch_p_p_ic_pc,                            /*   1033 */
-  Parrot_fetch_p_pc_ic_pc,                           /*   1034 */
-  Parrot_fetch_p_p_s_p,                              /*   1035 */
-  Parrot_fetch_p_pc_s_p,                             /*   1036 */
-  Parrot_fetch_p_p_sc_p,                             /*   1037 */
-  Parrot_fetch_p_pc_sc_p,                            /*   1038 */
-  Parrot_fetch_p_p_s_pc,                             /*   1039 */
-  Parrot_fetch_p_pc_s_pc,                            /*   1040 */
-  Parrot_fetch_p_p_sc_pc,                            /*   1041 */
-  Parrot_fetch_p_pc_sc_pc,                           /*   1042 */
-  Parrot_vivify_p_p_p_p,                             /*   1043 */
-  Parrot_vivify_p_pc_p_p,                            /*   1044 */
-  Parrot_vivify_p_p_pc_p,                            /*   1045 */
-  Parrot_vivify_p_pc_pc_p,                           /*   1046 */
-  Parrot_vivify_p_p_p_pc,                            /*   1047 */
-  Parrot_vivify_p_pc_p_pc,                           /*   1048 */
-  Parrot_vivify_p_p_pc_pc,                           /*   1049 */
-  Parrot_vivify_p_pc_pc_pc,                          /*   1050 */
-  Parrot_vivify_p_p_i_p,                             /*   1051 */
-  Parrot_vivify_p_pc_i_p,                            /*   1052 */
-  Parrot_vivify_p_p_ic_p,                            /*   1053 */
-  Parrot_vivify_p_pc_ic_p,                           /*   1054 */
-  Parrot_vivify_p_p_i_pc,                            /*   1055 */
-  Parrot_vivify_p_pc_i_pc,                           /*   1056 */
-  Parrot_vivify_p_p_ic_pc,                           /*   1057 */
-  Parrot_vivify_p_pc_ic_pc,                          /*   1058 */
-  Parrot_vivify_p_p_s_p,                             /*   1059 */
-  Parrot_vivify_p_pc_s_p,                            /*   1060 */
-  Parrot_vivify_p_p_sc_p,                            /*   1061 */
-  Parrot_vivify_p_pc_sc_p,                           /*   1062 */
-  Parrot_vivify_p_p_s_pc,                            /*   1063 */
-  Parrot_vivify_p_pc_s_pc,                           /*   1064 */
-  Parrot_vivify_p_p_sc_pc,                           /*   1065 */
-  Parrot_vivify_p_pc_sc_pc,                          /*   1066 */
-  Parrot_new_p_s_i,                                  /*   1067 */
-  Parrot_new_p_sc_i,                                 /*   1068 */
-  Parrot_new_p_s_ic,                                 /*   1069 */
-  Parrot_new_p_sc_ic,                                /*   1070 */
-  Parrot_new_p_p_i,                                  /*   1071 */
-  Parrot_new_p_pc_i,                                 /*   1072 */
-  Parrot_new_p_p_ic,                                 /*   1073 */
-  Parrot_new_p_pc_ic,                                /*   1074 */
-  Parrot_root_new_p_p_i,                             /*   1075 */
-  Parrot_root_new_p_pc_i,                            /*   1076 */
-  Parrot_root_new_p_p_ic,                            /*   1077 */
-  Parrot_root_new_p_pc_ic,                           /*   1078 */
-  Parrot_find_codepoint_i_s,                         /*   1079 */
-  Parrot_find_codepoint_i_sc,                        /*   1080 */
-  Parrot_finalize_p,                                 /*   1081 */
-  Parrot_finalize_pc,                                /*   1082 */
+  Parrot_encoding_i_s,                               /*    881 */
+  Parrot_encoding_i_sc,                              /*    882 */
+  Parrot_encodingname_s_i,                           /*    883 */
+  Parrot_encodingname_s_ic,                          /*    884 */
+  Parrot_find_encoding_i_s,                          /*    885 */
+  Parrot_find_encoding_i_sc,                         /*    886 */
+  Parrot_trans_encoding_s_s_i,                       /*    887 */
+  Parrot_trans_encoding_s_sc_i,                      /*    888 */
+  Parrot_trans_encoding_s_s_ic,                      /*    889 */
+  Parrot_trans_encoding_s_sc_ic,                     /*    890 */
+  Parrot_is_cclass_i_i_s_i,                          /*    891 */
+  Parrot_is_cclass_i_ic_s_i,                         /*    892 */
+  Parrot_is_cclass_i_i_sc_i,                         /*    893 */
+  Parrot_is_cclass_i_ic_sc_i,                        /*    894 */
+  Parrot_is_cclass_i_i_s_ic,                         /*    895 */
+  Parrot_is_cclass_i_ic_s_ic,                        /*    896 */
+  Parrot_is_cclass_i_i_sc_ic,                        /*    897 */
+  Parrot_is_cclass_i_ic_sc_ic,                       /*    898 */
+  Parrot_find_cclass_i_i_s_i_i,                      /*    899 */
+  Parrot_find_cclass_i_ic_s_i_i,                     /*    900 */
+  Parrot_find_cclass_i_i_sc_i_i,                     /*    901 */
+  Parrot_find_cclass_i_ic_sc_i_i,                    /*    902 */
+  Parrot_find_cclass_i_i_s_ic_i,                     /*    903 */
+  Parrot_find_cclass_i_ic_s_ic_i,                    /*    904 */
+  Parrot_find_cclass_i_i_sc_ic_i,                    /*    905 */
+  Parrot_find_cclass_i_ic_sc_ic_i,                   /*    906 */
+  Parrot_find_cclass_i_i_s_i_ic,                     /*    907 */
+  Parrot_find_cclass_i_ic_s_i_ic,                    /*    908 */
+  Parrot_find_cclass_i_i_sc_i_ic,                    /*    909 */
+  Parrot_find_cclass_i_ic_sc_i_ic,                   /*    910 */
+  Parrot_find_cclass_i_i_s_ic_ic,                    /*    911 */
+  Parrot_find_cclass_i_ic_s_ic_ic,                   /*    912 */
+  Parrot_find_cclass_i_i_sc_ic_ic,                   /*    913 */
+  Parrot_find_cclass_i_ic_sc_ic_ic,                  /*    914 */
+  Parrot_find_not_cclass_i_i_s_i_i,                  /*    915 */
+  Parrot_find_not_cclass_i_ic_s_i_i,                 /*    916 */
+  Parrot_find_not_cclass_i_i_sc_i_i,                 /*    917 */
+  Parrot_find_not_cclass_i_ic_sc_i_i,                /*    918 */
+  Parrot_find_not_cclass_i_i_s_ic_i,                 /*    919 */
+  Parrot_find_not_cclass_i_ic_s_ic_i,                /*    920 */
+  Parrot_find_not_cclass_i_i_sc_ic_i,                /*    921 */
+  Parrot_find_not_cclass_i_ic_sc_ic_i,               /*    922 */
+  Parrot_find_not_cclass_i_i_s_i_ic,                 /*    923 */
+  Parrot_find_not_cclass_i_ic_s_i_ic,                /*    924 */
+  Parrot_find_not_cclass_i_i_sc_i_ic,                /*    925 */
+  Parrot_find_not_cclass_i_ic_sc_i_ic,               /*    926 */
+  Parrot_find_not_cclass_i_i_s_ic_ic,                /*    927 */
+  Parrot_find_not_cclass_i_ic_s_ic_ic,               /*    928 */
+  Parrot_find_not_cclass_i_i_sc_ic_ic,               /*    929 */
+  Parrot_find_not_cclass_i_ic_sc_ic_ic,              /*    930 */
+  Parrot_escape_s_s,                                 /*    931 */
+  Parrot_compose_s_s,                                /*    932 */
+  Parrot_compose_s_sc,                               /*    933 */
+  Parrot_spawnw_i_s,                                 /*    934 */
+  Parrot_spawnw_i_sc,                                /*    935 */
+  Parrot_spawnw_i_p,                                 /*    936 */
+  Parrot_err_i,                                      /*    937 */
+  Parrot_err_s,                                      /*    938 */
+  Parrot_err_s_i,                                    /*    939 */
+  Parrot_err_s_ic,                                   /*    940 */
+  Parrot_time_i,                                     /*    941 */
+  Parrot_time_n,                                     /*    942 */
+  Parrot_sleep_i,                                    /*    943 */
+  Parrot_sleep_ic,                                   /*    944 */
+  Parrot_sleep_n,                                    /*    945 */
+  Parrot_sleep_nc,                                   /*    946 */
+  Parrot_store_lex_s_p,                              /*    947 */
+  Parrot_store_lex_sc_p,                             /*    948 */
+  Parrot_store_dynamic_lex_s_p,                      /*    949 */
+  Parrot_store_dynamic_lex_sc_p,                     /*    950 */
+  Parrot_find_lex_p_s,                               /*    951 */
+  Parrot_find_lex_p_sc,                              /*    952 */
+  Parrot_find_dynamic_lex_p_s,                       /*    953 */
+  Parrot_find_dynamic_lex_p_sc,                      /*    954 */
+  Parrot_find_caller_lex_p_s,                        /*    955 */
+  Parrot_find_caller_lex_p_sc,                       /*    956 */
+  Parrot_get_namespace_p,                            /*    957 */
+  Parrot_get_namespace_p_p,                          /*    958 */
+  Parrot_get_namespace_p_pc,                         /*    959 */
+  Parrot_get_hll_namespace_p,                        /*    960 */
+  Parrot_get_hll_namespace_p_p,                      /*    961 */
+  Parrot_get_hll_namespace_p_pc,                     /*    962 */
+  Parrot_get_root_namespace_p,                       /*    963 */
+  Parrot_get_root_namespace_p_p,                     /*    964 */
+  Parrot_get_root_namespace_p_pc,                    /*    965 */
+  Parrot_get_global_p_s,                             /*    966 */
+  Parrot_get_global_p_sc,                            /*    967 */
+  Parrot_get_global_p_p_s,                           /*    968 */
+  Parrot_get_global_p_pc_s,                          /*    969 */
+  Parrot_get_global_p_p_sc,                          /*    970 */
+  Parrot_get_global_p_pc_sc,                         /*    971 */
+  Parrot_get_hll_global_p_s,                         /*    972 */
+  Parrot_get_hll_global_p_sc,                        /*    973 */
+  Parrot_get_hll_global_p_p_s,                       /*    974 */
+  Parrot_get_hll_global_p_pc_s,                      /*    975 */
+  Parrot_get_hll_global_p_p_sc,                      /*    976 */
+  Parrot_get_hll_global_p_pc_sc,                     /*    977 */
+  Parrot_get_root_global_p_s,                        /*    978 */
+  Parrot_get_root_global_p_sc,                       /*    979 */
+  Parrot_get_root_global_p_p_s,                      /*    980 */
+  Parrot_get_root_global_p_pc_s,                     /*    981 */
+  Parrot_get_root_global_p_p_sc,                     /*    982 */
+  Parrot_get_root_global_p_pc_sc,                    /*    983 */
+  Parrot_set_global_s_p,                             /*    984 */
+  Parrot_set_global_sc_p,                            /*    985 */
+  Parrot_set_global_p_s_p,                           /*    986 */
+  Parrot_set_global_pc_s_p,                          /*    987 */
+  Parrot_set_global_p_sc_p,                          /*    988 */
+  Parrot_set_global_pc_sc_p,                         /*    989 */
+  Parrot_set_hll_global_s_p,                         /*    990 */
+  Parrot_set_hll_global_sc_p,                        /*    991 */
+  Parrot_set_hll_global_p_s_p,                       /*    992 */
+  Parrot_set_hll_global_pc_s_p,                      /*    993 */
+  Parrot_set_hll_global_p_sc_p,                      /*    994 */
+  Parrot_set_hll_global_pc_sc_p,                     /*    995 */
+  Parrot_set_root_global_s_p,                        /*    996 */
+  Parrot_set_root_global_sc_p,                       /*    997 */
+  Parrot_set_root_global_p_s_p,                      /*    998 */
+  Parrot_set_root_global_pc_s_p,                     /*    999 */
+  Parrot_set_root_global_p_sc_p,                     /*   1000 */
+  Parrot_set_root_global_pc_sc_p,                    /*   1001 */
+  Parrot_find_name_p_s,                              /*   1002 */
+  Parrot_find_name_p_sc,                             /*   1003 */
+  Parrot_find_sub_not_null_p_s,                      /*   1004 */
+  Parrot_find_sub_not_null_p_sc,                     /*   1005 */
+  Parrot_trap,                                       /*   1006 */
+  Parrot_set_label_p_ic,                             /*   1007 */
+  Parrot_get_label_i_p,                              /*   1008 */
+  Parrot_fetch_p_p_p_p,                              /*   1009 */
+  Parrot_fetch_p_pc_p_p,                             /*   1010 */
+  Parrot_fetch_p_p_pc_p,                             /*   1011 */
+  Parrot_fetch_p_pc_pc_p,                            /*   1012 */
+  Parrot_fetch_p_p_p_pc,                             /*   1013 */
+  Parrot_fetch_p_pc_p_pc,                            /*   1014 */
+  Parrot_fetch_p_p_pc_pc,                            /*   1015 */
+  Parrot_fetch_p_pc_pc_pc,                           /*   1016 */
+  Parrot_fetch_p_p_i_p,                              /*   1017 */
+  Parrot_fetch_p_pc_i_p,                             /*   1018 */
+  Parrot_fetch_p_p_ic_p,                             /*   1019 */
+  Parrot_fetch_p_pc_ic_p,                            /*   1020 */
+  Parrot_fetch_p_p_i_pc,                             /*   1021 */
+  Parrot_fetch_p_pc_i_pc,                            /*   1022 */
+  Parrot_fetch_p_p_ic_pc,                            /*   1023 */
+  Parrot_fetch_p_pc_ic_pc,                           /*   1024 */
+  Parrot_fetch_p_p_s_p,                              /*   1025 */
+  Parrot_fetch_p_pc_s_p,                             /*   1026 */
+  Parrot_fetch_p_p_sc_p,                             /*   1027 */
+  Parrot_fetch_p_pc_sc_p,                            /*   1028 */
+  Parrot_fetch_p_p_s_pc,                             /*   1029 */
+  Parrot_fetch_p_pc_s_pc,                            /*   1030 */
+  Parrot_fetch_p_p_sc_pc,                            /*   1031 */
+  Parrot_fetch_p_pc_sc_pc,                           /*   1032 */
+  Parrot_vivify_p_p_p_p,                             /*   1033 */
+  Parrot_vivify_p_pc_p_p,                            /*   1034 */
+  Parrot_vivify_p_p_pc_p,                            /*   1035 */
+  Parrot_vivify_p_pc_pc_p,                           /*   1036 */
+  Parrot_vivify_p_p_p_pc,                            /*   1037 */
+  Parrot_vivify_p_pc_p_pc,                           /*   1038 */
+  Parrot_vivify_p_p_pc_pc,                           /*   1039 */
+  Parrot_vivify_p_pc_pc_pc,                          /*   1040 */
+  Parrot_vivify_p_p_i_p,                             /*   1041 */
+  Parrot_vivify_p_pc_i_p,                            /*   1042 */
+  Parrot_vivify_p_p_ic_p,                            /*   1043 */
+  Parrot_vivify_p_pc_ic_p,                           /*   1044 */
+  Parrot_vivify_p_p_i_pc,                            /*   1045 */
+  Parrot_vivify_p_pc_i_pc,                           /*   1046 */
+  Parrot_vivify_p_p_ic_pc,                           /*   1047 */
+  Parrot_vivify_p_pc_ic_pc,                          /*   1048 */
+  Parrot_vivify_p_p_s_p,                             /*   1049 */
+  Parrot_vivify_p_pc_s_p,                            /*   1050 */
+  Parrot_vivify_p_p_sc_p,                            /*   1051 */
+  Parrot_vivify_p_pc_sc_p,                           /*   1052 */
+  Parrot_vivify_p_p_s_pc,                            /*   1053 */
+  Parrot_vivify_p_pc_s_pc,                           /*   1054 */
+  Parrot_vivify_p_p_sc_pc,                           /*   1055 */
+  Parrot_vivify_p_pc_sc_pc,                          /*   1056 */
+  Parrot_new_p_s_i,                                  /*   1057 */
+  Parrot_new_p_sc_i,                                 /*   1058 */
+  Parrot_new_p_s_ic,                                 /*   1059 */
+  Parrot_new_p_sc_ic,                                /*   1060 */
+  Parrot_new_p_p_i,                                  /*   1061 */
+  Parrot_new_p_pc_i,                                 /*   1062 */
+  Parrot_new_p_p_ic,                                 /*   1063 */
+  Parrot_new_p_pc_ic,                                /*   1064 */
+  Parrot_root_new_p_p_i,                             /*   1065 */
+  Parrot_root_new_p_pc_i,                            /*   1066 */
+  Parrot_root_new_p_p_ic,                            /*   1067 */
+  Parrot_root_new_p_pc_ic,                           /*   1068 */
+  Parrot_find_codepoint_i_s,                         /*   1069 */
+  Parrot_find_codepoint_i_sc,                        /*   1070 */
+  Parrot_finalize_p,                                 /*   1071 */
+  Parrot_finalize_pc,                                /*   1072 */
 
   NULL /* NULL function pointer */
 };
@@ -1168,7 +1158,7 @@
 ** Op Info Table:
 */
 
-static op_info_t core_op_info_table[1084] = {
+static op_info_t core_op_info_table[1074] = {
   { /* 0 */
     /* type PARROT_INLINE_OP, */
     "end",
@@ -12624,136 +12614,6 @@
   },
   { /* 881 */
     /* type PARROT_FUNCTION_OP, */
-    "charset",
-    "charset_i_s",
-    "Parrot_charset_i_s",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_I, PARROT_ARG_S },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 882 */
-    /* type PARROT_FUNCTION_OP, */
-    "charset",
-    "charset_i_sc",
-    "Parrot_charset_i_sc",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_I, PARROT_ARG_SC },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 883 */
-    /* type PARROT_FUNCTION_OP, */
-    "charsetname",
-    "charsetname_s_i",
-    "Parrot_charsetname_s_i",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_S, PARROT_ARG_I },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 884 */
-    /* type PARROT_FUNCTION_OP, */
-    "charsetname",
-    "charsetname_s_ic",
-    "Parrot_charsetname_s_ic",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_S, PARROT_ARG_IC },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 885 */
-    /* type PARROT_FUNCTION_OP, */
-    "find_charset",
-    "find_charset_i_s",
-    "Parrot_find_charset_i_s",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_I, PARROT_ARG_S },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 886 */
-    /* type PARROT_FUNCTION_OP, */
-    "find_charset",
-    "find_charset_i_sc",
-    "Parrot_find_charset_i_sc",
-    /* "",  body */
-    0,
-    3,
-    { PARROT_ARG_I, PARROT_ARG_SC },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN },
-    { 0, 0 },
-    &core_op_lib
-  },
-  { /* 887 */
-    /* type PARROT_FUNCTION_OP, */
-    "trans_charset",
-    "trans_charset_s_s_i",
-    "Parrot_trans_charset_s_s_i",
-    /* "",  body */
-    0,
-    4,
-    { PARROT_ARG_S, PARROT_ARG_S, PARROT_ARG_I },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN, PARROT_ARGDIR_IN },
-    { 0, 0, 0 },
-    &core_op_lib
-  },
-  { /* 888 */
-    /* type PARROT_FUNCTION_OP, */
-    "trans_charset",
-    "trans_charset_s_sc_i",
-    "Parrot_trans_charset_s_sc_i",
-    /* "",  body */
-    0,
-    4,
-    { PARROT_ARG_S, PARROT_ARG_SC, PARROT_ARG_I },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN, PARROT_ARGDIR_IN },
-    { 0, 0, 0 },
-    &core_op_lib
-  },
-  { /* 889 */
-    /* type PARROT_FUNCTION_OP, */
-    "trans_charset",
-    "trans_charset_s_s_ic",
-    "Parrot_trans_charset_s_s_ic",
-    /* "",  body */
-    0,
-    4,
-    { PARROT_ARG_S, PARROT_ARG_S, PARROT_ARG_IC },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN, PARROT_ARGDIR_IN },
-    { 0, 0, 0 },
-    &core_op_lib
-  },
-  { /* 890 */
-    /* type PARROT_FUNCTION_OP, */
-    "trans_charset",
-    "trans_charset_s_sc_ic",
-    "Parrot_trans_charset_s_sc_ic",
-    /* "",  body */
-    0,
-    4,
-    { PARROT_ARG_S, PARROT_ARG_SC, PARROT_ARG_IC },
-    { PARROT_ARGDIR_OUT, PARROT_ARGDIR_IN, PARROT_ARGDIR_IN },
-    { 0, 0, 0 },
-    &core_op_lib
-  },
-  { /* 891 */
-    /* type PARROT_FUNCTION_OP, */
     "encoding",
     "encoding_i_s",
     "Parrot_encoding_i_s",
@@ -12765,7 +12625,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 892 */
+  { /* 882 */
     /* type PARROT_FUNCTION_OP, */
     "encoding",
     "encoding_i_sc",
@@ -12778,7 +12638,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 893 */
+  { /* 883 */
     /* type PARROT_FUNCTION_OP, */
     "encodingname",
     "encodingname_s_i",
@@ -12791,7 +12651,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 894 */
+  { /* 884 */
     /* type PARROT_FUNCTION_OP, */
     "encodingname",
     "encodingname_s_ic",
@@ -12804,7 +12664,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 895 */
+  { /* 885 */
     /* type PARROT_FUNCTION_OP, */
     "find_encoding",
     "find_encoding_i_s",
@@ -12817,7 +12677,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 896 */
+  { /* 886 */
     /* type PARROT_FUNCTION_OP, */
     "find_encoding",
     "find_encoding_i_sc",
@@ -12830,7 +12690,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 897 */
+  { /* 887 */
     /* type PARROT_FUNCTION_OP, */
     "trans_encoding",
     "trans_encoding_s_s_i",
@@ -12843,7 +12703,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 898 */
+  { /* 888 */
     /* type PARROT_FUNCTION_OP, */
     "trans_encoding",
     "trans_encoding_s_sc_i",
@@ -12856,7 +12716,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 899 */
+  { /* 889 */
     /* type PARROT_FUNCTION_OP, */
     "trans_encoding",
     "trans_encoding_s_s_ic",
@@ -12869,7 +12729,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 900 */
+  { /* 890 */
     /* type PARROT_FUNCTION_OP, */
     "trans_encoding",
     "trans_encoding_s_sc_ic",
@@ -12882,7 +12742,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 901 */
+  { /* 891 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_i_s_i",
@@ -12895,7 +12755,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 902 */
+  { /* 892 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_ic_s_i",
@@ -12908,7 +12768,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 903 */
+  { /* 893 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_i_sc_i",
@@ -12921,7 +12781,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 904 */
+  { /* 894 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_ic_sc_i",
@@ -12934,7 +12794,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 905 */
+  { /* 895 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_i_s_ic",
@@ -12947,7 +12807,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 906 */
+  { /* 896 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_ic_s_ic",
@@ -12960,7 +12820,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 907 */
+  { /* 897 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_i_sc_ic",
@@ -12973,7 +12833,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 908 */
+  { /* 898 */
     /* type PARROT_INLINE_OP, */
     "is_cclass",
     "is_cclass_i_ic_sc_ic",
@@ -12986,7 +12846,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 909 */
+  { /* 899 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_s_i_i",
@@ -12999,7 +12859,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 910 */
+  { /* 900 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_s_i_i",
@@ -13012,7 +12872,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 911 */
+  { /* 901 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_sc_i_i",
@@ -13025,7 +12885,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 912 */
+  { /* 902 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_sc_i_i",
@@ -13038,7 +12898,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 913 */
+  { /* 903 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_s_ic_i",
@@ -13051,7 +12911,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 914 */
+  { /* 904 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_s_ic_i",
@@ -13064,7 +12924,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 915 */
+  { /* 905 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_sc_ic_i",
@@ -13077,7 +12937,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 916 */
+  { /* 906 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_sc_ic_i",
@@ -13090,7 +12950,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 917 */
+  { /* 907 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_s_i_ic",
@@ -13103,7 +12963,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 918 */
+  { /* 908 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_s_i_ic",
@@ -13116,7 +12976,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 919 */
+  { /* 909 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_sc_i_ic",
@@ -13129,7 +12989,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 920 */
+  { /* 910 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_sc_i_ic",
@@ -13142,7 +13002,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 921 */
+  { /* 911 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_s_ic_ic",
@@ -13155,7 +13015,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 922 */
+  { /* 912 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_s_ic_ic",
@@ -13168,7 +13028,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 923 */
+  { /* 913 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_i_sc_ic_ic",
@@ -13181,7 +13041,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 924 */
+  { /* 914 */
     /* type PARROT_INLINE_OP, */
     "find_cclass",
     "find_cclass_i_ic_sc_ic_ic",
@@ -13194,7 +13054,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 925 */
+  { /* 915 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_s_i_i",
@@ -13207,7 +13067,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 926 */
+  { /* 916 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_s_i_i",
@@ -13220,7 +13080,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 927 */
+  { /* 917 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_sc_i_i",
@@ -13233,7 +13093,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 928 */
+  { /* 918 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_sc_i_i",
@@ -13246,7 +13106,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 929 */
+  { /* 919 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_s_ic_i",
@@ -13259,7 +13119,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 930 */
+  { /* 920 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_s_ic_i",
@@ -13272,7 +13132,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 931 */
+  { /* 921 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_sc_ic_i",
@@ -13285,7 +13145,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 932 */
+  { /* 922 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_sc_ic_i",
@@ -13298,7 +13158,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 933 */
+  { /* 923 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_s_i_ic",
@@ -13311,7 +13171,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 934 */
+  { /* 924 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_s_i_ic",
@@ -13324,7 +13184,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 935 */
+  { /* 925 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_sc_i_ic",
@@ -13337,7 +13197,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 936 */
+  { /* 926 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_sc_i_ic",
@@ -13350,7 +13210,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 937 */
+  { /* 927 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_s_ic_ic",
@@ -13363,7 +13223,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 938 */
+  { /* 928 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_s_ic_ic",
@@ -13376,7 +13236,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 939 */
+  { /* 929 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_i_sc_ic_ic",
@@ -13389,7 +13249,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 940 */
+  { /* 930 */
     /* type PARROT_INLINE_OP, */
     "find_not_cclass",
     "find_not_cclass_i_ic_sc_ic_ic",
@@ -13402,7 +13262,7 @@
     { 0, 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 941 */
+  { /* 931 */
     /* type PARROT_FUNCTION_OP, */
     "escape",
     "escape_s_s",
@@ -13415,7 +13275,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 942 */
+  { /* 932 */
     /* type PARROT_FUNCTION_OP, */
     "compose",
     "compose_s_s",
@@ -13428,7 +13288,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 943 */
+  { /* 933 */
     /* type PARROT_FUNCTION_OP, */
     "compose",
     "compose_s_sc",
@@ -13441,7 +13301,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 944 */
+  { /* 934 */
     /* type PARROT_INLINE_OP, */
     "spawnw",
     "spawnw_i_s",
@@ -13454,7 +13314,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 945 */
+  { /* 935 */
     /* type PARROT_INLINE_OP, */
     "spawnw",
     "spawnw_i_sc",
@@ -13467,7 +13327,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 946 */
+  { /* 936 */
     /* type PARROT_INLINE_OP, */
     "spawnw",
     "spawnw_i_p",
@@ -13480,7 +13340,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 947 */
+  { /* 937 */
     /* type PARROT_INLINE_OP, */
     "err",
     "err_i",
@@ -13493,7 +13353,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 948 */
+  { /* 938 */
     /* type PARROT_FUNCTION_OP, */
     "err",
     "err_s",
@@ -13506,7 +13366,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 949 */
+  { /* 939 */
     /* type PARROT_FUNCTION_OP, */
     "err",
     "err_s_i",
@@ -13519,7 +13379,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 950 */
+  { /* 940 */
     /* type PARROT_FUNCTION_OP, */
     "err",
     "err_s_ic",
@@ -13532,7 +13392,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 951 */
+  { /* 941 */
     /* type PARROT_INLINE_OP, */
     "time",
     "time_i",
@@ -13545,7 +13405,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 952 */
+  { /* 942 */
     /* type PARROT_INLINE_OP, */
     "time",
     "time_n",
@@ -13558,7 +13418,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 953 */
+  { /* 943 */
     /* type PARROT_INLINE_OP, */
     "sleep",
     "sleep_i",
@@ -13571,7 +13431,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 954 */
+  { /* 944 */
     /* type PARROT_INLINE_OP, */
     "sleep",
     "sleep_ic",
@@ -13584,7 +13444,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 955 */
+  { /* 945 */
     /* type PARROT_INLINE_OP, */
     "sleep",
     "sleep_n",
@@ -13597,7 +13457,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 956 */
+  { /* 946 */
     /* type PARROT_INLINE_OP, */
     "sleep",
     "sleep_nc",
@@ -13610,7 +13470,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 957 */
+  { /* 947 */
     /* type PARROT_FUNCTION_OP, */
     "store_lex",
     "store_lex_s_p",
@@ -13623,7 +13483,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 958 */
+  { /* 948 */
     /* type PARROT_FUNCTION_OP, */
     "store_lex",
     "store_lex_sc_p",
@@ -13636,7 +13496,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 959 */
+  { /* 949 */
     /* type PARROT_FUNCTION_OP, */
     "store_dynamic_lex",
     "store_dynamic_lex_s_p",
@@ -13649,7 +13509,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 960 */
+  { /* 950 */
     /* type PARROT_FUNCTION_OP, */
     "store_dynamic_lex",
     "store_dynamic_lex_sc_p",
@@ -13662,7 +13522,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 961 */
+  { /* 951 */
     /* type PARROT_FUNCTION_OP, */
     "find_lex",
     "find_lex_p_s",
@@ -13675,7 +13535,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 962 */
+  { /* 952 */
     /* type PARROT_FUNCTION_OP, */
     "find_lex",
     "find_lex_p_sc",
@@ -13688,7 +13548,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 963 */
+  { /* 953 */
     /* type PARROT_FUNCTION_OP, */
     "find_dynamic_lex",
     "find_dynamic_lex_p_s",
@@ -13701,7 +13561,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 964 */
+  { /* 954 */
     /* type PARROT_FUNCTION_OP, */
     "find_dynamic_lex",
     "find_dynamic_lex_p_sc",
@@ -13714,7 +13574,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 965 */
+  { /* 955 */
     /* type PARROT_FUNCTION_OP, */
     "find_caller_lex",
     "find_caller_lex_p_s",
@@ -13727,7 +13587,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 966 */
+  { /* 956 */
     /* type PARROT_FUNCTION_OP, */
     "find_caller_lex",
     "find_caller_lex_p_sc",
@@ -13740,7 +13600,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 967 */
+  { /* 957 */
     /* type PARROT_FUNCTION_OP, */
     "get_namespace",
     "get_namespace_p",
@@ -13753,7 +13613,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 968 */
+  { /* 958 */
     /* type PARROT_FUNCTION_OP, */
     "get_namespace",
     "get_namespace_p_p",
@@ -13766,7 +13626,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 969 */
+  { /* 959 */
     /* type PARROT_FUNCTION_OP, */
     "get_namespace",
     "get_namespace_p_pc",
@@ -13779,7 +13639,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 970 */
+  { /* 960 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_namespace",
     "get_hll_namespace_p",
@@ -13792,7 +13652,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 971 */
+  { /* 961 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_namespace",
     "get_hll_namespace_p_p",
@@ -13805,7 +13665,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 972 */
+  { /* 962 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_namespace",
     "get_hll_namespace_p_pc",
@@ -13818,7 +13678,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 973 */
+  { /* 963 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_namespace",
     "get_root_namespace_p",
@@ -13831,7 +13691,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 974 */
+  { /* 964 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_namespace",
     "get_root_namespace_p_p",
@@ -13844,7 +13704,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 975 */
+  { /* 965 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_namespace",
     "get_root_namespace_p_pc",
@@ -13857,7 +13717,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 976 */
+  { /* 966 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_s",
@@ -13870,7 +13730,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 977 */
+  { /* 967 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_sc",
@@ -13883,7 +13743,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 978 */
+  { /* 968 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_p_s",
@@ -13896,7 +13756,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 979 */
+  { /* 969 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_pc_s",
@@ -13909,7 +13769,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 980 */
+  { /* 970 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_p_sc",
@@ -13922,7 +13782,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 981 */
+  { /* 971 */
     /* type PARROT_FUNCTION_OP, */
     "get_global",
     "get_global_p_pc_sc",
@@ -13935,7 +13795,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 982 */
+  { /* 972 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_s",
@@ -13948,7 +13808,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 983 */
+  { /* 973 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_sc",
@@ -13961,7 +13821,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 984 */
+  { /* 974 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_p_s",
@@ -13974,7 +13834,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 985 */
+  { /* 975 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_pc_s",
@@ -13987,7 +13847,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 986 */
+  { /* 976 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_p_sc",
@@ -14000,7 +13860,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 987 */
+  { /* 977 */
     /* type PARROT_FUNCTION_OP, */
     "get_hll_global",
     "get_hll_global_p_pc_sc",
@@ -14013,7 +13873,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 988 */
+  { /* 978 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_s",
@@ -14026,7 +13886,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 989 */
+  { /* 979 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_sc",
@@ -14039,7 +13899,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 990 */
+  { /* 980 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_p_s",
@@ -14052,7 +13912,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 991 */
+  { /* 981 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_pc_s",
@@ -14065,7 +13925,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 992 */
+  { /* 982 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_p_sc",
@@ -14078,7 +13938,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 993 */
+  { /* 983 */
     /* type PARROT_FUNCTION_OP, */
     "get_root_global",
     "get_root_global_p_pc_sc",
@@ -14091,7 +13951,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 994 */
+  { /* 984 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_s_p",
@@ -14104,7 +13964,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 995 */
+  { /* 985 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_sc_p",
@@ -14117,7 +13977,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 996 */
+  { /* 986 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_p_s_p",
@@ -14130,7 +13990,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 997 */
+  { /* 987 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_pc_s_p",
@@ -14143,7 +14003,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 998 */
+  { /* 988 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_p_sc_p",
@@ -14156,7 +14016,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 999 */
+  { /* 989 */
     /* type PARROT_FUNCTION_OP, */
     "set_global",
     "set_global_pc_sc_p",
@@ -14169,7 +14029,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1000 */
+  { /* 990 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_s_p",
@@ -14182,7 +14042,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1001 */
+  { /* 991 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_sc_p",
@@ -14195,7 +14055,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1002 */
+  { /* 992 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_p_s_p",
@@ -14208,7 +14068,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1003 */
+  { /* 993 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_pc_s_p",
@@ -14221,7 +14081,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1004 */
+  { /* 994 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_p_sc_p",
@@ -14234,7 +14094,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1005 */
+  { /* 995 */
     /* type PARROT_FUNCTION_OP, */
     "set_hll_global",
     "set_hll_global_pc_sc_p",
@@ -14247,7 +14107,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1006 */
+  { /* 996 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_s_p",
@@ -14260,7 +14120,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1007 */
+  { /* 997 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_sc_p",
@@ -14273,7 +14133,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1008 */
+  { /* 998 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_p_s_p",
@@ -14286,7 +14146,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1009 */
+  { /* 999 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_pc_s_p",
@@ -14299,7 +14159,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1010 */
+  { /* 1000 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_p_sc_p",
@@ -14312,7 +14172,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1011 */
+  { /* 1001 */
     /* type PARROT_FUNCTION_OP, */
     "set_root_global",
     "set_root_global_pc_sc_p",
@@ -14325,7 +14185,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1012 */
+  { /* 1002 */
     /* type PARROT_FUNCTION_OP, */
     "find_name",
     "find_name_p_s",
@@ -14338,7 +14198,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1013 */
+  { /* 1003 */
     /* type PARROT_FUNCTION_OP, */
     "find_name",
     "find_name_p_sc",
@@ -14351,7 +14211,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1014 */
+  { /* 1004 */
     /* type PARROT_INLINE_OP, */
     "find_sub_not_null",
     "find_sub_not_null_p_s",
@@ -14364,7 +14224,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1015 */
+  { /* 1005 */
     /* type PARROT_INLINE_OP, */
     "find_sub_not_null",
     "find_sub_not_null_p_sc",
@@ -14377,7 +14237,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1016 */
+  { /* 1006 */
     /* type PARROT_FUNCTION_OP, */
     "trap",
     "trap",
@@ -14390,7 +14250,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 1017 */
+  { /* 1007 */
     /* type PARROT_INLINE_OP, */
     "set_label",
     "set_label_p_ic",
@@ -14403,7 +14263,7 @@
     { 0, 1 },
     &core_op_lib
   },
-  { /* 1018 */
+  { /* 1008 */
     /* type PARROT_INLINE_OP, */
     "get_label",
     "get_label_i_p",
@@ -14416,7 +14276,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1019 */
+  { /* 1009 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_p_p",
@@ -14429,7 +14289,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1020 */
+  { /* 1010 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_p_p",
@@ -14442,7 +14302,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1021 */
+  { /* 1011 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_pc_p",
@@ -14455,7 +14315,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1022 */
+  { /* 1012 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_pc_p",
@@ -14468,7 +14328,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1023 */
+  { /* 1013 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_p_pc",
@@ -14481,7 +14341,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1024 */
+  { /* 1014 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_p_pc",
@@ -14494,7 +14354,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1025 */
+  { /* 1015 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_pc_pc",
@@ -14507,7 +14367,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1026 */
+  { /* 1016 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_pc_pc",
@@ -14520,7 +14380,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1027 */
+  { /* 1017 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_i_p",
@@ -14533,7 +14393,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1028 */
+  { /* 1018 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_i_p",
@@ -14546,7 +14406,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1029 */
+  { /* 1019 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_ic_p",
@@ -14559,7 +14419,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1030 */
+  { /* 1020 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_ic_p",
@@ -14572,7 +14432,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1031 */
+  { /* 1021 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_i_pc",
@@ -14585,7 +14445,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1032 */
+  { /* 1022 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_i_pc",
@@ -14598,7 +14458,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1033 */
+  { /* 1023 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_ic_pc",
@@ -14611,7 +14471,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1034 */
+  { /* 1024 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_ic_pc",
@@ -14624,7 +14484,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1035 */
+  { /* 1025 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_s_p",
@@ -14637,7 +14497,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1036 */
+  { /* 1026 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_s_p",
@@ -14650,7 +14510,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1037 */
+  { /* 1027 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_sc_p",
@@ -14663,7 +14523,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1038 */
+  { /* 1028 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_sc_p",
@@ -14676,7 +14536,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1039 */
+  { /* 1029 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_s_pc",
@@ -14689,7 +14549,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1040 */
+  { /* 1030 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_s_pc",
@@ -14702,7 +14562,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1041 */
+  { /* 1031 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_p_sc_pc",
@@ -14715,7 +14575,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1042 */
+  { /* 1032 */
     /* type PARROT_INLINE_OP, */
     "fetch",
     "fetch_p_pc_sc_pc",
@@ -14728,7 +14588,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1043 */
+  { /* 1033 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_p_p",
@@ -14741,7 +14601,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1044 */
+  { /* 1034 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_p_p",
@@ -14754,7 +14614,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1045 */
+  { /* 1035 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_pc_p",
@@ -14767,7 +14627,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1046 */
+  { /* 1036 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_pc_p",
@@ -14780,7 +14640,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1047 */
+  { /* 1037 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_p_pc",
@@ -14793,7 +14653,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1048 */
+  { /* 1038 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_p_pc",
@@ -14806,7 +14666,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1049 */
+  { /* 1039 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_pc_pc",
@@ -14819,7 +14679,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1050 */
+  { /* 1040 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_pc_pc",
@@ -14832,7 +14692,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1051 */
+  { /* 1041 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_i_p",
@@ -14845,7 +14705,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1052 */
+  { /* 1042 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_i_p",
@@ -14858,7 +14718,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1053 */
+  { /* 1043 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_ic_p",
@@ -14871,7 +14731,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1054 */
+  { /* 1044 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_ic_p",
@@ -14884,7 +14744,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1055 */
+  { /* 1045 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_i_pc",
@@ -14897,7 +14757,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1056 */
+  { /* 1046 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_i_pc",
@@ -14910,7 +14770,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1057 */
+  { /* 1047 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_ic_pc",
@@ -14923,7 +14783,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1058 */
+  { /* 1048 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_ic_pc",
@@ -14936,7 +14796,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1059 */
+  { /* 1049 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_s_p",
@@ -14949,7 +14809,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1060 */
+  { /* 1050 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_s_p",
@@ -14962,7 +14822,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1061 */
+  { /* 1051 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_sc_p",
@@ -14975,7 +14835,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1062 */
+  { /* 1052 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_sc_p",
@@ -14988,7 +14848,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1063 */
+  { /* 1053 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_s_pc",
@@ -15001,7 +14861,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1064 */
+  { /* 1054 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_s_pc",
@@ -15014,7 +14874,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1065 */
+  { /* 1055 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_p_sc_pc",
@@ -15027,7 +14887,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1066 */
+  { /* 1056 */
     /* type PARROT_INLINE_OP, */
     "vivify",
     "vivify_p_pc_sc_pc",
@@ -15040,7 +14900,7 @@
     { 0, 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1067 */
+  { /* 1057 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_s_i",
@@ -15053,7 +14913,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1068 */
+  { /* 1058 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_sc_i",
@@ -15066,7 +14926,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1069 */
+  { /* 1059 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_s_ic",
@@ -15079,7 +14939,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1070 */
+  { /* 1060 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_sc_ic",
@@ -15092,7 +14952,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1071 */
+  { /* 1061 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_p_i",
@@ -15105,7 +14965,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1072 */
+  { /* 1062 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_pc_i",
@@ -15118,7 +14978,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1073 */
+  { /* 1063 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_p_ic",
@@ -15131,7 +14991,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1074 */
+  { /* 1064 */
     /* type PARROT_FUNCTION_OP, */
     "new",
     "new_p_pc_ic",
@@ -15144,7 +15004,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1075 */
+  { /* 1065 */
     /* type PARROT_FUNCTION_OP, */
     "root_new",
     "root_new_p_p_i",
@@ -15157,7 +15017,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1076 */
+  { /* 1066 */
     /* type PARROT_FUNCTION_OP, */
     "root_new",
     "root_new_p_pc_i",
@@ -15170,7 +15030,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1077 */
+  { /* 1067 */
     /* type PARROT_FUNCTION_OP, */
     "root_new",
     "root_new_p_p_ic",
@@ -15183,7 +15043,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1078 */
+  { /* 1068 */
     /* type PARROT_FUNCTION_OP, */
     "root_new",
     "root_new_p_pc_ic",
@@ -15196,7 +15056,7 @@
     { 0, 0, 0 },
     &core_op_lib
   },
-  { /* 1079 */
+  { /* 1069 */
     /* type PARROT_FUNCTION_OP, */
     "find_codepoint",
     "find_codepoint_i_s",
@@ -15209,7 +15069,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1080 */
+  { /* 1070 */
     /* type PARROT_FUNCTION_OP, */
     "find_codepoint",
     "find_codepoint_i_sc",
@@ -15222,7 +15082,7 @@
     { 0, 0 },
     &core_op_lib
   },
-  { /* 1081 */
+  { /* 1071 */
     /* type PARROT_FUNCTION_OP, */
     "finalize",
     "finalize_p",
@@ -15235,7 +15095,7 @@
     { 0 },
     &core_op_lib
   },
-  { /* 1082 */
+  { /* 1072 */
     /* type PARROT_FUNCTION_OP, */
     "finalize",
     "finalize_pc",
@@ -23117,88 +22977,6 @@
 return (opcode_t *)cur_opcode + 4;}
 
 opcode_t *
-Parrot_charset_i_s(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    IREG(1) = Parrot_encoding_number_of_str(interp, SREG(2));
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_charset_i_sc(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    IREG(1) = Parrot_encoding_number_of_str(interp, SCONST(2));
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_charsetname_s_i(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_encoding_name(interp, IREG(2));
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_charsetname_s_ic(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_encoding_name(interp, ICONST(2));
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_find_charset_i_s(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    const INTVAL n = Parrot_encoding_number(interp, SREG(2));
-    if (n < 0) {
-        opcode_t *handler = Parrot_ex_throw_from_op_args(interp, NULL,
-                EXCEPTION_INVALID_CHARTYPE,
-                "charset '%Ss' not found", SREG(2));return (opcode_t *)handler;
-    }
-    IREG(1) = n;
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_find_charset_i_sc(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    const INTVAL n = Parrot_encoding_number(interp, SCONST(2));
-    if (n < 0) {
-        opcode_t *handler = Parrot_ex_throw_from_op_args(interp, NULL,
-                EXCEPTION_INVALID_CHARTYPE,
-                "charset '%Ss' not found", SCONST(2));return (opcode_t *)handler;
-    }
-    IREG(1) = n;
-
-return (opcode_t *)cur_opcode + 3;}
-
-opcode_t *
-Parrot_trans_charset_s_s_i(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_str_change_charset(interp, SREG(2), IREG(3));
-
-return (opcode_t *)cur_opcode + 4;}
-
-opcode_t *
-Parrot_trans_charset_s_sc_i(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_str_change_charset(interp, SCONST(2), IREG(3));
-
-return (opcode_t *)cur_opcode + 4;}
-
-opcode_t *
-Parrot_trans_charset_s_s_ic(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_str_change_charset(interp, SREG(2), ICONST(3));
-
-return (opcode_t *)cur_opcode + 4;}
-
-opcode_t *
-Parrot_trans_charset_s_sc_ic(opcode_t *cur_opcode, PARROT_INTERP)  {
-    const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
-    SREG(1) = Parrot_str_change_charset(interp, SCONST(2), ICONST(3));
-
-return (opcode_t *)cur_opcode + 4;}
-
-opcode_t *
 Parrot_encoding_i_s(opcode_t *cur_opcode, PARROT_INTERP)  {
     const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
     IREG(1) = Parrot_encoding_number_of_str(interp, SREG(2));
@@ -26095,7 +25873,7 @@
   2,    /* major_version */
   9,    /* minor_version */
   1,    /* patch_version */
-  1083,             /* op_count */
+  1073,             /* op_count */
   core_op_info_table,       /* op_info_table */
   core_op_func_table,       /* op_func_table */
   get_op          /* op_code() */ 

Modified: branches/remove_charset_ops/src/ops/string.ops
==============================================================================
--- branches/remove_charset_ops/src/ops/string.ops	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/src/ops/string.ops	Wed Oct 27 21:51:16 2010	(r49701)
@@ -453,52 +453,6 @@
 }
 
 
-=item B<charset>(out INT, in STR)
-
-Return the charset number $1 of string $2.
-
-=item B<charsetname>(out STR, in INT)
-
-Return the name $1 of charset number $2.
-If charset number $2 is not found, name $1 is set to null.
-
-=item B<find_charset>(out INT, in STR)
-
-Return the charset number of the charset named $2. If the charset doesn't
-exist, throw an exception.
-
-=item B<trans_charset>(out STR, in STR, in INT)
-
-Create a string $1 from $2 with the specified charset.
-
-Both functions may throw an exception on information loss.
-
-=cut
-
-op charset(out INT, in STR) :base_core {
-    $1 = Parrot_encoding_number_of_str(interp, $2);
-}
-
-op charsetname(out STR, in INT) :base_core {
-    $1 = Parrot_encoding_name(interp, $2);
-}
-
-op find_charset(out INT, in STR) :base_core {
-    const INTVAL n = Parrot_encoding_number(interp, $2);
-    if (n < 0) {
-        opcode_t *handler = Parrot_ex_throw_from_op_args(interp, NULL,
-                EXCEPTION_INVALID_CHARTYPE,
-                "charset '%Ss' not found", $2);
-        goto ADDRESS(handler);
-    }
-    $1 = n;
-}
-
-op trans_charset(out STR, in STR, in INT) {
-    $1 = Parrot_str_change_charset(interp, $2, $3);
-}
-
-
 =item B<encoding>(out INT, in STR)
 
 Return the encoding number $1 of string $2.

Modified: branches/remove_charset_ops/src/string/api.c
==============================================================================
--- branches/remove_charset_ops/src/string/api.c	Wed Oct 27 21:44:26 2010	(r49700)
+++ branches/remove_charset_ops/src/string/api.c	Wed Oct 27 21:51:16 2010	(r49701)
@@ -2952,31 +2952,6 @@
 
 /*
 
-=item C<STRING* Parrot_str_change_charset(PARROT_INTERP, STRING *src, INTVAL
-charset_nr)>
-
-Converts C<src> to the given charset or encoding and returns the result as a
-new string.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-STRING*
-Parrot_str_change_charset(PARROT_INTERP, ARGMOD_NULLOK(STRING *src),
-        INTVAL charset_nr)
-{
-    ASSERT_ARGS(Parrot_str_change_charset)
-
-    return Parrot_str_change_encoding(interp, src, charset_nr);
-}
-
-
-/*
-
 =item C<STRING* Parrot_str_change_encoding(PARROT_INTERP, STRING *src, INTVAL
 encoding_nr)>
 


More information about the parrot-commits mailing list