Renamed character class operators lists to elements.

Author: Napalys

javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassIntersection.java

@@ -4,19 +4,19 @@
 import java.util.List;
 
 public class CharacterClassIntersection extends RegExpTerm {
-    private final List<RegExpTerm> intersections;
+    private final List<RegExpTerm> elements;
 
-    public CharacterClassIntersection(SourceLocation loc, List<RegExpTerm> intersections) {
+    public CharacterClassIntersection(SourceLocation loc, List<RegExpTerm> elements) {
         super(loc, "CharacterClassIntersection");
-        this.intersections = intersections;
+        this.elements = elements;
     }
 
     @Override
     public void accept(Visitor v) {
         v.visit(this);
     }
 
-    public List<RegExpTerm> getIntersections() {
-        return intersections;
+    public List<RegExpTerm> getElements() {
+        return elements;
     }
 }

javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassSubtraction.java

@@ -4,19 +4,19 @@
 import java.util.List;
 
 public class CharacterClassSubtraction extends RegExpTerm {
-    private final List<RegExpTerm> subtraction;
+    private final List<RegExpTerm> elements;
 
-    public CharacterClassSubtraction(SourceLocation loc, List<RegExpTerm> subtraction) {
+    public CharacterClassSubtraction(SourceLocation loc, List<RegExpTerm> elements) {
         super(loc, "CharacterClassSubtraction");
-        this.subtraction = subtraction;
+        this.elements = elements;
     }
 
     @Override
     public void accept(Visitor v) {
         v.visit(this);
     }
 
-    public List<RegExpTerm> getSubtraction() {
-        return subtraction;
+    public List<RegExpTerm> getElements() {
+        return elements;
     }
 }

javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClassUnion.java

@@ -4,19 +4,19 @@
 import java.util.List;
 
 public class CharacterClassUnion extends RegExpTerm {
-    private final List<RegExpTerm> union;
+    private final List<RegExpTerm> elements;
 
-    public CharacterClassUnion(SourceLocation loc, List<RegExpTerm> union) {
+    public CharacterClassUnion(SourceLocation loc, List<RegExpTerm> elements) {
         super(loc, "CharacterClassUnion");
-        this.union = union;
+        this.elements = elements;
     }
 
     @Override
     public void accept(Visitor v) {
         v.visit(this);
     }
 
-    public List<RegExpTerm> getUnion() {
-        return union;
+    public List<RegExpTerm> getElements() {
+        return elements;
     }
 }

javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java

@@ -363,23 +363,23 @@ public void visit(CharacterClassQuotedString nd) {
     public void visit(CharacterClassIntersection nd) {
       Label lbl = extractTerm(nd, parent, idx);
       int i = 0;
-      for (RegExpTerm element : nd.getIntersections())
+      for (RegExpTerm element : nd.getElements())
         visit(element, lbl, i++);
     }
 
     @Override
     public void visit(CharacterClassSubtraction nd) {
       Label lbl = extractTerm(nd, parent, idx);
       int i = 0;
-      for (RegExpTerm element : nd.getSubtraction())
+      for (RegExpTerm element : nd.getElements())
         visit(element, lbl, i++);
     }
 
     @Override
     public void visit(CharacterClassUnion nd) {
       Label lbl = extractTerm(nd, parent, idx);
       int i = 0;
-      for (RegExpTerm element : nd.getUnion())
+      for (RegExpTerm element : nd.getElements())
         visit(element, lbl, i++);
     }
   }