[MIN] XQuery: error message.

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/QueryCompiler.java

@@ -127,7 +127,10 @@ private void compile() throws QueryException {
   private static Scope circCheck(final Scope[] comp) throws QueryException {
     if(comp.length > 1) {
       for(final Scope scp : comp) {
-        if(scp instanceof StaticVar) throw circVarError((StaticVar) scp);
+        if(scp instanceof StaticVar) {
+          final StaticVar var = (StaticVar) scp;
+          //throw CIRCVAR_X.get(var.info, var.id());
+        }
       }
     }
     return comp[0];

basex-core/src/main/java/org/basex/query/QueryError.java

@@ -1590,15 +1590,6 @@ public static QueryException valueError(final Type type, final byte[] value,
     return INVALUE_X_X.get(info, type, value);
   }
 
-  /**
-   * Throws an exception for circular static variables.
-   * @param var variable expression
-   * @return never
-   */
-  public static QueryException circVarError(final StaticVar var) {
-    return CIRCVAR_X.get(var.info, var);
-  }
-
   /**
    * Chops the specified value to a maximum size.
    * @param value value

basex-core/src/main/java/org/basex/query/var/StaticVar.java

@@ -49,8 +49,8 @@ public final class StaticVar extends StaticDecl {
 
   @Override
   public void compile(final QueryContext qc) throws QueryException {
-    if(expr == null) throw VAREMPTY_X.get(info, '$' + Token.string(name.string()));
-    if(dontEnter) throw circVarError(this);
+    if(expr == null) throw VAREMPTY_X.get(info, name());
+    if(dontEnter) throw CIRCVAR_X.get(info, name());
 
     if(!compiled) {
       dontEnter = true;
@@ -80,12 +80,12 @@ public void compile(final QueryContext qc) throws QueryException {
    * @throws QueryException query exception
    */
   Value value(final QueryContext qc) throws QueryException {
-    if(dontEnter) throw circVarError(this);
+    if(dontEnter) throw CIRCVAR_X.get(info, name());
 
     if(lazy) {
       if(!compiled) throw Util.notExpected(this + " was not compiled.");
     } else {
-      if(expr == null) throw VAREMPTY_X.get(info, this);
+      if(expr == null) throw VAREMPTY_X.get(info, name());
     }
 
     if(val != null) return val;
@@ -150,7 +150,7 @@ public boolean visit(final ASTVisitor visitor) {
   @Override
   public String toString() {
     final TokenBuilder tb = new TokenBuilder(DECLARE).add(' ').addExt(anns);
-    tb.add(VARIABLE).add(' ').add(DOLLAR).add(name.string());
+    tb.add(VARIABLE).add(' ').add(name());
     if(type != null) tb.add(' ').add(AS).add(' ').addExt(type);
     if(external) tb.add(' ').add(EXTERNAL);
     if(expr != null) tb.add(' ').add(ASSIGN).add(' ').addExt(expr);
@@ -162,6 +162,14 @@ public byte[] id() {
     return Token.concat(new byte[] { '$' }, name.id());
   }
 
+  /**
+   * Returns the name of the variable.
+   * @return name
+   */
+  private String name() {
+    return new TokenBuilder().add(DOLLAR).add(name.string()).toString();
+  }
+
   /**
    * Checks if the expression bound to this variable has the given flag.
    * @param flag flag to check for