Remove 'module' remnants

4 files changed, 4 insertions, 20 deletions

diff --git a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4 b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4
index 7b93d0b6321..83971655226 100644
--- a/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4
+++ b/container-search/src/main/antlr4/com/yahoo/search/yql/yqlplus.g4
@@ -177,15 +177,6 @@ keyword_as_ident
 program : (statement SEMI?)* EOF
 	;
 
-moduleId
-    :  IDENTIFIER
-    ;
-    
-moduleName
-	: STRING
-	| namespaced_name
-	;
-
 statement
       : output_statement
 	  ;
diff --git a/container-search/src/main/java/com/yahoo/search/yql/ExpressionOperator.java b/container-search/src/main/java/com/yahoo/search/yql/ExpressionOperator.java
index 06a095df6dd..762d906585c 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/ExpressionOperator.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/ExpressionOperator.java
@@ -55,7 +55,6 @@ enum ExpressionOperator implements Operator {
 
     READ_RECORD(String.class),
     READ_FIELD(String.class, String.class),
-    READ_MODULE(TypeCheckers.LIST_OF_STRING),
 
     VESPA_GROUPING(String.class),
 
@@ -64,7 +63,7 @@ enum ExpressionOperator implements Operator {
     private final ArgumentsTypeChecker checker;
 
 
-    private ExpressionOperator(Object... types) {
+    ExpressionOperator(Object... types) {
         checker = TypeCheckers.make(this, types);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
index c75dfcd91d6..74f2894f04c 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
@@ -872,17 +872,11 @@ final class ProgramParser {
                         result = OperatorNode.create(loc, ExpressionOperator.READ_RECORD, alias);
                         start = 1;
                     }
-                } else if (scope.isBound(alias)) {
-                    return OperatorNode.create(loc, ExpressionOperator.READ_MODULE, scope.getBinding(alias).toPathWith(path.subList(1, path.size())));
                 } else if (scope.getCursors().size() == 1) {
                     alias = scope.getCursors().iterator().next();
                     result = OperatorNode.create(loc, ExpressionOperator.READ_FIELD, alias, path.get(0));
                     start = 1;
                 } else {
-                    // ah ha, we can't end up with a 'loose' UDF call because it
-                    // won't be a module or known alias
-                    // so we need not support implicit imports for constants used in
-                    // UDFs
                     throw new ProgramCompileException(loc, "Unknown field or alias '%s'", alias);
                 }
                 for (int idx = start; idx < path.size(); ++idx) {
@@ -932,7 +926,7 @@ final class ProgramParser {
             case yqlplusParser.LONG_INT:
                 return Long.parseLong(text.substring(0, text.length()-1));
             default:
-                throw new ProgramCompileException("Unknow literal type " + text);
+                throw new ProgramCompileException("Unknown literal type " + text);
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/ProjectionBuilder.java b/container-search/src/main/java/com/yahoo/search/yql/ProjectionBuilder.java
index ac7ac0334cc..e7ec28a9b97 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/ProjectionBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/ProjectionBuilder.java
@@ -9,8 +9,8 @@ import java.util.Set;
 
 class ProjectionBuilder {
 
-    private Map<String, OperatorNode<ExpressionOperator>> fields = Maps.newLinkedHashMap();
-    private Set<String> aliasNames = Sets.newHashSet();
+    private final Map<String, OperatorNode<ExpressionOperator>> fields = Maps.newLinkedHashMap();
+    private final Set<String> aliasNames = Sets.newHashSet();
 
     public void addField(String name, OperatorNode<ExpressionOperator> expr) {
         String aliasName = name;