Revert "Add qualifiers."

This reverts commit 7578b76.
RumbleDB · Jul 12, 2024 · 9fe0f74 · 9fe0f74
1 parent 38c6266
commit 9fe0f74
Show file tree

Hide file tree

Showing 35 changed files with 2,223 additions and 2,223 deletions.
diff --git a/src/main/java/org/rumbledb/compiler/ExecutionModeVisitor.java b/src/main/java/org/rumbledb/compiler/ExecutionModeVisitor.java
@@ -656,7 +656,7 @@ public StaticContext visitProlog(Prolog prolog, StaticContext argument) {
     @Override
     public StaticContext visitProgram(Program program, StaticContext argument) {
         visitDescendants(program, argument);
-        ExecutionMode mergedExecutionMode = getHighestExecutionModeFromStatements(this.exitStatementChildren);
+        ExecutionMode mergedExecutionMode = getHighestExecutionModeFromStatements(exitStatementChildren);
         program.setHighestExecutionMode(mergedExecutionMode);
         return argument;
     }

diff --git a/src/main/java/org/rumbledb/compiler/SequentialClassificationVisitor.java b/src/main/java/org/rumbledb/compiler/SequentialClassificationVisitor.java
@@ -57,7 +57,7 @@ public class SequentialClassificationVisitor extends AbstractNodeVisitor<Descend
     public SequentialClassificationVisitor(Prolog prolog) {
         this.prolog = prolog;
         this.blockLevel = 0;
-        this.variableBlockLevel = new HashMap<>();
+        variableBlockLevel = new HashMap<>();
     }
 
     protected DescendentSequentialProperties defaultAction(Node node, DescendentSequentialProperties argument) {

diff --git a/src/main/java/org/rumbledb/context/GlobalVariables.java b/src/main/java/org/rumbledb/context/GlobalVariables.java
@@ -14,7 +14,7 @@ public class GlobalVariables implements Serializable, KryoSerializable {
     private Set<Name> globalVariables;
 
     public GlobalVariables() {
-        this.globalVariables = new HashSet<>();
+        globalVariables = new HashSet<>();
     }
 
     public void addGlobalVariable(Name globalVariable) {

diff --git a/src/main/java/org/rumbledb/context/InScopeVariable.java b/src/main/java/org/rumbledb/context/InScopeVariable.java
@@ -83,6 +83,6 @@ public void read(Kryo kryo, Input input) {
     }
 
     public boolean isAssignable() {
-        return this.isAssignable;
+        return isAssignable;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/Expression.java b/src/main/java/org/rumbledb/expressions/Expression.java
@@ -126,7 +126,7 @@ public void setStaticSequenceType(SequenceType staticSequenceType) {
      * @return Expression Classification of the expression.
      */
     public ExpressionClassification getExpressionClassification() {
-        return this.expressionClassification;
+        return expressionClassification;
     }
 
     /**

diff --git a/src/main/java/org/rumbledb/expressions/module/VariableDeclaration.java b/src/main/java/org/rumbledb/expressions/module/VariableDeclaration.java
@@ -166,12 +166,12 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
 
     @Nullable
     public List<Annotation> getAnnotations() {
-        return this.annotations;
+        return annotations;
     }
 
 
     public boolean isAssignable() {
-        return this.isAssignable;
+        return isAssignable;
     }
 }
 
diff --git a/src/main/java/org/rumbledb/expressions/scripting/annotations/Annotation.java b/src/main/java/org/rumbledb/expressions/scripting/annotations/Annotation.java
@@ -20,11 +20,11 @@ public Annotation(Name annotationName, List<Expression> literals) {
     }
 
     public Name getAnnotationName() {
-        return this.annotationName;
+        return annotationName;
     }
 
     public List<Expression> getLiterals() {
-        return this.literals;
+        return literals;
     }
 
     public static boolean checkAssignable(

diff --git a/src/main/java/org/rumbledb/expressions/scripting/declaration/CommaVariableDeclStatement.java b/src/main/java/org/rumbledb/expressions/scripting/declaration/CommaVariableDeclStatement.java
@@ -23,18 +23,18 @@ public <T> T accept(AbstractNodeVisitor<T> visitor, T argument) {
 
     @Override
     public List<Node> getChildren() {
-        return new ArrayList<>(this.variables);
+        return new ArrayList<>(variables);
     }
 
     @Override
     public void serializeToJSONiq(StringBuffer sb, int indent) {
         indentIt(sb, indent);
-        for (VariableDeclStatement variableDeclStatement : this.variables) {
+        for (VariableDeclStatement variableDeclStatement : variables) {
             variableDeclStatement.serializeToJSONiq(sb, 0);
         }
     }
 
     public List<VariableDeclStatement> getVariables() {
-        return this.variables;
+        return variables;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/declaration/VariableDeclStatement.java b/src/main/java/org/rumbledb/expressions/scripting/declaration/VariableDeclStatement.java
@@ -103,10 +103,10 @@ public Expression getVariableExpression() {
     }
 
     public List<Annotation> getAnnotations() {
-        return this.annotations;
+        return annotations;
     }
 
     public boolean isAssignable() {
-        return this.isAssignable;
+        return isAssignable;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/loops/FlowrStatement.java b/src/main/java/org/rumbledb/expressions/scripting/loops/FlowrStatement.java
@@ -48,6 +48,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public ReturnStatementClause getReturnStatementClause() {
-        return this.returnStatementClause;
+        return returnStatementClause;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/loops/ReturnStatementClause.java b/src/main/java/org/rumbledb/expressions/scripting/loops/ReturnStatementClause.java
@@ -46,6 +46,6 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public Statement getReturnStatement() {
-        return this.returnStatement;
+        return returnStatement;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/scripting/loops/WhileStatement.java b/src/main/java/org/rumbledb/expressions/scripting/loops/WhileStatement.java
@@ -27,8 +27,8 @@ public <T> T accept(AbstractNodeVisitor<T> visitor, T argument) {
     @Override
     public List<Node> getChildren() {
         List<Node> result = new ArrayList<>();
-        result.add(this.testCondition);
-        result.add(this.statement);
+        result.add(testCondition);
+        result.add(statement);
         return result;
     }
 
@@ -43,10 +43,10 @@ public void serializeToJSONiq(StringBuffer sb, int indent) {
     }
 
     public Expression getTestCondition() {
-        return this.testCondition;
+        return testCondition;
     }
 
     public Statement getStatement() {
-        return this.statement;
+        return statement;
     }
 }
diff --git a/src/main/java/org/rumbledb/expressions/update/AppendExpression.java b/src/main/java/org/rumbledb/expressions/update/AppendExpression.java
@@ -31,11 +31,11 @@ public AppendExpression(
     }
 
     public Expression getArrayExpression() {
-        return this.arrayExpression;
+        return arrayExpression;
     }
 
     public Expression getToAppendExpression() {
-        return this.toAppendExpression;
+        return toAppendExpression;
     }
 
     @Override

diff --git a/src/main/java/org/rumbledb/expressions/update/CopyDeclaration.java b/src/main/java/org/rumbledb/expressions/update/CopyDeclaration.java
@@ -21,11 +21,11 @@ public CopyDeclaration(
     }
 
     public Name getVariableName() {
-        return this.variableName;
+        return variableName;
     }
 
     public Expression getSourceExpression() {
-        return this.sourceExpression;
+        return sourceExpression;
     }
 
     public SequenceType getSourceSequenceType() {

diff --git a/src/main/java/org/rumbledb/expressions/update/DeleteExpression.java b/src/main/java/org/rumbledb/expressions/update/DeleteExpression.java
@@ -36,11 +36,11 @@ public List<Node> getChildren() {
     }
 
     public Expression getMainExpression() {
-        return this.mainExpression;
+        return mainExpression;
     }
 
     public Expression getLocatorExpression() {
-        return this.locatorExpression;
+        return locatorExpression;
     }
 
 

diff --git a/src/main/java/org/rumbledb/expressions/update/RenameExpression.java b/src/main/java/org/rumbledb/expressions/update/RenameExpression.java
@@ -42,15 +42,15 @@ public List<Node> getChildren() {
     }
 
     public Expression getMainExpression() {
-        return this.mainExpression;
+        return mainExpression;
     }
 
     public Expression getLocatorExpression() {
-        return this.locatorExpression;
+        return locatorExpression;
     }
 
     public Expression getNameExpression() {
-        return this.nameExpression;
+        return nameExpression;
     }
 
     @Override

diff --git a/src/main/java/org/rumbledb/expressions/update/TransformExpression.java b/src/main/java/org/rumbledb/expressions/update/TransformExpression.java
@@ -32,7 +32,7 @@ public TransformExpression(
     }
 
     public List<CopyDeclaration> getCopyDeclarations() {
-        return this.copyDeclarations;
+        return copyDeclarations;
     }
 
     public List<Expression> getCopySourceExpressions() {
@@ -43,11 +43,11 @@ public List<Expression> getCopySourceExpressions() {
     }
 
     public Expression getModifyExpression() {
-        return this.modifyExpression;
+        return modifyExpression;
     }
 
     public Expression getReturnExpression() {
-        return this.returnExpression;
+        return returnExpression;
     }
 
     @Override

diff --git a/src/main/java/org/rumbledb/items/ArrayItem.java b/src/main/java/org/rumbledb/items/ArrayItem.java
@@ -150,7 +150,7 @@ public int getMutabilityLevel() {
     @Override
     public void setMutabilityLevel(int mutabilityLevel) {
         this.mutabilityLevel = mutabilityLevel;
-        for (Item item : this.arrayItems) {
+        for (Item item : arrayItems) {
             item.setMutabilityLevel(mutabilityLevel);
         }
     }

diff --git a/src/main/java/org/rumbledb/items/ObjectItem.java b/src/main/java/org/rumbledb/items/ObjectItem.java
@@ -209,7 +209,7 @@ public int getMutabilityLevel() {
     @Override
     public void setMutabilityLevel(int mutabilityLevel) {
         this.mutabilityLevel = mutabilityLevel;
-        for (Item item : this.values) {
+        for (Item item : values) {
             item.setMutabilityLevel(mutabilityLevel);
         }
     }

diff --git a/src/main/java/org/rumbledb/parser/JsoniqLexer.java b/src/main/java/org/rumbledb/parser/JsoniqLexer.java
@@ -163,7 +163,7 @@ public Vocabulary getVocabulary() {
 
 	public JsoniqLexer(CharStream input) {
 		super(input);
-		this._interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
+		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
 	}
 
 	@Override