test/testlibrary/jittester/src/jdk/test/lib/jittester/Rule.java

*** 30,69 ****
  import jdk.test.lib.jittester.utils.PseudoRandom;
  
  /**
   * The Rule. A helper to perform production.
   */
! public class Rule extends Factory implements Comparable<Rule> {
!     private String name;
      private Integer limit = -1;
  
      @Override
!     public int compareTo(Rule rule) {
          return name.compareTo(rule.name);
      }
  
-     private TreeSet<RuleEntry> variants;
- 
      public Rule(String name) {
          this.name = name;
          variants = new TreeSet<>();
      }
  
!     public void add(String ruleName, Factory factory) {
          add(ruleName, factory, 1.0);
      }
  
!     public void add(String ruleName, Factory factory, double weight) {
          variants.add(new RuleEntry(ruleName, factory, weight));
      }
  
      public int size() {
          return variants.size();
      }
  
      @Override
!     public IRNode produce() throws ProductionFailedException {
          if (!variants.isEmpty()) {
              // Begin production.
              LinkedList<RuleEntry> rulesList = new LinkedList<>(variants);
              PseudoRandom.shuffle(rulesList);
  
--- 30,68 ----
  import jdk.test.lib.jittester.utils.PseudoRandom;
  
  /**
   * The Rule. A helper to perform production.
   */
! public class Rule<T extends IRNode> extends Factory<T> implements Comparable<Rule<T>> {
!     private final String name;
!     private final TreeSet<RuleEntry> variants;
      private Integer limit = -1;
  
      @Override
!     public int compareTo(Rule<T> rule) {
          return name.compareTo(rule.name);
      }
  
      public Rule(String name) {
          this.name = name;
          variants = new TreeSet<>();
      }
  
!     public void add(String ruleName, Factory<? extends T> factory) {
          add(ruleName, factory, 1.0);
      }
  
!     public void add(String ruleName, Factory<? extends T> factory, double weight) {
          variants.add(new RuleEntry(ruleName, factory, weight));
      }
  
      public int size() {
          return variants.size();
      }
  
      @Override
!     public T produce() throws ProductionFailedException {
          if (!variants.isEmpty()) {
              // Begin production.
              LinkedList<RuleEntry> rulesList = new LinkedList<>(variants);
              PseudoRandom.shuffle(rulesList);
  
*** 96,118 ****
          // should probably throw exception here..
          //return getChildren().size() > 0 ? getChild(0).produce() : null;
          throw new ProductionFailedException();
      }
  
!     private class RuleEntry extends Factory implements Comparable<RuleEntry> {
          private final double weight;
!         private final Factory factory;
          private final String name;
  
!         private RuleEntry(String name, Factory factory, double weight) {
              this.name = name;
              this.weight = weight;
              this.factory = factory;
          }
  
          @Override
!         public IRNode produce() throws ProductionFailedException {
              return factory.produce();
          }
  
          @Override
          public int compareTo(RuleEntry entry) {
--- 95,117 ----
          // should probably throw exception here..
          //return getChildren().size() > 0 ? getChild(0).produce() : null;
          throw new ProductionFailedException();
      }
  
!     private class RuleEntry extends Factory<T> implements Comparable<RuleEntry> {
          private final double weight;
!         private final Factory<? extends T> factory;
          private final String name;
  
!         private RuleEntry(String name, Factory<? extends T> factory, double weight) {
              this.name = name;
              this.weight = weight;
              this.factory = factory;
          }
  
          @Override
!         public T produce() throws ProductionFailedException {
              return factory.produce();
          }
  
          @Override
          public int compareTo(RuleEntry entry) {