rm atoms

source/quickjs-opcode.h

@@ -54,6 +54,9 @@ FMT(atom_label_u8)
 FMT(atom_label_u16)
 FMT(label_u16)
 FMT(key)
+FMT(key_u8)
+FMT(key_u16)
+FMT(key_label_u16)
 #undef FMT
 #endif /* FMT */
 
@@ -104,24 +107,24 @@ DEF(     array_from, 3, 0, 1, npop) /* arguments are not counted in n_pop */
 DEF(         return, 1, 1, 0, none)
 DEF(   return_undef, 1, 0, 0, none)
 DEF(          throw, 1, 1, 0, none)
-DEF(    throw_error, 6, 0, 0, atom_u8)
+DEF(    throw_error, 6, 0, 0, key_u8)
 DEF(           eval, 5, 1, 1, npop_u16) /* func args... -> ret_val */
 DEF(         regexp, 1, 2, 1, none) /* create a RegExp object from the pattern and a
                                        bytecode string */
 
-DEF(      check_var, 5, 0, 1, atom) /* check if a variable exists */
-DEF(  get_var_undef, 5, 0, 1, atom) /* push undefined if the variable does not exist */
-DEF(        get_var, 5, 0, 1, atom) /* throw an exception if the variable does not exist */
-DEF(        put_var, 5, 1, 0, atom) /* must come after get_var */
-DEF(   put_var_init, 5, 1, 0, atom) /* must come after put_var. Used to initialize a global lexical variable */
-DEF( put_var_strict, 5, 2, 0, atom) /* for strict mode variable write */
+DEF(      check_var, 5, 0, 1, key) /* check if a variable exists */
+DEF(  get_var_undef, 5, 0, 1, key) /* push undefined if the variable does not exist */
+DEF(        get_var, 5, 0, 1, key) /* throw an exception if the variable does not exist */
+DEF(        put_var, 5, 1, 0, key) /* must come after get_var */
+DEF(   put_var_init, 5, 1, 0, key) /* must come after put_var. Used to initialize a global lexical variable */
+DEF( put_var_strict, 5, 2, 0, key) /* for strict mode variable write */
 
 DEF(  get_ref_value, 1, 2, 3, none)
 DEF(  put_ref_value, 1, 3, 0, none)
 
-DEF(     define_var, 6, 0, 0, atom_u8)
-DEF(check_define_var, 6, 0, 0, atom_u8)
-DEF(    define_func, 6, 1, 0, atom_u8)
+DEF(     define_var, 6, 0, 0, key_u8)
+DEF(check_define_var, 6, 0, 0, key_u8)
+DEF(    define_func, 6, 1, 0, key_u8)
 DEF(      get_field, 5, 1, 1, key)
 DEF(     get_field2, 5, 1, 2, key)
 DEF(      put_field, 5, 2, 0, key)
@@ -130,14 +133,14 @@ DEF(  get_array_el2, 1, 2, 2, none) /* obj prop -> obj value */
 DEF(  get_array_el3, 1, 2, 3, none) /* obj prop -> obj prop1 value */
 DEF(   put_array_el, 1, 3, 0, none)
 DEF(   define_field, 5, 2, 1, key)
-DEF(       set_name, 5, 1, 1, atom)
+DEF(       set_name, 5, 1, 1, key)
 DEF(set_name_computed, 1, 2, 2, none)
 DEF(define_array_el, 1, 3, 2, none)
 DEF(copy_data_properties, 2, 3, 3, u8)
-DEF(  define_method, 6, 2, 1, atom_u8)
+DEF(  define_method, 6, 2, 1, key_u8)
 DEF(define_method_computed, 2, 3, 1, u8) /* must come after define_method */
-DEF(   define_class, 6, 2, 2, atom_u8) /* parent ctor -> ctor proto */
-DEF(   define_class_computed, 6, 3, 3, atom_u8) /* field_name parent ctor -> field_name ctor proto (class with computed name) */
+DEF(   define_class, 6, 2, 2, key_u8) /* parent ctor -> ctor proto */
+DEF(   define_class_computed, 6, 3, 3, key_u8) /* field_name parent ctor -> field_name ctor proto (class with computed name) */
 
 DEF(        get_loc, 3, 0, 1, loc)
 DEF(        put_loc, 3, 1, 0, loc) /* must come after get_loc */
@@ -169,10 +172,10 @@ DEF(      to_object, 1, 1, 1, none)
 //DEF(      to_string, 1, 1, 1, none)
 DEF(     to_propkey, 1, 1, 1, none)
 
-DEF(   make_loc_ref, 7, 0, 2, atom_u16)
-DEF(   make_arg_ref, 7, 0, 2, atom_u16)
-DEF(make_var_ref_ref, 7, 0, 2, atom_u16)
-DEF(   make_var_ref, 5, 0, 2, atom)
+DEF(   make_loc_ref, 7, 0, 2, key_u16)
+DEF(   make_arg_ref, 7, 0, 2, key_u16)
+DEF(make_var_ref_ref, 7, 0, 2, key_u16)
+DEF(   make_var_ref, 5, 0, 2, key)
 
 /* arithmetic/logic operations */
 DEF(            neg, 1, 1, 1, none)
@@ -187,7 +190,7 @@ DEF(        add_loc, 2, 1, 0, loc8)
 DEF(            not, 1, 1, 1, none)
 DEF(           lnot, 1, 1, 1, none)
 DEF(         delete, 1, 2, 1, none)
-DEF(     delete_var, 5, 0, 1, atom)
+DEF(     delete_var, 5, 0, 1, key)
 
 DEF(            mul, 1, 2, 1, none)
 DEF(      mul_float, 1, 2, 1, none)
@@ -227,15 +230,15 @@ def(          label, 5, 0, 0, label) /* emitted in phase 1, removed in phase 3 *
 
 /* the following opcodes must be in the same order as the 'with_x' and
    get_var_undef, get_var and put_var opcodes */
-def(scope_get_var_undef, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def(  scope_get_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def(  scope_put_var, 7, 1, 0, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def(scope_delete_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def( scope_make_ref, 11, 0, 2, atom_label_u16) /* emitted in phase 1, removed in phase 2 */
-def(  scope_get_ref, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def(scope_put_var_init, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
-def(scope_get_var_checkthis, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2, only used to return 'this' in derived class constructors */
-def(get_field_opt_chain, 5, 1, 1, atom) /* emitted in phase 1, removed in phase 2 */
+def(scope_get_var_undef, 7, 0, 1, key_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_var, 7, 0, 1, key_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_put_var, 7, 1, 0, key_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_delete_var, 7, 0, 1, key_u16) /* emitted in phase 1, removed in phase 2 */
+def( scope_make_ref, 11, 0, 2, key_label_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_ref, 7, 0, 2, key_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_put_var_init, 7, 0, 2, key_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_get_var_checkthis, 7, 0, 1, key_u16) /* emitted in phase 1, removed in phase 2, only used to return 'this' in derived class constructors */
+def(get_field_opt_chain, 5, 1, 1, key) /* emitted in phase 1, removed in phase 2 */
 def(get_array_el_opt_chain, 1, 2, 1, none) /* emitted in phase 1, removed in phase 2 */
 def( set_class_name, 5, 1, 1, u32) /* emitted in phase 1, removed in phase 2 */