Isolate "compat feature" support to dmlc.py

Author: mandolaerik

py/dml/breaking_changes.py

@@ -461,33 +461,3 @@ class dml_forbid_warning_statement(BreakingChange):
     '''
     short = "Disallow the `_warning` statement"
     required_after = api_7
-
-
-
-compat_features = {
-    'broken_unused_types': dml_forbid_broken_unused_types,
-    'broken_conditional_is': dml_forbid_broken_conditional_is,
-    'port_proxy_ifaces': dml_remove_port_proxy_ifaces,
-    'port_proxy_attrs': dml_remove_port_proxy_attrs,
-    'function_in_extern_struct': dml_forbid_function_in_extern_struct,
-    'optional_version_statement': dml_require_version_statement,
-    'io_memory': dml_transaction_by_default,
-    'port_obj_param': dml_remove_port_obj_param,
-    'shared_logs_on_device': dml_shared_logs_locally,
-    'suppress_WLOGMIXUP': dml_enable_WLOGMIXUP,
-    'legacy_attributes': dml_remove_legacy_attributes,
-    'lenient_typechecking': dml_strict_typechecking,
-    'no_method_index_asserts': dml_range_check_method_indices,
-    'meaningless_log_levels': dml_restrict_log_levels,
-    'dml12_inline': dml12_disable_inline_constants,
-    'dml12_not': dml12_not_typecheck,
-    'dml12_misc': dml12_remove_misc_quirks,
-    'dml12_goto': dml12_remove_goto,
-    'dml12_int': dml12_fix_int_quirks,
-    'experimental_vect': dml_forbid_experimental_vect,
-    'warning_statement': dml_forbid_warning_statement,
-}
-
-# temporary hack to keep existing dml.globals.enabled_compat based checks working
-for name in compat_features:
-    globals()[name] = name

py/dml/dmlc.py

@@ -582,14 +582,38 @@ def main(argv):
             'dml12-remove-goto',
             'dml12-fix-int-quirks'])
 
+    compat_features = {
+        'broken_unused_types': breaking_changes.dml_forbid_broken_unused_types,
+        'broken_conditional_is': breaking_changes.dml_forbid_broken_conditional_is,
+        'port_proxy_ifaces': breaking_changes.dml_remove_port_proxy_ifaces,
+        'port_proxy_attrs': breaking_changes.dml_remove_port_proxy_attrs,
+        'function_in_extern_struct':
+        breaking_changes.dml_forbid_function_in_extern_struct,
+        'optional_version_statement':
+        breaking_changes.dml_require_version_statement,
+        'io_memory': breaking_changes.dml_transaction_by_default,
+        'port_obj_param': breaking_changes.dml_remove_port_obj_param,
+        'shared_logs_on_device': breaking_changes.dml_shared_logs_locally,
+        'suppress_WLOGMIXUP': breaking_changes.dml_enable_WLOGMIXUP,
+        'legacy_attributes': breaking_changes.dml_remove_legacy_attributes,
+        'lenient_typechecking': breaking_changes.dml_strict_typechecking,
+        'no_method_index_asserts': breaking_changes.dml_range_check_method_indices,
+        'meaningless_log_levels': breaking_changes.dml_restrict_log_levels,
+        'dml12_inline': breaking_changes.dml12_disable_inline_constants,
+        'dml12_not': breaking_changes.dml12_not_typecheck,
+        'dml12_misc': breaking_changes.dml12_remove_misc_quirks,
+        'dml12_goto': breaking_changes.dml12_remove_goto,
+        'dml12_int': breaking_changes.dml12_fix_int_quirks,
+        'experimental_vect': breaking_changes.dml_forbid_experimental_vect,
+        'warning_statement': breaking_changes.dml_forbid_warning_statement,
+    }
     if options.no_compat:
         if options.breaking_change:
             parser.error("cannot pass both --no-compat and --breaking-change")
         for flag in options.no_compat:
             for tag in flag.split(','):
-                if tag in breaking_changes.compat_features:
-                    options.breaking_change.append(
-                        breaking_changes.compat_features[tag].tag())
+                if tag in compat_features:
+                    options.breaking_change.append(compat_features[tag].tag())
                 else:
                     parser.error(f'invalid tag {tag} for --no-compat.')
 
@@ -607,11 +631,6 @@ def main(argv):
 
     breaking_changes.BreakingChange.enabled_breaking_changes = set(
         changes.values())
-    # temp hack to make existing code continue to work
-    dml.globals.enabled_compat = {
-        tag for (tag, bc) in breaking_changes.compat_features.items()
-        if not bc.enabled
-    }
 
     if not breaking_changes.dml_enable_WLOGMIXUP.enabled:
         ignore_warning('WLOGMIXUP')

py/dml/globals.py

@@ -55,7 +55,6 @@
 # types.TypeSequence -> codegen.TypeSequenceInfo
 type_sequence_infos = {}
 
-enabled_compat = set()
 
 # 1.4 style integer semantics is used in 1.2 if False is returned
 def compat_dml12_int(site):

py/dml/toplevel.py

@@ -368,9 +368,6 @@ def parse_main_file(inputfilename, explicit_import_path):
     dml.globals.dml_version = version
     version_str = fmt_version(version)
     if version != (1, 2):
-        for feature in [breaking_changes.dml12_inline, breaking_changes.dml12_not,
-                        breaking_changes.dml12_misc]:
-            dml.globals.enabled_compat.discard(feature)
         breaking_changes.BreakingChange.enabled_breaking_changes.update([
             breaking_changes.dml12_disable_inline_constants,
             breaking_changes.dml12_not_typecheck,