Format large families more nicely

python · gvanrossum · Nov 3, 2022 · Sep 20, 2022 · Oct 12, 2022 · Oct 12, 2022
commit 98427bfa7d024f1cdbead0dc35da3cf28473eadc
@@ -3777,19 +3777,39 @@ dummy_func(
 
 // Families go below this point //
 
-family(binary_op) = BINARY_OP + BINARY_OP_ADAPTIVE + BINARY_OP_ADD_FLOAT + BINARY_OP_ADD_INT + BINARY_OP_ADD_UNICODE + BINARY_OP_INPLACE_ADD_UNICODE + BINARY_OP_MULTIPLY_FLOAT + BINARY_OP_MULTIPLY_INT + BINARY_OP_SUBTRACT_FLOAT + BINARY_OP_SUBTRACT_INT;
-family(binary_subscr) = BINARY_SUBSCR + BINARY_SUBSCR_ADAPTIVE + BINARY_SUBSCR_DICT + BINARY_SUBSCR_GETITEM + BINARY_SUBSCR_LIST_INT + BINARY_SUBSCR_TUPLE_INT;
-family(call) = CALL + CALL_ADAPTIVE + CALL_PY_EXACT_ARGS + CALL_PY_WITH_DEFAULTS + CALL_BOUND_METHOD_EXACT_ARGS + CALL_BUILTIN_CLASS + CALL_BUILTIN_FAST_WITH_KEYWORDS + CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS + CALL_NO_KW_BUILTIN_FAST + CALL_NO_KW_BUILTIN_O + CALL_NO_KW_ISINSTANCE + CALL_NO_KW_LEN + CALL_NO_KW_LIST_APPEND + CALL_NO_KW_METHOD_DESCRIPTOR_FAST + CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS + CALL_NO_KW_METHOD_DESCRIPTOR_O + CALL_NO_KW_STR_1 + CALL_NO_KW_TUPLE_1 + CALL_NO_KW_TYPE_1;
-family(compare_op) = COMPARE_OP + COMPARE_OP_ADAPTIVE + COMPARE_OP_FLOAT_JUMP + COMPARE_OP_INT_JUMP + COMPARE_OP_STR_JUMP;
+family(binary_op) =
+    BINARY_OP + BINARY_OP_ADAPTIVE + BINARY_OP_ADD_FLOAT + BINARY_OP_ADD_INT +
+    BINARY_OP_ADD_UNICODE + BINARY_OP_INPLACE_ADD_UNICODE + BINARY_OP_MULTIPLY_FLOAT + BINARY_OP_MULTIPLY_INT +
+    BINARY_OP_SUBTRACT_FLOAT + BINARY_OP_SUBTRACT_INT;
+family(binary_subscr) =
+    BINARY_SUBSCR + BINARY_SUBSCR_ADAPTIVE + BINARY_SUBSCR_DICT + BINARY_SUBSCR_GETITEM +
+    BINARY_SUBSCR_LIST_INT + BINARY_SUBSCR_TUPLE_INT;
+family(call) =
+    CALL + CALL_ADAPTIVE + CALL_PY_EXACT_ARGS + CALL_PY_WITH_DEFAULTS +
+    CALL_BOUND_METHOD_EXACT_ARGS + CALL_BUILTIN_CLASS + CALL_BUILTIN_FAST_WITH_KEYWORDS + CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS +
+    CALL_NO_KW_BUILTIN_FAST + CALL_NO_KW_BUILTIN_O + CALL_NO_KW_ISINSTANCE + CALL_NO_KW_LEN +
+    CALL_NO_KW_LIST_APPEND + CALL_NO_KW_METHOD_DESCRIPTOR_FAST + CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS + CALL_NO_KW_METHOD_DESCRIPTOR_O +
+    CALL_NO_KW_STR_1 + CALL_NO_KW_TUPLE_1 + CALL_NO_KW_TYPE_1;
+family(compare_op) =
+    COMPARE_OP + COMPARE_OP_ADAPTIVE + COMPARE_OP_FLOAT_JUMP + COMPARE_OP_INT_JUMP +
+    COMPARE_OP_STR_JUMP;
 family(extended_arg) = EXTENDED_ARG + EXTENDED_ARG_QUICK;
 family(for_iter) = FOR_ITER + FOR_ITER_ADAPTIVE + FOR_ITER_LIST + FOR_ITER_RANGE;
 family(jump_backward) = JUMP_BACKWARD + JUMP_BACKWARD_QUICK;
-family(load_attr) = LOAD_ATTR + LOAD_ATTR_ADAPTIVE + LOAD_ATTR_CLASS + LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN + LOAD_ATTR_INSTANCE_VALUE + LOAD_ATTR_MODULE + LOAD_ATTR_PROPERTY + LOAD_ATTR_SLOT + LOAD_ATTR_WITH_HINT + LOAD_ATTR_METHOD_LAZY_DICT + LOAD_ATTR_METHOD_NO_DICT + LOAD_ATTR_METHOD_WITH_DICT + LOAD_ATTR_METHOD_WITH_VALUES;
+family(load_attr) =
+    LOAD_ATTR + LOAD_ATTR_ADAPTIVE + LOAD_ATTR_CLASS + LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN +
+    LOAD_ATTR_INSTANCE_VALUE + LOAD_ATTR_MODULE + LOAD_ATTR_PROPERTY + LOAD_ATTR_SLOT +
+    LOAD_ATTR_WITH_HINT + LOAD_ATTR_METHOD_LAZY_DICT + LOAD_ATTR_METHOD_NO_DICT + LOAD_ATTR_METHOD_WITH_DICT +
+    LOAD_ATTR_METHOD_WITH_VALUES;
 family(load_const) = LOAD_CONST + LOAD_CONST__LOAD_FAST;
 family(load_fast) = LOAD_FAST + LOAD_FAST__LOAD_CONST + LOAD_FAST__LOAD_FAST;
 family(load_global) = LOAD_GLOBAL + LOAD_GLOBAL_ADAPTIVE + LOAD_GLOBAL_BUILTIN + LOAD_GLOBAL_MODULE;
 family(resume) = RESUME + RESUME_QUICK;
-family(store_attr) = STORE_ATTR + STORE_ATTR_ADAPTIVE + STORE_ATTR_INSTANCE_VALUE + STORE_ATTR_SLOT + STORE_ATTR_WITH_HINT;
+family(store_attr) =
+    STORE_ATTR + STORE_ATTR_ADAPTIVE + STORE_ATTR_INSTANCE_VALUE + STORE_ATTR_SLOT +
+    STORE_ATTR_WITH_HINT;
 family(store_fast) = STORE_FAST + STORE_FAST__LOAD_FAST + STORE_FAST__STORE_FAST;
 family(store_subscr) = STORE_SUBSCR + STORE_SUBSCR_ADAPTIVE + STORE_SUBSCR_DICT + STORE_SUBSCR_LIST_INT;
-family(unpack_sequence) = UNPACK_SEQUENCE + UNPACK_SEQUENCE_ADAPTIVE + UNPACK_SEQUENCE_LIST + UNPACK_SEQUENCE_TUPLE + UNPACK_SEQUENCE_TWO_TUPLE;
+family(unpack_sequence) =
+    UNPACK_SEQUENCE + UNPACK_SEQUENCE_ADAPTIVE + UNPACK_SEQUENCE_LIST + UNPACK_SEQUENCE_TUPLE +
+    UNPACK_SEQUENCE_TWO_TUPLE;
@@ -179,8 +179,18 @@ def write_cases(f, cases):
 
 def write_families(f):
     for opcode, specializations in dis._specializations.items():
-        members = ' + '.join([opcode] + specializations)
-        print(f"family({opcode.lower()}) = {members};", file=f)
+        all = [opcode] + specializations
+        if len(all) <= 4:
+            members = ' + '.join([opcode] + specializations)
+            print(f"family({opcode.lower()}) = {members};", file=f)
+        else:
+            print(f"family({opcode.lower()}) =", file=f)
+            for i in range(0, len(all), 4):
+                members = ' + '.join(all[i:i+4])
+                if i+4 < len(all):
+                    print(f"    {members} +", file=f)
+                else:
+                    print(f"    {members};", file=f)
 
 
 def compare(oldfile, newfile, quiet=False):