Renamed mandatory_extensions to mandatory_ext_reqs in places I shouldn't have (i.e. in @config). Also true for implemented and prohibited.

Author: james-ball-qualcomm

lib/cfg_arch.rb

@@ -185,7 +185,7 @@ def params_without_value
   def implemented_ext_vers
     return @implemented_ext_vers unless @implemented_ext_vers.nil?
 
-    @implemented_ext_vers = @config.implemented_ext_vers.map do |e|
+    @implemented_ext_vers = @config.implemented_extensions.map do |e|
       ExtensionVersion.new(e["name"], e["version"], arch, fail_if_version_does_not_exist: true)
     end
   end
@@ -194,7 +194,7 @@ def implemented_ext_vers
   def mandatory_ext_reqs
     return @mandatory_ext_reqs unless @mandatory_ext_reqs.nil?
 
-    @mandatory_ext_reqs = @config.mandatory_ext_reqs.map do |e|
+    @mandatory_ext_reqs = @config.mandatory_extensions.map do |e|
       ext = extension(e["name"])
       raise "Cannot find extension #{e['name']} in the architecture definition" if ext.nil?
 
@@ -210,7 +210,7 @@ def prohibited_ext_reqs
 
     if @config.partially_configured?
       @prohibited_ext_reqs =
-        @config.prohibited_ext_reqs.map do |e|
+        @config.prohibited_extensions.map do |e|
           ext = extension(e["name"])
           raise "Cannot find extension #{e['name']} in the architecture definition" if ext.nil?
 

lib/config.rb

@@ -142,10 +142,6 @@ def prohibited_extensions
         end
       end
   end
-
-  # def prohibited_ext?(ext_name, cfg_arch) = prohibited_extensions(cfg_arch).any? { |e| e.name == ext_name.to_s }
-
-  # def ext?(ext_name, cfg_arch) = mandatory_extensions(cfg_arch).any? { |e| e.name == ext_name.to_s }
 end
 
 ################################################################################################################