You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/08 20:09:47 UTC

[1/4] qpid-jms git commit: NO-JIRA Remove javadoc warnings and code warnings from the selector package.

Repository: qpid-jms
Updated Branches:
  refs/heads/master c133d5906 -> 3fb96f273


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
index 1b2c2cb..1eae6de 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SimpleCharStream.java
@@ -19,470 +19,420 @@
 
 package org.apache.qpid.jms.selector.parser;
 
+import java.io.IOException;
+
 /**
- * An implementation of interface CharStream, where the stream is assumed to
- * contain only ASCII characters (without unicode processing).
+ * An implementation of interface CharStream, where the stream is assumed to contain only ASCII characters (without unicode processing).
  */
+public class SimpleCharStream {
+
+    /** Whether parser is static. */
+    public static final boolean staticFlag = false;
+    int bufsize;
+    int available;
+    int tokenBegin;
+    /** Position in buffer. */
+    public int bufpos = -1;
+    protected int bufline[];
+    protected int bufcolumn[];
+
+    protected int column = 0;
+    protected int line = 1;
+
+    protected boolean prevCharIsCR = false;
+    protected boolean prevCharIsLF = false;
+
+    protected java.io.Reader inputStream;
+
+    protected char[] buffer;
+    protected int maxNextCharInd = 0;
+    protected int inBuf = 0;
+    protected int tabSize = 8;
+
+    protected void setTabSize(int i) {
+        tabSize = i;
+    }
+
+    protected int getTabSize(int i) {
+        return tabSize;
+    }
+
+    protected void ExpandBuff(boolean wrapAround) {
+        char[] newbuffer = new char[bufsize + 2048];
+        int newbufline[] = new int[bufsize + 2048];
+        int newbufcolumn[] = new int[bufsize + 2048];
+
+        try {
+            if (wrapAround) {
+                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+                System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+                buffer = newbuffer;
+
+                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+                System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+                bufline = newbufline;
+
+                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+                System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+                bufcolumn = newbufcolumn;
 
-public class SimpleCharStream
-{
-/** Whether parser is static. */
-  public static final boolean staticFlag = false;
-  int bufsize;
-  int available;
-  int tokenBegin;
-/** Position in buffer. */
-  public int bufpos = -1;
-  protected int bufline[];
-  protected int bufcolumn[];
-
-  protected int column = 0;
-  protected int line = 1;
-
-  protected boolean prevCharIsCR = false;
-  protected boolean prevCharIsLF = false;
-
-  protected java.io.Reader inputStream;
-
-  protected char[] buffer;
-  protected int maxNextCharInd = 0;
-  protected int inBuf = 0;
-  protected int tabSize = 8;
-
-  protected void setTabSize(int i) { tabSize = i; }
-  protected int getTabSize(int i) { return tabSize; }
-
-
-  protected void ExpandBuff(boolean wrapAround)
-  {
-    char[] newbuffer = new char[bufsize + 2048];
-    int newbufline[] = new int[bufsize + 2048];
-    int newbufcolumn[] = new int[bufsize + 2048];
-
-    try
-    {
-      if (wrapAround)
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-        bufcolumn = newbufcolumn;
-
-        maxNextCharInd = (bufpos += (bufsize - tokenBegin));
-      }
-      else
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        bufcolumn = newbufcolumn;
-
-        maxNextCharInd = (bufpos -= tokenBegin);
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new Error(t.getMessage());
-    }
-
-
-    bufsize += 2048;
-    available = bufsize;
-    tokenBegin = 0;
-  }
-
-  protected void FillBuff() throws java.io.IOException
-  {
-    if (maxNextCharInd == available)
-    {
-      if (available == bufsize)
-      {
-        if (tokenBegin > 2048)
-        {
-          bufpos = maxNextCharInd = 0;
-          available = tokenBegin;
+                maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+            } else {
+                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+                buffer = newbuffer;
+
+                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+                bufline = newbufline;
+
+                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+                bufcolumn = newbufcolumn;
+
+                maxNextCharInd = (bufpos -= tokenBegin);
+            }
+        } catch (Throwable t) {
+            throw new Error(t.getMessage());
         }
-        else if (tokenBegin < 0)
-          bufpos = maxNextCharInd = 0;
-        else
-          ExpandBuff(false);
-      }
-      else if (available > tokenBegin)
+
+        bufsize += 2048;
         available = bufsize;
-      else if ((tokenBegin - available) < 2048)
-        ExpandBuff(true);
-      else
-        available = tokenBegin;
-    }
-
-    int i;
-    try {
-      if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1)
-      {
-        inputStream.close();
-        throw new java.io.IOException();
-      }
-      else
-        maxNextCharInd += i;
-      return;
-    }
-    catch(java.io.IOException e) {
-      --bufpos;
-      backup(0);
-      if (tokenBegin == -1)
+        tokenBegin = 0;
+    }
+
+    protected void FillBuff() throws java.io.IOException {
+        if (maxNextCharInd == available) {
+            if (available == bufsize) {
+                if (tokenBegin > 2048) {
+                    bufpos = maxNextCharInd = 0;
+                    available = tokenBegin;
+                } else if (tokenBegin < 0)
+                    bufpos = maxNextCharInd = 0;
+                else
+                    ExpandBuff(false);
+            } else if (available > tokenBegin)
+                available = bufsize;
+            else if ((tokenBegin - available) < 2048)
+                ExpandBuff(true);
+            else
+                available = tokenBegin;
+        }
+
+        int i;
+        try {
+            if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1) {
+                inputStream.close();
+                throw new java.io.IOException();
+            } else
+                maxNextCharInd += i;
+            return;
+        } catch (java.io.IOException e) {
+            --bufpos;
+            backup(0);
+            if (tokenBegin == -1)
+                tokenBegin = bufpos;
+            throw e;
+        }
+    }
+
+    /**
+     * @return the start token.
+     * @throws IOException if an error occurs reading the token.
+     */
+    public char BeginToken() throws java.io.IOException {
+        tokenBegin = -1;
+        char c = readChar();
         tokenBegin = bufpos;
-      throw e;
-    }
-  }
-
-/** Start. */
-  public char BeginToken() throws java.io.IOException
-  {
-    tokenBegin = -1;
-    char c = readChar();
-    tokenBegin = bufpos;
-
-    return c;
-  }
-
-  protected void UpdateLineColumn(char c)
-  {
-    column++;
-
-    if (prevCharIsLF)
-    {
-      prevCharIsLF = false;
-      line += (column = 1);
-    }
-    else if (prevCharIsCR)
-    {
-      prevCharIsCR = false;
-      if (c == '\n')
-      {
-        prevCharIsLF = true;
-      }
-      else
-        line += (column = 1);
-    }
-
-    switch (c)
-    {
-      case '\r' :
-        prevCharIsCR = true;
-        break;
-      case '\n' :
-        prevCharIsLF = true;
-        break;
-      case '\t' :
-        column--;
-        column += (tabSize - (column % tabSize));
-        break;
-      default :
-        break;
-    }
-
-    bufline[bufpos] = line;
-    bufcolumn[bufpos] = column;
-  }
-
-/** Read a character. */
-  public char readChar() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      return buffer[bufpos];
-    }
-
-    if (++bufpos >= maxNextCharInd)
-      FillBuff();
-
-    char c = buffer[bufpos];
-
-    UpdateLineColumn(c);
-    return c;
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndColumn
-   */
-
-  public int getColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndLine
-   */
-
-  public int getLine() {
-    return bufline[bufpos];
-  }
-
-  /** Get token end column number. */
-  public int getEndColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  /** Get token end line number. */
-  public int getEndLine() {
-     return bufline[bufpos];
-  }
-
-  /** Get token beginning column number. */
-  public int getBeginColumn() {
-    return bufcolumn[tokenBegin];
-  }
-
-  /** Get token beginning line number. */
-  public int getBeginLine() {
-    return bufline[tokenBegin];
-  }
-
-/** Backup a number of characters. */
-  public void backup(int amount) {
-
-    inBuf += amount;
-    if ((bufpos -= amount) < 0)
-      bufpos += bufsize;
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    available = bufsize = buffersize;
-    buffer = new char[buffersize];
-    bufline = new int[buffersize];
-    bufcolumn = new int[buffersize];
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream, int startline,
-                          int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    if (buffer == null || buffersize != buffer.length)
-    {
-      available = bufsize = buffersize;
-      buffer = new char[buffersize];
-      bufline = new int[buffersize];
-      bufcolumn = new int[buffersize];
-    }
-    prevCharIsLF = prevCharIsCR = false;
-    tokenBegin = inBuf = maxNextCharInd = 0;
-    bufpos = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, int startline,
-                          int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, 1, 1, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                          int startcolumn, int buffersize)
-  {
-    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                     int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, startline, startcolumn, 4096);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-  /** Get token literal value. */
-  public String GetImage()
-  {
-    if (bufpos >= tokenBegin)
-      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
-    else
-      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                            new String(buffer, 0, bufpos + 1);
-  }
-
-  /** Get the suffix. */
-  public char[] GetSuffix(int len)
-  {
-    char[] ret = new char[len];
-
-    if ((bufpos + 1) >= len)
-      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-    else
-    {
-      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                                                        len - bufpos - 1);
-      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-    }
-
-    return ret;
-  }
-
-  /** Reset buffer when finished. */
-  public void Done()
-  {
-    buffer = null;
-    bufline = null;
-    bufcolumn = null;
-  }
-
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-    int start = tokenBegin;
-    int len;
-
-    if (bufpos >= tokenBegin)
-    {
-      len = bufpos - tokenBegin + inBuf + 1;
-    }
-    else
-    {
-      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-    }
-
-    int i = 0, j = 0, k = 0;
-    int nextColDiff = 0, columnDiff = 0;
-
-    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-    {
-      bufline[j] = newLine;
-      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-      bufcolumn[j] = newCol + columnDiff;
-      columnDiff = nextColDiff;
-      i++;
-    }
-
-    if (i < len)
-    {
-      bufline[j] = newLine++;
-      bufcolumn[j] = newCol + columnDiff;
-
-      while (i++ < len)
-      {
-        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-          bufline[j] = newLine++;
+
+        return c;
+    }
+
+    protected void UpdateLineColumn(char c) {
+        column++;
+
+        if (prevCharIsLF) {
+            prevCharIsLF = false;
+            line += (column = 1);
+        } else if (prevCharIsCR) {
+            prevCharIsCR = false;
+            if (c == '\n') {
+                prevCharIsLF = true;
+            } else
+                line += (column = 1);
+        }
+
+        switch (c) {
+            case '\r':
+                prevCharIsCR = true;
+                break;
+            case '\n':
+                prevCharIsLF = true;
+                break;
+            case '\t':
+                column--;
+                column += (tabSize - (column % tabSize));
+                break;
+            default:
+                break;
+        }
+
+        bufline[bufpos] = line;
+        bufcolumn[bufpos] = column;
+    }
+
+    /**
+     * @return the next character from the stream.
+     *
+     * @throws IOException if an error occurs while reading from the stream.
+     */
+    public char readChar() throws java.io.IOException {
+        if (inBuf > 0) {
+            --inBuf;
+
+            if (++bufpos == bufsize)
+                bufpos = 0;
+
+            return buffer[bufpos];
+        }
+
+        if (++bufpos >= maxNextCharInd)
+            FillBuff();
+
+        char c = buffer[bufpos];
+
+        UpdateLineColumn(c);
+        return c;
+    }
+
+    /**
+     * @return token end column number.
+     * @deprecated("call getEndColumn instead")
+     * @see #getEndColumn
+     */
+    @Deprecated
+    public int getColumn() {
+        return bufcolumn[bufpos];
+    }
+
+    /**
+     * @return token end line number.
+     * @deprecated("call getEndLine instead")
+     * @see #getEndLine
+     */
+    @Deprecated
+    public int getLine() {
+        return bufline[bufpos];
+    }
+
+    /**
+     * @return token end column number.
+     */
+    public int getEndColumn() {
+        return bufcolumn[bufpos];
+    }
+
+    /**
+     * @return token end line number.
+     */
+    public int getEndLine() {
+        return bufline[bufpos];
+    }
+
+    /**
+     * @return token beginning column number.
+     */
+    public int getBeginColumn() {
+        return bufcolumn[tokenBegin];
+    }
+
+    /**
+     * @return token beginning line number.
+     */
+    public int getBeginLine() {
+        return bufline[tokenBegin];
+    }
+
+    /**
+     * Backup a number of characters.
+     *
+     *  @param amount the amount to backup.
+     */
+    public void backup(int amount) {
+        inBuf += amount;
+        if ((bufpos -= amount) < 0)
+            bufpos += bufsize;
+    }
+
+    public SimpleCharStream(java.io.Reader dstream, int startline, int startcolumn, int buffersize) {
+        inputStream = dstream;
+        line = startline;
+        column = startcolumn - 1;
+
+        available = bufsize = buffersize;
+        buffer = new char[buffersize];
+        bufline = new int[buffersize];
+        bufcolumn = new int[buffersize];
+    }
+
+    public SimpleCharStream(java.io.Reader dstream, int startline, int startcolumn) {
+        this(dstream, startline, startcolumn, 4096);
+    }
+
+    public SimpleCharStream(java.io.Reader dstream) {
+        this(dstream, 1, 1, 4096);
+    }
+
+    public void ReInit(java.io.Reader dstream, int startline, int startcolumn, int buffersize) {
+        inputStream = dstream;
+        line = startline;
+        column = startcolumn - 1;
+
+        if (buffer == null || buffersize != buffer.length) {
+            available = bufsize = buffersize;
+            buffer = new char[buffersize];
+            bufline = new int[buffersize];
+            bufcolumn = new int[buffersize];
+        }
+        prevCharIsLF = prevCharIsCR = false;
+        tokenBegin = inBuf = maxNextCharInd = 0;
+        bufpos = -1;
+    }
+
+    public void ReInit(java.io.Reader dstream, int startline, int startcolumn) {
+        ReInit(dstream, startline, startcolumn, 4096);
+    }
+
+    public void ReInit(java.io.Reader dstream) {
+        ReInit(dstream, 1, 1, 4096);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, int startcolumn, int buffersize)
+        throws java.io.UnsupportedEncodingException {
+        this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream, int startline, int startcolumn, int buffersize) {
+        this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, int startcolumn) throws java.io.UnsupportedEncodingException {
+        this(dstream, encoding, startline, startcolumn, 4096);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream, int startline, int startcolumn) {
+        this(dstream, startline, startcolumn, 4096);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException {
+        this(dstream, encoding, 1, 1, 4096);
+    }
+
+    public SimpleCharStream(java.io.InputStream dstream) {
+        this(dstream, 1, 1, 4096);
+    }
+
+    public void ReInit(java.io.InputStream dstream, String encoding, int startline, int startcolumn, int buffersize)
+        throws java.io.UnsupportedEncodingException {
+        ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+    }
+
+    public void ReInit(java.io.InputStream dstream, int startline, int startcolumn, int buffersize) {
+        ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+    }
+
+    public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException {
+        ReInit(dstream, encoding, 1, 1, 4096);
+    }
+
+    public void ReInit(java.io.InputStream dstream) {
+        ReInit(dstream, 1, 1, 4096);
+    }
+
+    public void ReInit(java.io.InputStream dstream, String encoding, int startline, int startcolumn) throws java.io.UnsupportedEncodingException {
+        ReInit(dstream, encoding, startline, startcolumn, 4096);
+    }
+
+    public void ReInit(java.io.InputStream dstream, int startline, int startcolumn) {
+        ReInit(dstream, startline, startcolumn, 4096);
+    }
+
+    /**
+     * @return Get token literal value.
+     */
+    public String GetImage() {
+        if (bufpos >= tokenBegin)
+            return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
         else
-          bufline[j] = newLine;
-      }
+            return new String(buffer, tokenBegin, bufsize - tokenBegin) + new String(buffer, 0, bufpos + 1);
     }
 
-    line = bufline[j];
-    column = bufcolumn[j];
-  }
+    /**
+     * Get the suffix.
+     *
+     * @param len
+     *      the length of the suffix.
+     *
+     * @return the suffix value.
+     */
+    public char[] GetSuffix(int len) {
+        char[] ret = new char[len];
+
+        if ((bufpos + 1) >= len)
+            System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+        else {
+            System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0, len - bufpos - 1);
+            System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+        }
 
+        return ret;
+    }
+
+    /** Reset buffer when finished. */
+    public void Done() {
+        buffer = null;
+        bufline = null;
+        bufcolumn = null;
+    }
+
+    /**
+     * Method to adjust line and column numbers for the start of a token.
+     *
+     * @param newLine the new line value.
+     * @param newCol the new column value.
+     */
+    public void adjustBeginLineColumn(int newLine, int newCol) {
+        int start = tokenBegin;
+        int len;
+
+        if (bufpos >= tokenBegin) {
+            len = bufpos - tokenBegin + inBuf + 1;
+        } else {
+            len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+        }
+
+        int i = 0, j = 0, k = 0;
+        int nextColDiff = 0, columnDiff = 0;
+
+        while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) {
+            bufline[j] = newLine;
+            nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+            bufcolumn[j] = newCol + columnDiff;
+            columnDiff = nextColDiff;
+            i++;
+        }
+
+        if (i < len) {
+            bufline[j] = newLine++;
+            bufcolumn[j] = newCol + columnDiff;
+
+            while (i++ < len) {
+                if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+                    bufline[j] = newLine++;
+                else
+                    bufline[j] = newLine;
+            }
+        }
+
+        line = bufline[j];
+        column = bufcolumn[j];
+    }
 }
 /* JavaCC - OriginalChecksum=ac8b2f4ec558af93922e83fa0aabd734 (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/Token.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/Token.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/Token.java
index 1a770ec..03c53df 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/Token.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/Token.java
@@ -22,127 +22,126 @@ package org.apache.qpid.jms.selector.parser;
 /**
  * Describes the input token stream.
  */
-
 public class Token implements java.io.Serializable {
 
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * An integer that describes the kind of this token.  This numbering
-   * system is determined by JavaCCParser, and a table of these numbers is
-   * stored in the file ...Constants.java.
-   */
-  public int kind;
-
-  /** The line number of the first character of this Token. */
-  public int beginLine;
-  /** The column number of the first character of this Token. */
-  public int beginColumn;
-  /** The line number of the last character of this Token. */
-  public int endLine;
-  /** The column number of the last character of this Token. */
-  public int endColumn;
-
-  /**
-   * The string image of the token.
-   */
-  public String image;
-
-  /**
-   * A reference to the next regular (non-special) token from the input
-   * stream.  If this is the last token from the input stream, or if the
-   * token manager has not read tokens beyond this one, this field is
-   * set to null.  This is true only if this token is also a regular
-   * token.  Otherwise, see below for a description of the contents of
-   * this field.
-   */
-  public Token next;
-
-  /**
-   * This field is used to access special tokens that occur prior to this
-   * token, but after the immediately preceding regular (non-special) token.
-   * If there are no such special tokens, this field is set to null.
-   * When there are more than one such special token, this field refers
-   * to the last of these special tokens, which in turn refers to the next
-   * previous special token through its specialToken field, and so on
-   * until the first special token (whose specialToken field is null).
-   * The next fields of special tokens refer to other special tokens that
-   * immediately follow it (without an intervening regular token).  If there
-   * is no such token, this field is null.
-   */
-  public Token specialToken;
-
-  /**
-   * An optional attribute value of the Token.
-   * Tokens which are not used as syntactic sugar will often contain
-   * meaningful values that will be used later on by the compiler or
-   * interpreter. This attribute value is often different from the image.
-   * Any subclass of Token that actually wants to return a non-null value can
-   * override this method as appropriate.
-   */
-  public Object getValue() {
-    return null;
-  }
-
-  /**
-   * No-argument constructor
-   */
-  public Token() {}
-
-  /**
-   * Constructs a new token for the specified Image.
-   */
-  public Token(int kind)
-  {
-    this(kind, null);
-  }
-
-  /**
-   * Constructs a new token for the specified Image and Kind.
-   */
-  public Token(int kind, String image)
-  {
-    this.kind = kind;
-    this.image = image;
-  }
-
-  /**
-   * Returns the image.
-   */
-  public String toString()
-  {
-    return image;
-  }
-
-  /**
-   * Returns a new Token object, by default. However, if you want, you
-   * can create and return subclass objects based on the value of ofKind.
-   * Simply add the cases to the switch for all those special cases.
-   * For example, if you have a subclass of Token called IDToken that
-   * you want to create if ofKind is ID, simply add something like :
-   *
-   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
-   *
-   * to the following switch statement. Then you can cast matchedToken
-   * variable to the appropriate type and use sit in your lexical actions.
-   */
-  public static Token newToken(int ofKind, String image)
-  {
-    switch(ofKind)
-    {
-      default : return new Token(ofKind, image);
+    /**
+     * The version identifier for this Serializable class. Increment only if the <i>serialized</i>
+     * form of the class changes.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * An integer that describes the kind of this token. This numbering system is determined by
+     * JavaCCParser, and a table of these numbers is stored in the file...Constants.java.
+     */
+    public int kind;
+
+    /** The line number of the first character of this Token. */
+    public int beginLine;
+    /** The column number of the first character of this Token. */
+    public int beginColumn;
+    /** The line number of the last character of this Token. */
+    public int endLine;
+    /** The column number of the last character of this Token. */
+    public int endColumn;
+
+    /**
+     * The string image of the token.
+     */
+    public String image;
+
+    /**
+     * A reference to the next regular (non-special) token from the input stream. If this is the last
+     * token from the input stream, or if the token manager has not read tokens beyond this one, this
+     * field is set to null. This is true only if this token is also a regular token. Otherwise, see
+     * below for a description of the contents of this field.
+     */
+    public Token next;
+
+    /**
+     * This field is used to access special tokens that occur prior to this token, but after the
+     * immediately preceding regular (non-special) token. If there are no such special tokens, this
+     * field is set to null. When there are more than one such special token, this field refers to
+     * the last of these special tokens, which in turn refers to the next previous special token
+     * through its specialToken field, and so on until the first special token (whose specialToken
+     * field is null). The next fields of special tokens refer to other special tokens that
+     * immediately follow it (without an intervening regular token). If there is no such token, this
+     * field is null.
+     */
+    public Token specialToken;
+
+    /**
+     * An optional attribute value of the Token. Tokens which are not used as syntactic sugar will
+     * often contain meaningful values that will be used later on by the compiler or interpreter.
+     * This attribute value is often different from the image. Any subclass of Token that actually
+     * wants to return a non-null value can override this method as appropriate.
+     *
+     * @return the current value.
+     */
+    public Object getValue() {
+        return null;
+    }
+
+    /**
+     * No-argument constructor
+     */
+    public Token() {
+    }
+
+    /**
+     * Constructs a new token for the specified Image.
+     *
+     * @param kind
+     *     The kind value for this token.
+     */
+    public Token(int kind) {
+        this(kind, null);
+    }
+
+    /**
+     * Constructs a new token for the specified Image and Kind.
+     *
+     * @param kind
+     *     The kind value for this token.
+     * @param image
+     *      The image value for this token.
+     */
+    public Token(int kind, String image) {
+        this.kind = kind;
+        this.image = image;
+    }
+
+    @Override
+    public String toString() {
+        return image;
     }
-  }
 
-  public static Token newToken(int ofKind)
-  {
-    return newToken(ofKind, null);
-  }
+    /**
+     * Returns a new Token object, by default. However, if you want, you can create and return subclass
+     * objects based on the value of ofKind. Simply add the cases to the switch for all those special
+     * cases. For example, if you have a subclass of Token called IDToken that you want to create if
+     * ofKind is ID, simply add something like :
+     *
+     * case MyParserConstants.ID : return new IDToken(ofKind, image);
+     *
+     * to the following switch statement. Then you can cast matchedToken variable to the appropriate
+     * type and use sit in your lexical actions.
+     *
+     * @param ofKind the kind value for the target token.
+     * @param image the image value for the target token.
+     *
+     * @return a new token of the requested kind.
+     */
+    public static Token newToken(int ofKind, String image) {
+        switch (ofKind) {
+            default:
+                return new Token(ofKind, image);
+        }
+    }
+
+    public static Token newToken(int ofKind) {
+        return newToken(ofKind, null);
+    }
 
 }
 /* JavaCC - OriginalChecksum=b9718943b752e42fc7fc14fc13768b7b (do not edit this line) */

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/TokenMgrError.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/TokenMgrError.java
index 7641a2d..4670dc2 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/TokenMgrError.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/TokenMgrError.java
@@ -20,145 +20,127 @@
 package org.apache.qpid.jms.selector.parser;
 
 /** Token Manager Error. */
-public class TokenMgrError extends Error
-{
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /*
-   * Ordinals for various reasons why an Error of this type can be thrown.
-   */
-
-  /**
-   * Lexical error occurred.
-   */
-  static final int LEXICAL_ERROR = 0;
-
-  /**
-   * An attempt was made to create a second instance of a static token manager.
-   */
-  static final int STATIC_LEXER_ERROR = 1;
-
-  /**
-   * Tried to change to an invalid lexical state.
-   */
-  static final int INVALID_LEXICAL_STATE = 2;
-
-  /**
-   * Detected (and bailed out of) an infinite loop in the token manager.
-   */
-  static final int LOOP_DETECTED = 3;
-
-  /**
-   * Indicates the reason why the exception is thrown. It will have
-   * one of the above 4 values.
-   */
-  int errorCode;
-
-  /**
-   * Replaces unprintable characters by their escaped (or unicode escaped)
-   * equivalents in the given string
-   */
-  protected static final String addEscapes(String str) {
-    StringBuffer retval = new StringBuffer();
-    char ch;
-    for (int i = 0; i < str.length(); i++) {
-      switch (str.charAt(i))
-      {
-        case 0 :
-          continue;
-        case '\b':
-          retval.append("\\b");
-          continue;
-        case '\t':
-          retval.append("\\t");
-          continue;
-        case '\n':
-          retval.append("\\n");
-          continue;
-        case '\f':
-          retval.append("\\f");
-          continue;
-        case '\r':
-          retval.append("\\r");
-          continue;
-        case '\"':
-          retval.append("\\\"");
-          continue;
-        case '\'':
-          retval.append("\\\'");
-          continue;
-        case '\\':
-          retval.append("\\\\");
-          continue;
-        default:
-          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-            String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-          } else {
-            retval.append(ch);
-          }
-          continue;
-      }
+public class TokenMgrError extends Error {
+
+    /**
+     * The version identifier for this Serializable class. Increment only if the <i>serialized</i> form of the class changes.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Ordinals for various reasons why an Error of this type can be thrown.
+     */
+
+    /**
+     * Lexical error occurred.
+     */
+    static final int LEXICAL_ERROR = 0;
+
+    /**
+     * An attempt was made to create a second instance of a static token manager.
+     */
+    static final int STATIC_LEXER_ERROR = 1;
+
+    /**
+     * Tried to change to an invalid lexical state.
+     */
+    static final int INVALID_LEXICAL_STATE = 2;
+
+    /**
+     * Detected (and bailed out of) an infinite loop in the token manager.
+     */
+    static final int LOOP_DETECTED = 3;
+
+    /**
+     * Indicates the reason why the exception is thrown. It will have one of the above 4 values.
+     */
+    int errorCode;
+
+    /**
+     * Replaces unprintable characters by their escaped (or unicode escaped) equivalents in the given string
+     */
+    protected static final String addEscapes(String str) {
+        StringBuffer retval = new StringBuffer();
+        char ch;
+        for (int i = 0; i < str.length(); i++) {
+            switch (str.charAt(i)) {
+                case 0:
+                    continue;
+                case '\b':
+                    retval.append("\\b");
+                    continue;
+                case '\t':
+                    retval.append("\\t");
+                    continue;
+                case '\n':
+                    retval.append("\\n");
+                    continue;
+                case '\f':
+                    retval.append("\\f");
+                    continue;
+                case '\r':
+                    retval.append("\\r");
+                    continue;
+                case '\"':
+                    retval.append("\\\"");
+                    continue;
+                case '\'':
+                    retval.append("\\\'");
+                    continue;
+                case '\\':
+                    retval.append("\\\\");
+                    continue;
+                default:
+                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                        String s = "0000" + Integer.toString(ch, 16);
+                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                    } else {
+                        retval.append(ch);
+                    }
+                    continue;
+            }
+        }
+        return retval.toString();
+    }
+
+    /**
+     * Returns a detailed message for the Error when it is thrown by the token manager to indicate a lexical error. Parameters : EOFSeen : indicates if EOF
+     * caused the lexical error curLexState : lexical state in which this error occurred errorLine : line number when the error occurred errorColumn : column
+     * number when the error occurred errorAfter : prefix that was seen before this error occurred curchar : the offending character Note: You can customize the
+     * lexical error message by modifying this method.
+     */
+    protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+        return ("Lexical error at line " + errorLine + ", column " + errorColumn + ".  Encountered: "
+            + (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") + "after : \"" + addEscapes(errorAfter) + "\"");
+    }
+
+    /**
+     * You can also modify the body of this method to customize your error messages. For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not of
+     * end-users concern, so you can return something like :
+     *
+     * "Internal Error : Please file a bug report .... "
+     *
+     * from this method for such cases in the release version of your parser.
+     */
+    @Override
+    public String getMessage() {
+        return super.getMessage();
+    }
+
+    /*
+     * Constructors of various flavors follow.
+     */
+
+    public TokenMgrError() {
+    }
+
+    public TokenMgrError(String message, int reason) {
+        super(message);
+        errorCode = reason;
+    }
+
+    public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+        this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
     }
-    return retval.toString();
-  }
-
-  /**
-   * Returns a detailed message for the Error when it is thrown by the
-   * token manager to indicate a lexical error.
-   * Parameters :
-   *    EOFSeen     : indicates if EOF caused the lexical error
-   *    curLexState : lexical state in which this error occurred
-   *    errorLine   : line number when the error occurred
-   *    errorColumn : column number when the error occurred
-   *    errorAfter  : prefix that was seen before this error occurred
-   *    curchar     : the offending character
-   * Note: You can customize the lexical error message by modifying this method.
-   */
-  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
-    return("Lexical error at line " +
-          errorLine + ", column " +
-          errorColumn + ".  Encountered: " +
-          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
-          "after : \"" + addEscapes(errorAfter) + "\"");
-  }
-
-  /**
-   * You can also modify the body of this method to customize your error messages.
-   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-   * of end-users concern, so you can return something like :
-   *
-   *     "Internal Error : Please file a bug report .... "
-   *
-   * from this method for such cases in the release version of your parser.
-   */
-  public String getMessage() {
-    return super.getMessage();
-  }
-
-  /*
-   * Constructors of various flavors follow.
-   */
-
-  /** No arg constructor. */
-  public TokenMgrError() {
-  }
-
-  /** Constructor with message and reason. */
-  public TokenMgrError(String message, int reason) {
-    super(message);
-    errorCode = reason;
-  }
-
-  /** Full Constructor. */
-  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
-    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-  }
 }
 /* JavaCC - OriginalChecksum=d6ce109ac323f91d226065fc1a725fea (do not edit this line) */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[3/4] qpid-jms git commit: NO-JIRA Remove javadoc warnings and code warnings from the selector package.

Posted by ta...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImpl.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImpl.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImpl.java
index af38b38..3c0bcee 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImpl.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImpl.java
@@ -18,10 +18,16 @@
 
 package org.apache.qpid.jms.selector.parser;
 
-import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
 
-import org.apache.qpid.jms.selector.filter.*;
+import org.apache.qpid.jms.selector.filter.ArithmeticExpression;
+import org.apache.qpid.jms.selector.filter.BooleanExpression;
+import org.apache.qpid.jms.selector.filter.ComparisonExpression;
+import org.apache.qpid.jms.selector.filter.ConstantExpression;
+import org.apache.qpid.jms.selector.filter.Expression;
+import org.apache.qpid.jms.selector.filter.LogicExpression;
+import org.apache.qpid.jms.selector.filter.PropertyExpression;
+import org.apache.qpid.jms.selector.filter.UnaryExpression;
 
 /**
  * JMS Selector Parser generated by JavaCC
@@ -29,1165 +35,1360 @@ import org.apache.qpid.jms.selector.filter.*;
  * Do not edit this .java file directly - it is generated from SelectorParserImpl.jj
  * Edit SelectorParserImpl.jj and rebuild with the 'generate-selector-parser' profile.
  */
+@SuppressWarnings("unused")
 public class SelectorParserImpl implements SelectorParserImplConstants {
-    private BooleanExpression asBooleanExpression(Expression value) throws ParseException  {
+    private BooleanExpression asBooleanExpression(Expression value) throws ParseException {
         if (value instanceof BooleanExpression) {
             return (BooleanExpression) value;
         }
         if (value instanceof PropertyExpression) {
-            return UnaryExpression.createBooleanCast( value );
+            return UnaryExpression.createBooleanCast(value);
         }
         throw new ParseException("Expression will not result in a boolean value: " + value);
     }
 
-// ----------------------------------------------------------------------------
-// Grammer
-// ----------------------------------------------------------------------------
-  final public BooleanExpression JmsSelector() throws ParseException {
-    Expression left=null;
-    left = orExpression();
-        {if (true) return asBooleanExpression(left);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression orExpression() throws ParseException {
-    Expression left;
-    Expression right;
-    left = andExpression();
-    label_1:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case OR:
-        ;
-        break;
-      default:
-        break label_1;
-      }
-      jj_consume_token(OR);
-      right = andExpression();
-                left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression andExpression() throws ParseException {
-    Expression left;
-    Expression right;
-    left = equalityExpression();
-    label_2:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case AND:
-        ;
-        break;
-      default:
-        break label_2;
-      }
-      jj_consume_token(AND);
-      right = equalityExpression();
-                left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression equalityExpression() throws ParseException {
-    Expression left;
-    Expression right;
-    left = comparisonExpression();
-    label_3:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case IS:
-      case 27:
-      case 28:
-        ;
-        break;
-      default:
-        break label_3;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 27:
-        jj_consume_token(27);
-        right = comparisonExpression();
-                left = ComparisonExpression.createEqual(left, right);
-        break;
-      case 28:
-        jj_consume_token(28);
-        right = comparisonExpression();
-                left = ComparisonExpression.createNotEqual(left, right);
-        break;
-      default:
-        if (jj_2_1(2)) {
-          jj_consume_token(IS);
-          jj_consume_token(NULL);
-                left = ComparisonExpression.createIsNull(left);
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case IS:
-            jj_consume_token(IS);
-            jj_consume_token(NOT);
-            jj_consume_token(NULL);
-                left = ComparisonExpression.createIsNotNull(left);
-            break;
-          default:
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
+    // ----------------------------------------------------------------------------
+    // Grammer
+    // ----------------------------------------------------------------------------
+    final public BooleanExpression JmsSelector() throws ParseException {
+        Expression left = null;
+        left = orExpression();
+        {
+            if (true)
+                return asBooleanExpression(left);
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression orExpression() throws ParseException {
+        Expression left;
+        Expression right;
+        left = andExpression();
+        label_1: while (true) {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case OR:
+                    ;
+                    break;
+                default:
+                    break label_1;
+            }
+            jj_consume_token(OR);
+            right = andExpression();
+            left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression andExpression() throws ParseException {
+        Expression left;
+        Expression right;
+        left = equalityExpression();
+        label_2: while (true) {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case AND:
+                    ;
+                    break;
+                default:
+                    break label_2;
+            }
+            jj_consume_token(AND);
+            right = equalityExpression();
+            left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression equalityExpression() throws ParseException {
+        Expression left;
+        Expression right;
+        left = comparisonExpression();
+        label_3: while (true) {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case IS:
+                case 27:
+                case 28:
+                    ;
+                    break;
+                default:
+                    break label_3;
+            }
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 27:
+                    jj_consume_token(27);
+                    right = comparisonExpression();
+                    left = ComparisonExpression.createEqual(left, right);
+                    break;
+                case 28:
+                    jj_consume_token(28);
+                    right = comparisonExpression();
+                    left = ComparisonExpression.createNotEqual(left, right);
+                    break;
+                default:
+                    if (jj_2_1(2)) {
+                        jj_consume_token(IS);
+                        jj_consume_token(NULL);
+                        left = ComparisonExpression.createIsNull(left);
+                    } else {
+                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                            case IS:
+                                jj_consume_token(IS);
+                                jj_consume_token(NOT);
+                                jj_consume_token(NULL);
+                                left = ComparisonExpression.createIsNotNull(left);
+                                break;
+                            default:
+                                jj_consume_token(-1);
+                                throw new ParseException();
+                        }
+                    }
+            }
+        }
+        {
+            if (true)
+                return left;
         }
-      }
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression comparisonExpression() throws ParseException {
-    Expression left;
-    Expression right;
-    Expression low;
-    Expression high;
-    String t, u;
-    boolean not;
-    ArrayList list;
-    left = addExpression();
-    label_4:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case NOT:
-      case BETWEEN:
-      case LIKE:
-      case IN:
-      case 29:
-      case 30:
-      case 31:
-      case 32:
-        ;
-        break;
-      default:
-        break label_4;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 29:
-        jj_consume_token(29);
-        right = addExpression();
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression comparisonExpression() throws ParseException {
+        Expression left;
+        Expression right;
+        Expression low;
+        Expression high;
+        String t, u;
+        boolean not;
+        ArrayList<Object> list;
+        left = addExpression();
+        label_4: while (true) {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case NOT:
+                case BETWEEN:
+                case LIKE:
+                case IN:
+                case 29:
+                case 30:
+                case 31:
+                case 32:
+                    ;
+                    break;
+                default:
+                    break label_4;
+            }
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 29:
+                    jj_consume_token(29);
+                    right = addExpression();
                     left = ComparisonExpression.createGreaterThan(left, right);
-        break;
-      case 30:
-        jj_consume_token(30);
-        right = addExpression();
+                    break;
+                case 30:
+                    jj_consume_token(30);
+                    right = addExpression();
                     left = ComparisonExpression.createGreaterThanEqual(left, right);
-        break;
-      case 31:
-        jj_consume_token(31);
-        right = addExpression();
+                    break;
+                case 31:
+                    jj_consume_token(31);
+                    right = addExpression();
                     left = ComparisonExpression.createLessThan(left, right);
-        break;
-      case 32:
-        jj_consume_token(32);
-        right = addExpression();
+                    break;
+                case 32:
+                    jj_consume_token(32);
+                    right = addExpression();
                     left = ComparisonExpression.createLessThanEqual(left, right);
-        break;
-      case LIKE:
-                    u=null;
-        jj_consume_token(LIKE);
-        t = stringLitteral();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case ESCAPE:
-          jj_consume_token(ESCAPE);
-          u = stringLitteral();
-          break;
-        default:
-          ;
-        }
+                    break;
+                case LIKE:
+                    u = null;
+                    jj_consume_token(LIKE);
+                    t = stringLitteral();
+                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                        case ESCAPE:
+                            jj_consume_token(ESCAPE);
+                            u = stringLitteral();
+                            break;
+                        default:
+                            ;
+                    }
                     left = ComparisonExpression.createLike(left, t, u);
-        break;
-      default:
-        if (jj_2_2(2)) {
-                    u=null;
-          jj_consume_token(NOT);
-          jj_consume_token(LIKE);
-          t = stringLitteral();
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case ESCAPE:
-            jj_consume_token(ESCAPE);
-            u = stringLitteral();
-            break;
-          default:
-            ;
-          }
-                    left = ComparisonExpression.createNotLike(left, t, u);
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case BETWEEN:
-            jj_consume_token(BETWEEN);
-            low = addExpression();
-            jj_consume_token(AND);
-            high = addExpression();
-                    left = ComparisonExpression.createBetween(left, low, high);
-            break;
-          default:
-            if (jj_2_3(2)) {
-              jj_consume_token(NOT);
-              jj_consume_token(BETWEEN);
-              low = addExpression();
-              jj_consume_token(AND);
-              high = addExpression();
-                    left = ComparisonExpression.createNotBetween(left, low, high);
+                    break;
+                default:
+                    if (jj_2_2(2)) {
+                        u = null;
+                        jj_consume_token(NOT);
+                        jj_consume_token(LIKE);
+                        t = stringLitteral();
+                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                            case ESCAPE:
+                                jj_consume_token(ESCAPE);
+                                u = stringLitteral();
+                                break;
+                            default:
+                                ;
+                        }
+                        left = ComparisonExpression.createNotLike(left, t, u);
+                    } else {
+                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                            case BETWEEN:
+                                jj_consume_token(BETWEEN);
+                                low = addExpression();
+                                jj_consume_token(AND);
+                                high = addExpression();
+                                left = ComparisonExpression.createBetween(left, low, high);
+                                break;
+                            default:
+                                if (jj_2_3(2)) {
+                                    jj_consume_token(NOT);
+                                    jj_consume_token(BETWEEN);
+                                    low = addExpression();
+                                    jj_consume_token(AND);
+                                    high = addExpression();
+                                    left = ComparisonExpression.createNotBetween(left, low, high);
+                                } else {
+                                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                                        case IN:
+                                            jj_consume_token(IN);
+                                            jj_consume_token(33);
+                                            t = stringLitteral();
+                                            list = new ArrayList<Object>();
+                                            list.add(t);
+                                            label_5: while (true) {
+                                                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                                                    case 34:
+                                                        ;
+                                                        break;
+                                                    default:
+                                                        break label_5;
+                                                }
+                                                jj_consume_token(34);
+                                                t = stringLitteral();
+                                                list.add(t);
+                                            }
+                                            jj_consume_token(35);
+                                            left = ComparisonExpression.createInFilter(left, list);
+                                            break;
+                                        default:
+                                            if (jj_2_4(2)) {
+                                                jj_consume_token(NOT);
+                                                jj_consume_token(IN);
+                                                jj_consume_token(33);
+                                                t = stringLitteral();
+                                                list = new ArrayList<Object>();
+                                                list.add(t);
+                                                label_6: while (true) {
+                                                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                                                        case 34:
+                                                            ;
+                                                            break;
+                                                        default:
+                                                            break label_6;
+                                                    }
+                                                    jj_consume_token(34);
+                                                    t = stringLitteral();
+                                                    list.add(t);
+                                                }
+                                                jj_consume_token(35);
+                                                left = ComparisonExpression.createNotInFilter(left, list);
+                                            } else {
+                                                jj_consume_token(-1);
+                                                throw new ParseException();
+                                            }
+                                    }
+                                }
+                        }
+                    }
+            }
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression addExpression() throws ParseException {
+        Expression left;
+        Expression right;
+        left = multExpr();
+        label_7: while (true) {
+            if (jj_2_5(2147483647)) {
+                ;
             } else {
-              switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-              case IN:
-                jj_consume_token(IN);
-                jj_consume_token(33);
-                t = stringLitteral();
-                        list = new ArrayList();
-                        list.add( t );
-                label_5:
-                while (true) {
-                  switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-                  case 34:
+                break label_7;
+            }
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 36:
+                    jj_consume_token(36);
+                    right = multExpr();
+                    left = ArithmeticExpression.createPlus(left, right);
+                    break;
+                case 37:
+                    jj_consume_token(37);
+                    right = multExpr();
+                    left = ArithmeticExpression.createMinus(left, right);
+                    break;
+                default:
+                    jj_consume_token(-1);
+                    throw new ParseException();
+            }
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression multExpr() throws ParseException {
+        Expression left;
+        Expression right;
+        left = unaryExpr();
+        label_8: while (true) {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 38:
+                case 39:
+                case 40:
                     ;
                     break;
-                  default:
-                    break label_5;
-                  }
-                  jj_consume_token(34);
-                  t = stringLitteral();
-                            list.add( t );
-                }
+                default:
+                    break label_8;
+            }
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 38:
+                    jj_consume_token(38);
+                    right = unaryExpr();
+                    left = ArithmeticExpression.createMultiply(left, right);
+                    break;
+                case 39:
+                    jj_consume_token(39);
+                    right = unaryExpr();
+                    left = ArithmeticExpression.createDivide(left, right);
+                    break;
+                case 40:
+                    jj_consume_token(40);
+                    right = unaryExpr();
+                    left = ArithmeticExpression.createMod(left, right);
+                    break;
+                default:
+                    jj_consume_token(-1);
+                    throw new ParseException();
+            }
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression unaryExpr() throws ParseException {
+        String s = null;
+        Expression left = null;
+        if (jj_2_6(2147483647)) {
+            jj_consume_token(36);
+            left = unaryExpr();
+        } else {
+            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                case 37:
+                    jj_consume_token(37);
+                    left = unaryExpr();
+                    left = UnaryExpression.createNegate(left);
+                    break;
+                case NOT:
+                    jj_consume_token(NOT);
+                    left = unaryExpr();
+                    left = UnaryExpression.createNOT(asBooleanExpression(left));
+                    break;
+                case TRUE:
+                case FALSE:
+                case NULL:
+                case DECIMAL_LITERAL:
+                case HEX_LITERAL:
+                case OCTAL_LITERAL:
+                case FLOATING_POINT_LITERAL:
+                case STRING_LITERAL:
+                case ID:
+                case QUOTED_ID:
+                case 33:
+                    left = primaryExpr();
+                    break;
+                default:
+                    jj_consume_token(-1);
+                    throw new ParseException();
+            }
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Expression primaryExpr() throws ParseException {
+        Expression left = null;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case TRUE:
+            case FALSE:
+            case NULL:
+            case DECIMAL_LITERAL:
+            case HEX_LITERAL:
+            case OCTAL_LITERAL:
+            case FLOATING_POINT_LITERAL:
+            case STRING_LITERAL:
+                left = literal();
+                break;
+            case ID:
+            case QUOTED_ID:
+                left = variable();
+                break;
+            case 33:
+                jj_consume_token(33);
+                left = orExpression();
                 jj_consume_token(35);
-                   left = ComparisonExpression.createInFilter(left, list);
                 break;
-              default:
-                if (jj_2_4(2)) {
-                  jj_consume_token(NOT);
-                  jj_consume_token(IN);
-                  jj_consume_token(33);
-                  t = stringLitteral();
-                        list = new ArrayList();
-                        list.add( t );
-                  label_6:
-                  while (true) {
-                    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-                    case 34:
-                      ;
-                      break;
-                    default:
-                      break label_6;
-                    }
-                    jj_consume_token(34);
-                    t = stringLitteral();
-                            list.add( t );
-                  }
-                  jj_consume_token(35);
-                   left = ComparisonExpression.createNotInFilter(left, list);
-                } else {
-                  jj_consume_token(-1);
-                  throw new ParseException();
-                }
-              }
-            }
-          }
+            default:
+                jj_consume_token(-1);
+                throw new ParseException();
         }
-      }
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression addExpression() throws ParseException {
-    Expression left;
-    Expression right;
-    left = multExpr();
-    label_7:
-    while (true) {
-      if (jj_2_5(2147483647)) {
-        ;
-      } else {
-        break label_7;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 36:
-        jj_consume_token(36);
-        right = multExpr();
-                left = ArithmeticExpression.createPlus(left, right);
-        break;
-      case 37:
-        jj_consume_token(37);
-        right = multExpr();
-                left = ArithmeticExpression.createMinus(left, right);
-        break;
-      default:
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression multExpr() throws ParseException {
-    Expression left;
-    Expression right;
-    left = unaryExpr();
-    label_8:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 38:
-      case 39:
-      case 40:
-        ;
-        break;
-      default:
-        break label_8;
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 38:
-        jj_consume_token(38);
-        right = unaryExpr();
-            left = ArithmeticExpression.createMultiply(left, right);
-        break;
-      case 39:
-        jj_consume_token(39);
-        right = unaryExpr();
-            left = ArithmeticExpression.createDivide(left, right);
-        break;
-      case 40:
-        jj_consume_token(40);
-        right = unaryExpr();
-            left = ArithmeticExpression.createMod(left, right);
-        break;
-      default:
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression unaryExpr() throws ParseException {
-    String s=null;
-    Expression left=null;
-    if (jj_2_6(2147483647)) {
-      jj_consume_token(36);
-      left = unaryExpr();
-    } else {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 37:
-        jj_consume_token(37);
-        left = unaryExpr();
-            left = UnaryExpression.createNegate(left);
-        break;
-      case NOT:
-        jj_consume_token(NOT);
-        left = unaryExpr();
-            left = UnaryExpression.createNOT( asBooleanExpression(left) );
-        break;
-      case TRUE:
-      case FALSE:
-      case NULL:
-      case DECIMAL_LITERAL:
-      case HEX_LITERAL:
-      case OCTAL_LITERAL:
-      case FLOATING_POINT_LITERAL:
-      case STRING_LITERAL:
-      case ID:
-      case QUOTED_ID:
-      case 33:
-        left = primaryExpr();
-        break;
-      default:
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Expression primaryExpr() throws ParseException {
-    Expression left=null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case TRUE:
-    case FALSE:
-    case NULL:
-    case DECIMAL_LITERAL:
-    case HEX_LITERAL:
-    case OCTAL_LITERAL:
-    case FLOATING_POINT_LITERAL:
-    case STRING_LITERAL:
-      left = literal();
-      break;
-    case ID:
-    case QUOTED_ID:
-      left = variable();
-      break;
-    case 33:
-      jj_consume_token(33);
-      left = orExpression();
-      jj_consume_token(35);
-      break;
-    default:
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public ConstantExpression literal() throws ParseException {
-    Token t;
-    String s;
-    ConstantExpression left=null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case STRING_LITERAL:
-      s = stringLitteral();
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public ConstantExpression literal() throws ParseException {
+        Token t;
+        String s;
+        ConstantExpression left = null;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case STRING_LITERAL:
+                s = stringLitteral();
                 left = new ConstantExpression(s);
-      break;
-    case DECIMAL_LITERAL:
-      t = jj_consume_token(DECIMAL_LITERAL);
+                break;
+            case DECIMAL_LITERAL:
+                t = jj_consume_token(DECIMAL_LITERAL);
                 left = ConstantExpression.createFromDecimal(t.image);
-      break;
-    case HEX_LITERAL:
-      t = jj_consume_token(HEX_LITERAL);
+                break;
+            case HEX_LITERAL:
+                t = jj_consume_token(HEX_LITERAL);
                 left = ConstantExpression.createFromHex(t.image);
-      break;
-    case OCTAL_LITERAL:
-      t = jj_consume_token(OCTAL_LITERAL);
+                break;
+            case OCTAL_LITERAL:
+                t = jj_consume_token(OCTAL_LITERAL);
                 left = ConstantExpression.createFromOctal(t.image);
-      break;
-    case FLOATING_POINT_LITERAL:
-      t = jj_consume_token(FLOATING_POINT_LITERAL);
+                break;
+            case FLOATING_POINT_LITERAL:
+                t = jj_consume_token(FLOATING_POINT_LITERAL);
                 left = ConstantExpression.createFloat(t.image);
-      break;
-    case TRUE:
-      jj_consume_token(TRUE);
+                break;
+            case TRUE:
+                jj_consume_token(TRUE);
                 left = ConstantExpression.TRUE;
-      break;
-    case FALSE:
-      jj_consume_token(FALSE);
+                break;
+            case FALSE:
+                jj_consume_token(FALSE);
                 left = ConstantExpression.FALSE;
-      break;
-    case NULL:
-      jj_consume_token(NULL);
+                break;
+            case NULL:
+                jj_consume_token(NULL);
                 left = ConstantExpression.NULL;
-      break;
-    default:
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String stringLitteral() throws ParseException {
-    Token t;
-    StringBuffer rc = new StringBuffer();
-    boolean first=true;
-    t = jj_consume_token(STRING_LITERAL);
+                break;
+            default:
+                jj_consume_token(-1);
+                throw new ParseException();
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public String stringLitteral() throws ParseException {
+        Token t;
+        StringBuffer rc = new StringBuffer();
+        boolean first = true;
+        t = jj_consume_token(STRING_LITERAL);
         // Decode the sting value.
         String image = t.image;
-        for( int i=1; i < image.length()-1; i++ ) {
+        for (int i = 1; i < image.length() - 1; i++) {
             char c = image.charAt(i);
-            if( c == '\u005c'' )
+            if (c == '\u005c'')
                 i++;
-               rc.append(c);
+            rc.append(c);
+        }
+        {
+            if (true)
+                return rc.toString();
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public PropertyExpression variable() throws ParseException {
+        Token t;
+        PropertyExpression left = null;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case ID:
+                t = jj_consume_token(ID);
+                left = new PropertyExpression(t.image);
+                break;
+            case QUOTED_ID:
+                t = jj_consume_token(QUOTED_ID);
+                // Decode the string value.
+                StringBuffer rc = new StringBuffer();
+                String image = t.image;
+                for (int i = 1; i < image.length() - 1; i++) {
+                    char c = image.charAt(i);
+                    if (c == '"')
+                        i++;
+                    rc.append(c);
+                }
+                {
+                    if (true)
+                        return new PropertyExpression(rc.toString());
+                }
+                break;
+            default:
+                jj_consume_token(-1);
+                throw new ParseException();
+        }
+        {
+            if (true)
+                return left;
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    private boolean jj_2_1(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_1();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_2_2(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_2();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_2_3(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_3();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_2_4(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_4();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_2_5(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_5();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_2_6(int xla) {
+        jj_la = xla;
+        jj_lastpos = jj_scanpos = token;
+        try {
+            return !jj_3_6();
+        } catch (LookaheadSuccess ls) {
+            return true;
+        }
+    }
+
+    private boolean jj_3R_53() {
+        if (jj_scan_token(LIKE))
+            return true;
+        if (jj_3R_38())
+            return true;
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_58())
+            jj_scanpos = xsp;
+        return false;
+    }
+
+    private boolean jj_3R_27() {
+        if (jj_scan_token(DECIMAL_LITERAL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_36() {
+        if (jj_3R_39())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_40()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_52() {
+        if (jj_scan_token(32))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_57() {
+        if (jj_scan_token(37))
+            return true;
+        if (jj_3R_9())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_5() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_scan_token(36)) {
+            jj_scanpos = xsp;
+            if (jj_scan_token(37))
+                return true;
+        }
+        if (jj_3R_9())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_26() {
+        if (jj_3R_38())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_51() {
+        if (jj_scan_token(31))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_35() {
+        if (jj_scan_token(QUOTED_ID))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_56() {
+        if (jj_scan_token(36))
+            return true;
+        if (jj_3R_9())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_37() {
+        if (jj_scan_token(OR))
+            return true;
+        if (jj_3R_36())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_23() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_26()) {
+            jj_scanpos = xsp;
+            if (jj_3R_27()) {
+                jj_scanpos = xsp;
+                if (jj_3R_28()) {
+                    jj_scanpos = xsp;
+                    if (jj_3R_29()) {
+                        jj_scanpos = xsp;
+                        if (jj_3R_30()) {
+                            jj_scanpos = xsp;
+                            if (jj_3R_31()) {
+                                jj_scanpos = xsp;
+                                if (jj_3R_32()) {
+                                    jj_scanpos = xsp;
+                                    if (jj_3R_33())
+                                        return true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_50() {
+        if (jj_scan_token(30))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_34() {
+        if (jj_scan_token(ID))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_48() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_56()) {
+            jj_scanpos = xsp;
+            if (jj_3R_57())
+                return true;
         }
-        {if (true) return rc.toString();}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public PropertyExpression variable() throws ParseException {
-    Token t;
-    PropertyExpression left=null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case ID:
-      t = jj_consume_token(ID);
-            left = new PropertyExpression(t.image);
-      break;
-    case QUOTED_ID:
-      t = jj_consume_token(QUOTED_ID);
-            // Decode the string value.
-            StringBuffer rc = new StringBuffer();
-            String image = t.image;
-            for( int i=1; i < image.length()-1; i++ ) {
-                char c = image.charAt(i);
-                if( c == '"' )
-                    i++;
-                rc.append(c);
+        return false;
+    }
+
+    private boolean jj_3R_49() {
+        if (jj_scan_token(29))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_44() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_49()) {
+            jj_scanpos = xsp;
+            if (jj_3R_50()) {
+                jj_scanpos = xsp;
+                if (jj_3R_51()) {
+                    jj_scanpos = xsp;
+                    if (jj_3R_52()) {
+                        jj_scanpos = xsp;
+                        if (jj_3R_53()) {
+                            jj_scanpos = xsp;
+                            if (jj_3_2()) {
+                                jj_scanpos = xsp;
+                                if (jj_3R_54()) {
+                                    jj_scanpos = xsp;
+                                    if (jj_3_3()) {
+                                        jj_scanpos = xsp;
+                                        if (jj_3R_55()) {
+                                            jj_scanpos = xsp;
+                                            if (jj_3_4())
+                                                return true;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_24() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_34()) {
+            jj_scanpos = xsp;
+            if (jj_3R_35())
+                return true;
+        }
+        return false;
+    }
+
+    private boolean jj_3R_43() {
+        if (jj_3R_9())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_48()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_25() {
+        if (jj_3R_36())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_37()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_22() {
+        if (jj_scan_token(33))
+            return true;
+        if (jj_3R_25())
+            return true;
+        if (jj_scan_token(35))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_21() {
+        if (jj_3R_24())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_61() {
+        if (jj_scan_token(34))
+            return true;
+        if (jj_3R_38())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_20() {
+        if (jj_3R_23())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_19() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_20()) {
+            jj_scanpos = xsp;
+            if (jj_3R_21()) {
+                jj_scanpos = xsp;
+                if (jj_3R_22())
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_41() {
+        if (jj_3R_43())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_44()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_38() {
+        if (jj_scan_token(STRING_LITERAL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_15() {
+        if (jj_3R_19())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_59() {
+        if (jj_scan_token(ESCAPE))
+            return true;
+        if (jj_3R_38())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_4() {
+        if (jj_scan_token(NOT))
+            return true;
+        if (jj_scan_token(IN))
+            return true;
+        if (jj_scan_token(33))
+            return true;
+        if (jj_3R_38())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_61()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        if (jj_scan_token(35))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_6() {
+        if (jj_scan_token(36))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_14() {
+        if (jj_scan_token(NOT))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_60() {
+        if (jj_scan_token(34))
+            return true;
+        if (jj_3R_38())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_47() {
+        if (jj_scan_token(IS))
+            return true;
+        if (jj_scan_token(NOT))
+            return true;
+        if (jj_scan_token(NULL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_13() {
+        if (jj_scan_token(37))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_33() {
+        if (jj_scan_token(NULL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_1() {
+        if (jj_scan_token(IS))
+            return true;
+        if (jj_scan_token(NULL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_12() {
+        if (jj_scan_token(36))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_46() {
+        if (jj_scan_token(28))
+            return true;
+        if (jj_3R_41())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_10() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_12()) {
+            jj_scanpos = xsp;
+            if (jj_3R_13()) {
+                jj_scanpos = xsp;
+                if (jj_3R_14()) {
+                    jj_scanpos = xsp;
+                    if (jj_3R_15())
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_32() {
+        if (jj_scan_token(FALSE))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_55() {
+        if (jj_scan_token(IN))
+            return true;
+        if (jj_scan_token(33))
+            return true;
+        if (jj_3R_38())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_60()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        if (jj_scan_token(35))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_45() {
+        if (jj_scan_token(27))
+            return true;
+        if (jj_3R_41())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_42() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_45()) {
+            jj_scanpos = xsp;
+            if (jj_3R_46()) {
+                jj_scanpos = xsp;
+                if (jj_3_1()) {
+                    jj_scanpos = xsp;
+                    if (jj_3R_47())
+                        return true;
+                }
             }
-            {if (true) return new PropertyExpression(rc.toString());}
-      break;
-    default:
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-        {if (true) return left;}
-    throw new Error("Missing return statement in function");
-  }
-
-  private boolean jj_2_1(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_1(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_2_2(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_2(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_2_3(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_3(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_2_4(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_4(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_2_5(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_5(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_2_6(int xla) {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_6(); }
-    catch(LookaheadSuccess ls) { return true; }
-  }
-
-  private boolean jj_3R_53() {
-    if (jj_scan_token(LIKE)) return true;
-    if (jj_3R_38()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_27() {
-    if (jj_scan_token(DECIMAL_LITERAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_36() {
-    if (jj_3R_39()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_40()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_52() {
-    if (jj_scan_token(32)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_57() {
-    if (jj_scan_token(37)) return true;
-    if (jj_3R_9()) return true;
-    return false;
-  }
-
-  private boolean jj_3_5() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(36)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) return true;
-    }
-    if (jj_3R_9()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_26() {
-    if (jj_3R_38()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_51() {
-    if (jj_scan_token(31)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_35() {
-    if (jj_scan_token(QUOTED_ID)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_56() {
-    if (jj_scan_token(36)) return true;
-    if (jj_3R_9()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_37() {
-    if (jj_scan_token(OR)) return true;
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_23() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_26()) {
-    jj_scanpos = xsp;
-    if (jj_3R_27()) {
-    jj_scanpos = xsp;
-    if (jj_3R_28()) {
-    jj_scanpos = xsp;
-    if (jj_3R_29()) {
-    jj_scanpos = xsp;
-    if (jj_3R_30()) {
-    jj_scanpos = xsp;
-    if (jj_3R_31()) {
-    jj_scanpos = xsp;
-    if (jj_3R_32()) {
-    jj_scanpos = xsp;
-    if (jj_3R_33()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_50() {
-    if (jj_scan_token(30)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_34() {
-    if (jj_scan_token(ID)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_48() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_56()) {
-    jj_scanpos = xsp;
-    if (jj_3R_57()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_49() {
-    if (jj_scan_token(29)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_44() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_50()) {
-    jj_scanpos = xsp;
-    if (jj_3R_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3_2()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) {
-    jj_scanpos = xsp;
-    if (jj_3_3()) {
-    jj_scanpos = xsp;
-    if (jj_3R_55()) {
-    jj_scanpos = xsp;
-    if (jj_3_4()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_24() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_34()) {
-    jj_scanpos = xsp;
-    if (jj_3R_35()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_43() {
-    if (jj_3R_9()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_48()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_25() {
-    if (jj_3R_36()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_37()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_22() {
-    if (jj_scan_token(33)) return true;
-    if (jj_3R_25()) return true;
-    if (jj_scan_token(35)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_21() {
-    if (jj_3R_24()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_61() {
-    if (jj_scan_token(34)) return true;
-    if (jj_3R_38()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_20() {
-    if (jj_3R_23()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_19() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_20()) {
-    jj_scanpos = xsp;
-    if (jj_3R_21()) {
-    jj_scanpos = xsp;
-    if (jj_3R_22()) return true;
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_41() {
-    if (jj_3R_43()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_44()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_38() {
-    if (jj_scan_token(STRING_LITERAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_15() {
-    if (jj_3R_19()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_59() {
-    if (jj_scan_token(ESCAPE)) return true;
-    if (jj_3R_38()) return true;
-    return false;
-  }
-
-  private boolean jj_3_4() {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_scan_token(33)) return true;
-    if (jj_3R_38()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_61()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(35)) return true;
-    return false;
-  }
-
-  private boolean jj_3_6() {
-    if (jj_scan_token(36)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_14() {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_60() {
-    if (jj_scan_token(34)) return true;
-    if (jj_3R_38()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_47() {
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(NULL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_13() {
-    if (jj_scan_token(37)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_33() {
-    if (jj_scan_token(NULL)) return true;
-    return false;
-  }
-
-  private boolean jj_3_1() {
-    if (jj_scan_token(IS)) return true;
-    if (jj_scan_token(NULL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_12() {
-    if (jj_scan_token(36)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_46() {
-    if (jj_scan_token(28)) return true;
-    if (jj_3R_41()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_10() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_12()) {
-    jj_scanpos = xsp;
-    if (jj_3R_13()) {
-    jj_scanpos = xsp;
-    if (jj_3R_14()) {
-    jj_scanpos = xsp;
-    if (jj_3R_15()) return true;
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_32() {
-    if (jj_scan_token(FALSE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_55() {
-    if (jj_scan_token(IN)) return true;
-    if (jj_scan_token(33)) return true;
-    if (jj_3R_38()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_60()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(35)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_45() {
-    if (jj_scan_token(27)) return true;
-    if (jj_3R_41()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_42() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_45()) {
-    jj_scanpos = xsp;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_3_1()) {
-    jj_scanpos = xsp;
-    if (jj_3R_47()) return true;
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_31() {
-    if (jj_scan_token(TRUE)) return true;
-    return false;
-  }
-
-  private boolean jj_3_3() {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(BETWEEN)) return true;
-    if (jj_3R_43()) return true;
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_18() {
-    if (jj_scan_token(40)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_30() {
-    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_54() {
-    if (jj_scan_token(BETWEEN)) return true;
-    if (jj_3R_43()) return true;
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_43()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_39() {
-    if (jj_3R_41()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_42()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_17() {
-    if (jj_scan_token(39)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_29() {
-    if (jj_scan_token(OCTAL_LITERAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_58() {
-    if (jj_scan_token(ESCAPE)) return true;
-    if (jj_3R_38()) return true;
-    return false;
-  }
-
-  private boolean jj_3_2() {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(LIKE)) return true;
-    if (jj_3R_38()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_59()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_16() {
-    if (jj_scan_token(38)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_11() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_16()) {
-    jj_scanpos = xsp;
-    if (jj_3R_17()) {
-    jj_scanpos = xsp;
-    if (jj_3R_18()) return true;
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_40() {
-    if (jj_scan_token(AND)) return true;
-    if (jj_3R_39()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_28() {
-    if (jj_scan_token(HEX_LITERAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_9() {
-    if (jj_3R_10()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_11()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  /** Generated Token Manager. */
-  public SelectorParserImplTokenManager token_source;
-  SimpleCharStream jj_input_stream;
-  /** Current token. */
-  public Token token;
-  /** Next token. */
-  public Token jj_nt;
-  private int jj_ntk;
-  private Token jj_scanpos, jj_lastpos;
-  private int jj_la;
-
-  /** Constructor with InputStream. */
-  public SelectorParserImpl(java.io.InputStream stream) {
-     this(stream, null);
-  }
-  /** Constructor with InputStream and supplied encoding */
-  public SelectorParserImpl(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source = new SelectorParserImplTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream) {
-     ReInit(stream, null);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  /** Constructor. */
-  public SelectorParserImpl(java.io.Reader stream) {
-    jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    token_source = new SelectorParserImplTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader stream) {
-    jj_input_stream.ReInit(stream, 1, 1);
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  /** Constructor with generated Token Manager. */
-  public SelectorParserImpl(SelectorParserImplTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(SelectorParserImplTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-  }
-
-  private Token jj_consume_token(int kind) throws ParseException {
-    Token oldToken;
-    if ((oldToken = token).next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    if (token.kind == kind) {
-      return token;
-    }
-    token = oldToken;
-    throw generateParseException();
-  }
-
-  static private final class LookaheadSuccess extends java.lang.Error { }
-  final private LookaheadSuccess jj_ls = new LookaheadSuccess();
-  private boolean jj_scan_token(int kind) {
-    if (jj_scanpos == jj_lastpos) {
-      jj_la--;
-      if (jj_scanpos.next == null) {
-        jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
-      } else {
-        jj_lastpos = jj_scanpos = jj_scanpos.next;
-      }
-    } else {
-      jj_scanpos = jj_scanpos.next;
-    }
-    if (jj_scanpos.kind != kind) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
-    return false;
-  }
-
-
-/** Get the next Token. */
-  final public Token getNextToken() {
-    if (token.next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    return token;
-  }
-
-/** Get the specific Token. */
-  final public Token getToken(int index) {
-    Token t = token;
-    for (int i = 0; i < index; i++) {
-      if (t.next != null) t = t.next;
-      else t = t.next = token_source.getNextToken();
-    }
-    return t;
-  }
-
-  private int jj_ntk() {
-    if ((jj_nt=token.next) == null)
-      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
-    else
-      return (jj_ntk = jj_nt.kind);
-  }
-
-  /** Generate ParseException. */
-  public ParseException generateParseException() {
-    Token errortok = token.next;
-    int line = errortok.beginLine, column = errortok.beginColumn;
-    String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
-    return new ParseException("Parse error at line " + line + ", column " + column + ".  Encountered: " + mess);
-  }
-
-  /** Enable tracing. */
-  final public void enable_tracing() {
-  }
-
-  /** Disable tracing. */
-  final public void disable_tracing() {
-  }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_31() {
+        if (jj_scan_token(TRUE))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_3() {
+        if (jj_scan_token(NOT))
+            return true;
+        if (jj_scan_token(BETWEEN))
+            return true;
+        if (jj_3R_43())
+            return true;
+        if (jj_scan_token(AND))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_18() {
+        if (jj_scan_token(40))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_30() {
+        if (jj_scan_token(FLOATING_POINT_LITERAL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_54() {
+        if (jj_scan_token(BETWEEN))
+            return true;
+        if (jj_3R_43())
+            return true;
+        if (jj_scan_token(AND))
+            return true;
+        if (jj_3R_43())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_39() {
+        if (jj_3R_41())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_42()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_17() {
+        if (jj_scan_token(39))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_29() {
+        if (jj_scan_token(OCTAL_LITERAL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_58() {
+        if (jj_scan_token(ESCAPE))
+            return true;
+        if (jj_3R_38())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3_2() {
+        if (jj_scan_token(NOT))
+            return true;
+        if (jj_scan_token(LIKE))
+            return true;
+        if (jj_3R_38())
+            return true;
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_59())
+            jj_scanpos = xsp;
+        return false;
+    }
+
+    private boolean jj_3R_16() {
+        if (jj_scan_token(38))
+            return true;
+        if (jj_3R_10())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_11() {
+        Token xsp;
+        xsp = jj_scanpos;
+        if (jj_3R_16()) {
+            jj_scanpos = xsp;
+            if (jj_3R_17()) {
+                jj_scanpos = xsp;
+                if (jj_3R_18())
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean jj_3R_40() {
+        if (jj_scan_token(AND))
+            return true;
+        if (jj_3R_39())
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_28() {
+        if (jj_scan_token(HEX_LITERAL))
+            return true;
+        return false;
+    }
+
+    private boolean jj_3R_9() {
+        if (jj_3R_10())
+            return true;
+        Token xsp;
+        while (true) {
+            xsp = jj_scanpos;
+            if (jj_3R_11()) {
+                jj_scanpos = xsp;
+                break;
+            }
+        }
+        return false;
+    }
+
+    /** Generated Token Manager. */
+    public SelectorParserImplTokenManager token_source;
+    SimpleCharStream jj_input_stream;
+    /** Current token. */
+    public Token token;
+    /** Next token. */
+    public Token jj_nt;
+    private int jj_ntk;
+    private Token jj_scanpos, jj_lastpos;
+    private int jj_la;
+
+    public SelectorParserImpl(java.io.InputStream stream) {
+        this(stream, null);
+    }
+
+    public SelectorParserImpl(java.io.InputStream stream, String encoding) {
+        try {
+            jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1);
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        token_source = new SelectorParserImplTokenManager(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    public void ReInit(java.io.InputStream stream) {
+        ReInit(stream, null);
+    }
+
+    public void ReInit(java.io.InputStream stream, String encoding) {
+        try {
+            jj_input_stream.ReInit(stream, encoding, 1, 1);
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        token_source.ReInit(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    public SelectorParserImpl(java.io.Reader stream) {
+        jj_input_stream = new SimpleCharStream(stream, 1, 1);
+        token_source = new SelectorParserImplTokenManager(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    public void ReInit(java.io.Reader stream) {
+        jj_input_stream.ReInit(stream, 1, 1);
+        token_source.ReInit(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    public SelectorParserImpl(SelectorParserImplTokenManager tm) {
+        token_source = tm;
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    public void ReInit(SelectorParserImplTokenManager tm) {
+        token_source = tm;
+        token = new Token();
+        jj_ntk = -1;
+    }
+
+    private Token jj_consume_token(int kind) throws ParseException {
+        Token oldToken;
+        if ((oldToken = token).next != null)
+            token = token.next;
+        else
+            token = token.next = token_source.getNextToken();
+        jj_ntk = -1;
+        if (token.kind == kind) {
+            return token;
+        }
+        token = oldToken;
+        throw generateParseException();
+    }
+
+    static private final class LookaheadSuccess extends java.lang.Error {
+        private static final long serialVersionUID = -5229248680876187911L;
+    }
+
+    final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+
+    private boolean jj_scan_token(int kind) {
+        if (jj_scanpos == jj_lastpos) {
+            jj_la--;
+            if (jj_scanpos.next == null) {
+                jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+            } else {
+                jj_lastpos = jj_scanpos = jj_scanpos.next;
+            }
+        } else {
+            jj_scanpos = jj_scanpos.next;
+        }
+        if (jj_scanpos.kind != kind)
+            return true;
+        if (jj_la == 0 && jj_scanpos == jj_lastpos)
+            throw jj_ls;
+        return false;
+    }
+
+    final public Token getNextToken() {
+        if (token.next != null)
+            token = token.next;
+        else
+            token = token.next = token_source.getNextToken();
+        jj_ntk = -1;
+        return token;
+    }
+
+    final public Token getToken(int index) {
+        Token t = token;
+        for (int i = 0; i < index; i++) {
+            if (t.next != null)
+                t = t.next;
+            else
+                t = t.next = token_source.getNextToken();
+        }
+        return t;
+    }
+
+    private int jj_ntk() {
+        if ((jj_nt = token.next) == null)
+            return (jj_ntk = (token.next = token_source.getNextToken()).kind);
+        else
+            return (jj_ntk = jj_nt.kind);
+    }
+
+    public ParseException generateParseException() {
+        Token errortok = token.next;
+        int line = errortok.beginLine, column = errortok.beginColumn;
+        String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;
+        return new ParseException("Parse error at line " + line + ", column " + column + ".  Encountered: " + mess);
+    }
+
+    /** Enable tracing. */
+    final public void enable_tracing() {
+    }
+
+    /** Disable tracing. */
+    final public void disable_tracing() {
+    }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[4/4] qpid-jms git commit: NO-JIRA Remove javadoc warnings and code warnings from the selector package.

Posted by ta...@apache.org.
NO-JIRA Remove javadoc warnings and code warnings from the selector
package.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/3fb96f27
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/3fb96f27
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/3fb96f27

Branch: refs/heads/master
Commit: 3fb96f273396e1a25aacf7ac6cdd827e37e52ec7
Parents: c133d59
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 8 14:09:26 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 8 14:09:40 2015 -0400

----------------------------------------------------------------------
 qpid-jms-client/pom.xml                         |    1 -
 .../selector/filter/ArithmeticExpression.java   |    4 -
 .../jms/selector/filter/BinaryExpression.java   |    4 +-
 .../selector/filter/ComparisonExpression.java   |   13 +-
 .../qpid/jms/selector/filter/Expression.java    |    5 +
 .../jms/selector/filter/LogicExpression.java    |    4 -
 .../jms/selector/parser/ParseException.java     |  313 ++-
 .../jms/selector/parser/SelectorParserImpl.java | 2457 ++++++++++--------
 .../parser/SelectorParserImplTokenManager.java  | 1934 +++++++-------
 .../jms/selector/parser/SimpleCharStream.java   |  860 +++---
 .../apache/qpid/jms/selector/parser/Token.java  |  233 +-
 .../qpid/jms/selector/parser/TokenMgrError.java |  260 +-
 12 files changed, 3056 insertions(+), 3032 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 3914b07..120baaa 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -94,7 +94,6 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>${jacoco-plugin-version}</version>
         <configuration>
           <excludes>
             <!-- Generated selector parser -->

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
index 7b8bb03..8538aea 100755
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
@@ -25,10 +25,6 @@ public abstract class ArithmeticExpression extends BinaryExpression {
     protected static final int LONG = 2;
     protected static final int DOUBLE = 3;
 
-    /**
-     * @param left
-     * @param right
-     */
     public ArithmeticExpression(Expression left, Expression right) {
         super(left, right);
     }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/BinaryExpression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/BinaryExpression.java
index d6c714d..2783ea3 100755
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/BinaryExpression.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/BinaryExpression.java
@@ -78,14 +78,14 @@ public abstract class BinaryExpression implements Expression {
     public abstract String getExpressionSymbol();
 
     /**
-     * @param expression
+     * @param expression the RHS.
      */
     public void setRight(Expression expression) {
         right = expression;
     }
 
     /**
-     * @param expression
+     * @param expression the LHS
      */
     public void setLeft(Expression expression) {
         left = expression;

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
index c52f288..7495c1f 100755
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
@@ -24,14 +24,11 @@ import java.util.regex.Pattern;
 /**
  * A filter performing a comparison of two objects
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class ComparisonExpression extends BinaryExpression implements BooleanExpression {
 
     private static final Set<Character> REGEXP_CONTROL_CHARS = new HashSet<Character>();
 
-    /**
-     * @param left
-     * @param right
-     */
     public ComparisonExpression(Expression left, Expression right) {
         super(left, right);
     }
@@ -71,8 +68,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
 
         Pattern likePattern;
 
-        /**
-         */
         public LikeExpression(Expression right, String like, int escape) {
             super(right);
 
@@ -297,6 +292,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
      * Only Numeric expressions can be used in {@literal >, >=, < or <=} expressions.
      *
      * @param expr
+     *      The expression to evaluate.
      */
     public static void checkLessThanOperand(Expression expr) {
         if (expr instanceof ConstantExpression) {
@@ -318,6 +314,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
      * not be NULL TRUE or FALSE literals.
      *
      * @param expr
+     *      The expression to evaluate.
      */
     public static void checkEqualOperand(Expression expr) {
         if (expr instanceof ConstantExpression) {
@@ -328,10 +325,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         }
     }
 
-    /**
-     * @param left
-     * @param right
-     */
     private static void checkEqualOperandCompatability(Expression left, Expression right) {
         if (left instanceof ConstantExpression && right instanceof ConstantExpression) {
             if (left instanceof BooleanExpression && !(right instanceof BooleanExpression)) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/Expression.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/Expression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/Expression.java
index 7b69e42..d83fb8d 100755
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/Expression.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/Expression.java
@@ -22,7 +22,12 @@ package org.apache.qpid.jms.selector.filter;
 public interface Expression {
 
     /**
+     * @param message
+     *      The message that is being selected against.
+     *
      * @return the value of this expression
+     *
+     * @throws FilterException if an error occurs during evaluation.
      */
     Object evaluate(Filterable message) throws FilterException;
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/LogicExpression.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/LogicExpression.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/LogicExpression.java
index 1e635e7..4ee208c 100755
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/LogicExpression.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/LogicExpression.java
@@ -21,10 +21,6 @@ package org.apache.qpid.jms.selector.filter;
  */
 public abstract class LogicExpression extends BinaryExpression implements BooleanExpression {
 
-    /**
-     * @param left
-     * @param right
-     */
     public LogicExpression(BooleanExpression left, BooleanExpression right) {
         super(left, right);
     }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
index 3f98bb7..3bf81a5 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/ParseException.java
@@ -20,185 +20,172 @@
 package org.apache.qpid.jms.selector.parser;
 
 /**
- * This exception is thrown when parse errors are encountered.
- * You can explicitly create objects of this exception type by
- * calling the method generateParseException in the generated
- * parser.
+ * This exception is thrown when parse errors are encountered. You can explicitly create objects
+ * of this exception type by calling the method generateParseException in the generated parser.
  *
- * You can modify this class to customize your error reporting
- * mechanisms so long as you retain the public fields.
+ * You can modify this class to customize your error reporting mechanisms so long as you retain
+ * the public fields.
  */
 public class ParseException extends Exception {
 
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
+    /**
+     * The version identifier for this Serializable class. Increment only if the <i>serialized</i>
+     * form of the class changes.
+     */
+    private static final long serialVersionUID = 1L;
 
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
-
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
+    /**
+     * This constructor is used by the method "generateParseException" in the generated parser.
+     * Calling this constructor generates a new object of this type with the fields "currentToken",
+     * "expectedTokenSequences", and "tokenImage" set.
+     *
+     * @param currentTokenVal
+     *      The current token value to set.
+     * @param expectedTokenSequencesVal
+     *      The expected token sequence value to set.
+     * @param tokenImageVal
+     *      The token image value to set.
+     */
+    public ParseException(Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal) {
+        super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
+        currentToken = currentTokenVal;
+        expectedTokenSequences = expectedTokenSequencesVal;
+        tokenImage = tokenImageVal;
+    }
 
-  public ParseException() {
-    super();
-  }
+    /**
+     * The following constructors are for use by you for whatever purpose you can think of.
+     * Constructing the exception in this manner makes the exception behave in the normal way -
+     * i.e., as documented in the class "Throwable". The fields "errorToken",
+     * "expectedTokenSequences", and "tokenImage" do not contain relevant information. The
+     * JavaCC generated code does not use these constructors.
+     */
 
-  /** Constructor with message. */
-  public ParseException(String message) {
-    super(message);
-  }
+    public ParseException() {
+        super();
+    }
 
+    public ParseException(String message) {
+        super(message);
+    }
 
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
+    /**
+     * This is the last token that has been consumed successfully. If this object has been created
+     *  due to a parse error, the token following this token will (therefore) be the first error token.
+     */
+    public Token currentToken;
 
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
+    /**
+     * Each entry in this array is an array of integers. Each array of integers represents a sequence
+     * of tokens (by their ordinal values) that is expected at this point of the parse.
+     */
+    public int[][] expectedTokenSequences;
 
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
+    /**
+     * This is a reference to the "tokenImage" array of the generated parser within which the parse
+     * error occurred. This array is defined in the generated...Constants interface.
+     */
+    public String[] tokenImage;
 
-  /**
-   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser) the correct error message
-   * gets displayed.
-   */
-  private static String initialise(Token currentToken,
-                           int[][] expectedTokenSequences,
-                           String[] tokenImage) {
-    String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
-    int maxSize = 0;
-    for (int i = 0; i < expectedTokenSequences.length; i++) {
-      if (maxSize < expectedTokenSequences[i].length) {
-        maxSize = expectedTokenSequences[i].length;
-      }
-      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
-      }
-      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append("...");
-      }
-      expected.append(eol).append("    ");
-    }
-    String retval = "Encountered \"";
-    Token tok = currentToken.next;
-    for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += " " + tokenImage[tok.kind];
-      retval += " \"";
-      retval += add_escapes(tok.image);
-      retval += " \"";
-      tok = tok.next;
-    }
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + eol;
-    if (expectedTokenSequences.length == 1) {
-      retval += "Was expecting:" + eol + "    ";
-    } else {
-      retval += "Was expecting one of:" + eol + "    ";
+    /**
+     * It uses "currentToken" and "expectedTokenSequences" to generate a parse error message and
+     * returns it. If this object has been created due to a parse error, and you do not catch it
+     * (it gets thrown from the parser) the correct error message gets displayed.
+     */
+    private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) {
+        String eol = System.getProperty("line.separator", "\n");
+        StringBuffer expected = new StringBuffer();
+        int maxSize = 0;
+        for (int i = 0; i < expectedTokenSequences.length; i++) {
+            if (maxSize < expectedTokenSequences[i].length) {
+                maxSize = expectedTokenSequences[i].length;
+            }
+            for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+                expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+            }
+            if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+                expected.append("...");
+            }
+            expected.append(eol).append("    ");
+        }
+        String retval = "Encountered \"";
+        Token tok = currentToken.next;
+        for (int i = 0; i < maxSize; i++) {
+            if (i != 0)
+                retval += " ";
+            if (tok.kind == 0) {
+                retval += tokenImage[0];
+                break;
+            }
+            retval += " " + tokenImage[tok.kind];
+            retval += " \"";
+            retval += add_escapes(tok.image);
+            retval += " \"";
+            tok = tok.next;
+        }
+        retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+        retval += "." + eol;
+        if (expectedTokenSequences.length == 1) {
+            retval += "Was expecting:" + eol + "    ";
+        } else {
+            retval += "Was expecting one of:" + eol + "    ";
+        }
+        retval += expected.toString();
+        return retval;
     }
-    retval += expected.toString();
-    return retval;
-  }
 
-  /**
-   * The end of line string for this machine.
-   */
-  protected String eol = System.getProperty("line.separator", "\n");
+    /**
+     * The end of line string for this machine.
+     */
+    protected String eol = System.getProperty("line.separator", "\n");
 
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
+    /**
+     * Used to convert raw characters to their escaped version when these raw version cannot be
+     * used as part of an ASCII string literal.
+     */
+    static String add_escapes(String str) {
+        StringBuffer retval = new StringBuffer();
+        char ch;
+        for (int i = 0; i < str.length(); i++) {
+            switch (str.charAt(i)) {
+                case 0:
+                    continue;
+                case '\b':
+                    retval.append("\\b");
+                    continue;
+                case '\t':
+                    retval.append("\\t");
+                    continue;
+                case '\n':
+                    retval.append("\\n");
+                    continue;
+                case '\f':
+                    retval.append("\\f");
+                    continue;
+                case '\r':
+                    retval.append("\\r");
+                    continue;
+                case '\"':
+                    retval.append("\\\"");
+                    continue;
+                case '\'':
+                    retval.append("\\\'");
+                    continue;
+                case '\\':
+                    retval.append("\\\\");
+                    continue;
+                default:
+                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                        String s = "0000" + Integer.toString(ch, 16);
+                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+                    } else {
+                        retval.append(ch);
+                    }
+                    continue;
+            }
         }
-      }
-      return retval.toString();
-   }
+        return retval.toString();
+    }
 
 }
 /* JavaCC - OriginalChecksum=3eff901bcee074270b0e9dedf1a477ea (do not edit this line) */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/4] qpid-jms git commit: NO-JIRA Remove javadoc warnings and code warnings from the selector package.

Posted by ta...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3fb96f27/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
index e545521..dff0153 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/parser/SelectorParserImplTokenManager.java
@@ -15,1041 +15,957 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.qpid.jms.selector.parser;
-import java.io.*;
-import java.util.*;
-import org.apache.qpid.jms.selector.filter.*;
 
 /** Token Manager. */
-public class SelectorParserImplTokenManager implements SelectorParserImplConstants
-{
+public class SelectorParserImplTokenManager implements SelectorParserImplConstants {
 
-  /** Debug output. */
-  public  java.io.PrintStream debugStream = System.out;
-  /** Set debug output. */
-  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private int jjStopAtPos(int pos, int kind)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   return pos + 1;
-}
-private int jjMoveStringLiteralDfa0_0()
-{
-   switch(curChar)
-   {
-      case 9:
-         jjmatchedKind = 2;
-         return jjMoveNfa_0(5, 0);
-      case 10:
-         jjmatchedKind = 3;
-         return jjMoveNfa_0(5, 0);
-      case 12:
-         jjmatchedKind = 5;
-         return jjMoveNfa_0(5, 0);
-      case 13:
-         jjmatchedKind = 4;
-         return jjMoveNfa_0(5, 0);
-      case 32:
-         jjmatchedKind = 1;
-         return jjMoveNfa_0(5, 0);
-      case 37:
-         jjmatchedKind = 40;
-         return jjMoveNfa_0(5, 0);
-      case 40:
-         jjmatchedKind = 33;
-         return jjMoveNfa_0(5, 0);
-      case 41:
-         jjmatchedKind = 35;
-         return jjMoveNfa_0(5, 0);
-      case 42:
-         jjmatchedKind = 38;
-         return jjMoveNfa_0(5, 0);
-      case 43:
-         jjmatchedKind = 36;
-         return jjMoveNfa_0(5, 0);
-      case 44:
-         jjmatchedKind = 34;
-         return jjMoveNfa_0(5, 0);
-      case 45:
-         jjmatchedKind = 37;
-         return jjMoveNfa_0(5, 0);
-      case 47:
-         jjmatchedKind = 39;
-         return jjMoveNfa_0(5, 0);
-      case 60:
-         jjmatchedKind = 31;
-         return jjMoveStringLiteralDfa1_0(0x110000000L);
-      case 61:
-         jjmatchedKind = 27;
-         return jjMoveNfa_0(5, 0);
-      case 62:
-         jjmatchedKind = 29;
-         return jjMoveStringLiteralDfa1_0(0x40000000L);
-      case 65:
-         return jjMoveStringLiteralDfa1_0(0x200L);
-      case 66:
-         return jjMoveStringLiteralDfa1_0(0x800L);
-      case 69:
-         return jjMoveStringLiteralDfa1_0(0x2000L);
-      case 70:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
-      case 73:
-         return jjMoveStringLiteralDfa1_0(0xc000L);
-      case 76:
-         return jjMoveStringLiteralDfa1_0(0x1000L);
-      case 78:
-         return jjMoveStringLiteralDfa1_0(0x40100L);
-      case 79:
-         return jjMoveStringLiteralDfa1_0(0x400L);
-      case 84:
-         return jjMoveStringLiteralDfa1_0(0x10000L);
-      case 97:
-         return jjMoveStringLiteralDfa1_0(0x200L);
-      case 98:
-         return jjMoveStringLiteralDfa1_0(0x800L);
-      case 101:
-         return jjMoveStringLiteralDfa1_0(0x2000L);
-      case 102:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
-      case 105:
-         return jjMoveStringLiteralDfa1_0(0xc000L);
-      case 108:
-         return jjMoveStringLiteralDfa1_0(0x1000L);
-      case 110:
-         return jjMoveStringLiteralDfa1_0(0x40100L);
-      case 111:
-         return jjMoveStringLiteralDfa1_0(0x400L);
-      case 116:
-         return jjMoveStringLiteralDfa1_0(0x10000L);
-      default :
-         return jjMoveNfa_0(5, 0);
-   }
-}
-private int jjMoveStringLiteralDfa1_0(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 0);
-   }
-   switch(curChar)
-   {
-      case 61:
-         if ((active0 & 0x40000000L) != 0L)
-         {
-            jjmatchedKind = 30;
-            jjmatchedPos = 1;
-         }
-         else if ((active0 & 0x100000000L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 1;
-         }
-         break;
-      case 62:
-         if ((active0 & 0x10000000L) != 0L)
-         {
-            jjmatchedKind = 28;
-            jjmatchedPos = 1;
-         }
-         break;
-      case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000L);
-      case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800L);
-      case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000L);
-      case 78:
-         if ((active0 & 0x4000L) != 0L)
-         {
-            jjmatchedKind = 14;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x200L);
-      case 79:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100L);
-      case 82:
-         if ((active0 & 0x400L) != 0L)
-         {
-            jjmatchedKind = 10;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
-      case 83:
-         if ((active0 & 0x8000L) != 0L)
-         {
-            jjmatchedKind = 15;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000L);
-      case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000L);
-      case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000L);
-      case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800L);
-      case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000L);
-      case 110:
-         if ((active0 & 0x4000L) != 0L)
-         {
-            jjmatchedKind = 14;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x200L);
-      case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100L);
-      case 114:
-         if ((active0 & 0x400L) != 0L)
-         {
-            jjmatchedKind = 10;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
-      case 115:
-         if ((active0 & 0x8000L) != 0L)
-         {
-            jjmatchedKind = 15;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000L);
-      case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000L);
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 1);
-}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjMoveNfa_0(5, 1);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 1);
-   }
-   switch(curChar)
-   {
-      case 67:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000L);
-      case 68:
-         if ((active0 & 0x200L) != 0L)
-         {
-            jjmatchedKind = 9;
-            jjmatchedPos = 2;
-         }
-         break;
-      case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
-      case 76:
-         return jjMoveStringLiteralDfa3_0(active0, 0x60000L);
-      case 84:
-         if ((active0 & 0x100L) != 0L)
-         {
-            jjmatchedKind = 8;
-            jjmatchedPos = 2;
-         }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800L);
-      case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
-      case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000L);
-      case 100:
-         if ((active0 & 0x200L) != 0L)
-         {
-            jjmatchedKind = 9;
-            jjmatchedPos = 2;
-         }
-         break;
-      case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
-      case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x60000L);
-      case 116:
-         if ((active0 & 0x100L) != 0L)
-         {
-            jjmatchedKind = 8;
-            jjmatchedPos = 2;
-         }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800L);
-      case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 2);
-}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjMoveNfa_0(5, 2);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 2);
-   }
-   switch(curChar)
-   {
-      case 65:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000L);
-      case 69:
-         if ((active0 & 0x1000L) != 0L)
-         {
-            jjmatchedKind = 12;
-            jjmatchedPos = 3;
-         }
-         else if ((active0 & 0x10000L) != 0L)
-         {
-            jjmatchedKind = 16;
-            jjmatchedPos = 3;
-         }
-         break;
-      case 76:
-         if ((active0 & 0x40000L) != 0L)
-         {
-            jjmatchedKind = 18;
-            jjmatchedPos = 3;
-         }
-         break;
-      case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000L);
-      case 87:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800L);
-      case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000L);
-      case 101:
-         if ((active0 & 0x1000L) != 0L)
-         {
-            jjmatchedKind = 12;
-            jjmatchedPos = 3;
-         }
-         else if ((active0 & 0x10000L) != 0L)
-         {
-            jjmatchedKind = 16;
-            jjmatchedPos = 3;
-         }
-         break;
-      case 108:
-         if ((active0 & 0x40000L) != 0L)
-         {
-            jjmatchedKind = 18;
-            jjmatchedPos = 3;
-         }
-         break;
-      case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000L);
-      case 119:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800L);
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 3);
-}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjMoveNfa_0(5, 3);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 3);
-   }
-   switch(curChar)
-   {
-      case 69:
-         if ((active0 & 0x20000L) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 4;
-         }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
-      case 80:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
-      case 101:
-         if ((active0 & 0x20000L) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 4;
-         }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
-      case 112:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 4);
-}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjMoveNfa_0(5, 4);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 4);
-   }
-   switch(curChar)
-   {
-      case 69:
-         if ((active0 & 0x2000L) != 0L)
-         {
-            jjmatchedKind = 13;
-            jjmatchedPos = 5;
-         }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800L);
-      case 101:
-         if ((active0 & 0x2000L) != 0L)
-         {
-            jjmatchedKind = 13;
-            jjmatchedPos = 5;
-         }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800L);
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 5);
-}
-private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjMoveNfa_0(5, 5);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-   return jjMoveNfa_0(5, 5);
-   }
-   switch(curChar)
-   {
-      case 78:
-         if ((active0 & 0x800L) != 0L)
-         {
-            jjmatchedKind = 11;
-            jjmatchedPos = 6;
-         }
-         break;
-      case 110:
-         if ((active0 & 0x800L) != 0L)
-         {
-            jjmatchedKind = 11;
-            jjmatchedPos = 6;
-         }
-         break;
-      default :
-         break;
-   }
-   return jjMoveNfa_0(5, 6);
-}
-static final long[] jjbitVec0 = {
-   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
-};
-static final long[] jjbitVec2 = {
-   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-};
-private int jjMoveNfa_0(int startState, int curPos)
-{
-   int strKind = jjmatchedKind;
-   int strPos = jjmatchedPos;
-   int seenUpto;
-   input_stream.backup(seenUpto = curPos + 1);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { throw new Error("Internal Error"); }
-   curPos = 0;
-   int startsAt = 0;
-   jjnewStateCnt = 48;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 5:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(0, 3);
-                  else if (curChar == 34)
-                     jjCheckNAddStates(4, 6);
-                  else if (curChar == 36)
-                  {
-                     if (kind > 25)
-                        kind = 25;
-                     jjCheckNAdd(27);
-                  }
-                  else if (curChar == 39)
-                     jjCheckNAddStates(7, 9);
-                  else if (curChar == 46)
-                     jjCheckNAdd(17);
-                  else if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 6;
-                  else if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 0;
-                  if ((0x3fe000000000000L & l) != 0L)
-                  {
-                     if (kind > 19)
-                        kind = 19;
-                     jjCheckNAddTwoStates(14, 15);
-                  }
-                  else if (curChar == 48)
-                  {
-                     if (kind > 21)
-                        kind = 21;
-                     jjCheckNAddTwoStates(45, 47);
-                  }
-                  break;
-               case 0:
-                  if (curChar == 45)
-                     jjCheckNAddStates(10, 12);
-                  break;
-               case 1:
-                  if ((0xffffffffffffdbffL & l) != 0L)
-                     jjCheckNAddStates(10, 12);
-                  break;
-               case 2:
-                  if ((0x2400L & l) != 0L && kind > 6)
-                     kind = 6;
-                  break;
-               case 3:
-                  if (curChar == 10 && kind > 6)
-                     kind = 6;
-                  break;
-               case 4:
-                  if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 3;
-                  break;
-               case 6:
-                  if (curChar == 42)
-                     jjCheckNAddTwoStates(7, 8);
-                  break;
-               case 7:
-                  if ((0xfffffbffffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(7, 8);
-                  break;
-               case 8:
-                  if (curChar == 42)
-                     jjCheckNAddStates(13, 15);
-                  break;
-               case 9:
-                  if ((0xffff7bffffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(10, 8);
-                  break;
-               case 10:
-                  if ((0xfffffbffffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(10, 8);
-                  break;
-               case 11:
-                  if (curChar == 47 && kind > 7)
-                     kind = 7;
-                  break;
-               case 12:
-                  if (curChar == 47)
-                     jjstateSet[jjnewStateCnt++] = 6;
-                  break;
-               case 13:
-                  if ((0x3fe000000000000L & l) == 0L)
-                     break;
-                  if (kind > 19)
-                     kind = 19;
-                  jjCheckNAddTwoStates(14, 15);
-                  break;
-               case 14:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 19)
-                     kind = 19;
-                  jjCheckNAddTwoStates(14, 15);
-                  break;
-               case 16:
-                  if (curChar == 46)
-                     jjCheckNAdd(17);
-                  break;
-               case 17:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAddTwoStates(17, 18);
-                  break;
-               case 19:
-                  if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(20);
-                  break;
-               case 20:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAdd(20);
-                  break;
-               case 21:
-               case 22:
-                  if (curChar == 39)
-                     jjCheckNAddStates(7, 9);
-                  break;
-               case 23:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 22;
-                  break;
-               case 24:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(7, 9);
-                  break;
-               case 25:
-                  if (curChar == 39 && kind > 24)
-                     kind = 24;
-                  break;
-               case 26:
-                  if (curChar != 36)
-                     break;
-                  if (kind > 25)
-                     kind = 25;
-                  jjCheckNAdd(27);
-                  break;
-               case 27:
-                  if ((0x3ff001000000000L & l) == 0L)
-                     break;
-                  if (kind > 25)
-                     kind = 25;
-                  jjCheckNAdd(27);
-                  break;
-               case 28:
-               case 29:
-                  if (curChar == 34)
-                     jjCheckNAddStates(4, 6);
-                  break;
-               case 30:
-                  if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 29;
-                  break;
-               case 31:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(4, 6);
-                  break;
-               case 32:
-                  if (curChar == 34 && kind > 26)
-                     kind = 26;
-                  break;
-               case 33:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(0, 3);
-                  break;
-               case 34:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(34, 35);
-                  break;
-               case 35:
-                  if (curChar != 46)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAddTwoStates(36, 37);
-                  break;
-               case 36:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAddTwoStates(36, 37);
-                  break;
-               case 38:
-                  if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(39);
-                  break;
-               case 39:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAdd(39);
-                  break;
-               case 40:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(40, 41);
-                  break;
-               case 42:
-                  if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(43);
-                  break;
-               case 43:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 22)
-                     kind = 22;
-                  jjCheckNAdd(43);
-                  break;
-               case 44:
-                  if (curChar != 48)
-                     break;
-                  if (kind > 21)
-                     kind = 21;
-                  jjCheckNAddTwoStates(45, 47);
-                  break;
-               case 46:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 20)
-                     kind = 20;
-                  jjstateSet[jjnewStateCnt++] = 46;
-                  break;
-               case 47:
-                  if ((0xff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 21)
-                     kind = 21;
-                  jjCheckNAdd(47);
-                  break;
-               default : break;
+    public java.io.PrintStream debugStream = System.out;
+
+    public void setDebugStream(java.io.PrintStream ds) {
+        debugStream = ds;
+    }
+
+    private int jjMoveStringLiteralDfa0_0() {
+        switch (curChar) {
+            case 9:
+                jjmatchedKind = 2;
+                return jjMoveNfa_0(5, 0);
+            case 10:
+                jjmatchedKind = 3;
+                return jjMoveNfa_0(5, 0);
+            case 12:
+                jjmatchedKind = 5;
+                return jjMoveNfa_0(5, 0);
+            case 13:
+                jjmatchedKind = 4;
+                return jjMoveNfa_0(5, 0);
+            case 32:
+                jjmatchedKind = 1;
+                return jjMoveNfa_0(5, 0);
+            case 37:
+                jjmatchedKind = 40;
+                return jjMoveNfa_0(5, 0);
+            case 40:
+                jjmatchedKind = 33;
+                return jjMoveNfa_0(5, 0);
+            case 41:
+                jjmatchedKind = 35;
+                return jjMoveNfa_0(5, 0);
+            case 42:
+                jjmatchedKind = 38;
+                return jjMoveNfa_0(5, 0);
+            case 43:
+                jjmatchedKind = 36;
+                return jjMoveNfa_0(5, 0);
+            case 44:
+                jjmatchedKind = 34;
+                return jjMoveNfa_0(5, 0);
+            case 45:
+                jjmatchedKind = 37;
+                return jjMoveNfa_0(5, 0);
+            case 47:
+                jjmatchedKind = 39;
+                return jjMoveNfa_0(5, 0);
+            case 60:
+                jjmatchedKind = 31;
+                return jjMoveStringLiteralDfa1_0(0x110000000L);
+            case 61:
+                jjmatchedKind = 27;
+                return jjMoveNfa_0(5, 0);
+            case 62:
+                jjmatchedKind = 29;
+                return jjMoveStringLiteralDfa1_0(0x40000000L);
+            case 65:
+                return jjMoveStringLiteralDfa1_0(0x200L);
+            case 66:
+                return jjMoveStringLiteralDfa1_0(0x800L);
+            case 69:
+                return jjMoveStringLiteralDfa1_0(0x2000L);
+            case 70:
+                return jjMoveStringLiteralDfa1_0(0x20000L);
+            case 73:
+                return jjMoveStringLiteralDfa1_0(0xc000L);
+            case 76:
+                return jjMoveStringLiteralDfa1_0(0x1000L);
+            case 78:
+                return jjMoveStringLiteralDfa1_0(0x40100L);
+            case 79:
+                return jjMoveStringLiteralDfa1_0(0x400L);
+            case 84:
+                return jjMoveStringLiteralDfa1_0(0x10000L);
+            case 97:
+                return jjMoveStringLiteralDfa1_0(0x200L);
+            case 98:
+                return jjMoveStringLiteralDfa1_0(0x800L);
+            case 101:
+                return jjMoveStringLiteralDfa1_0(0x2000L);
+            case 102:
+                return jjMoveStringLiteralDfa1_0(0x20000L);
+            case 105:
+                return jjMoveStringLiteralDfa1_0(0xc000L);
+            case 108:
+                return jjMoveStringLiteralDfa1_0(0x1000L);
+            case 110:
+                return jjMoveStringLiteralDfa1_0(0x40100L);
+            case 111:
+                return jjMoveStringLiteralDfa1_0(0x400L);
+            case 116:
+                return jjMoveStringLiteralDfa1_0(0x10000L);
+            default:
+                return jjMoveNfa_0(5, 0);
+        }
+    }
+
+    private int jjMoveStringLiteralDfa1_0(long active0) {
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 0);
+        }
+        switch (curChar) {
+            case 61:
+                if ((active0 & 0x40000000L) != 0L) {
+                    jjmatchedKind = 30;
+                    jjmatchedPos = 1;
+                } else if ((active0 & 0x100000000L) != 0L) {
+                    jjmatchedKind = 32;
+                    jjmatchedPos = 1;
+                }
+                break;
+            case 62:
+                if ((active0 & 0x10000000L) != 0L) {
+                    jjmatchedKind = 28;
+                    jjmatchedPos = 1;
+                }
+                break;
+            case 65:
+                return jjMoveStringLiteralDfa2_0(active0, 0x20000L);
+            case 69:
+                return jjMoveStringLiteralDfa2_0(active0, 0x800L);
+            case 73:
+                return jjMoveStringLiteralDfa2_0(active0, 0x1000L);
+            case 78:
+                if ((active0 & 0x4000L) != 0L) {
+                    jjmatchedKind = 14;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x200L);
+            case 79:
+                return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+            case 82:
+                if ((active0 & 0x400L) != 0L) {
+                    jjmatchedKind = 10;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
+            case 83:
+                if ((active0 & 0x8000L) != 0L) {
+                    jjmatchedKind = 15;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x2000L);
+            case 85:
+                return jjMoveStringLiteralDfa2_0(active0, 0x40000L);
+            case 97:
+                return jjMoveStringLiteralDfa2_0(active0, 0x20000L);
+            case 101:
+                return jjMoveStringLiteralDfa2_0(active0, 0x800L);
+            case 105:
+                return jjMoveStringLiteralDfa2_0(active0, 0x1000L);
+            case 110:
+                if ((active0 & 0x4000L) != 0L) {
+                    jjmatchedKind = 14;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x200L);
+            case 111:
+                return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+            case 114:
+                if ((active0 & 0x400L) != 0L) {
+                    jjmatchedKind = 10;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
+            case 115:
+                if ((active0 & 0x8000L) != 0L) {
+                    jjmatchedKind = 15;
+                    jjmatchedPos = 1;
+                }
+                return jjMoveStringLiteralDfa2_0(active0, 0x2000L);
+            case 117:
+                return jjMoveStringLiteralDfa2_0(active0, 0x40000L);
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 1);
+    }
+
+    private int jjMoveStringLiteralDfa2_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjMoveNfa_0(5, 1);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 1);
+        }
+        switch (curChar) {
+            case 67:
+                return jjMoveStringLiteralDfa3_0(active0, 0x2000L);
+            case 68:
+                if ((active0 & 0x200L) != 0L) {
+                    jjmatchedKind = 9;
+                    jjmatchedPos = 2;
+                }
+                break;
+            case 75:
+                return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
+            case 76:
+                return jjMoveStringLiteralDfa3_0(active0, 0x60000L);
+            case 84:
+                if ((active0 & 0x100L) != 0L) {
+                    jjmatchedKind = 8;
+                    jjmatchedPos = 2;
+                }
+                return jjMoveStringLiteralDfa3_0(active0, 0x800L);
+            case 85:
+                return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
+            case 99:
+                return jjMoveStringLiteralDfa3_0(active0, 0x2000L);
+            case 100:
+                if ((active0 & 0x200L) != 0L) {
+                    jjmatchedKind = 9;
+                    jjmatchedPos = 2;
+                }
+                break;
+            case 107:
+                return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
+            case 108:
+                return jjMoveStringLiteralDfa3_0(active0, 0x60000L);
+            case 116:
+                if ((active0 & 0x100L) != 0L) {
+                    jjmatchedKind = 8;
+                    jjmatchedPos = 2;
+                }
+                return jjMoveStringLiteralDfa3_0(active0, 0x800L);
+            case 117:
+                return jjMoveStringLiteralDfa3_0(active0, 0x10000L);
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 2);
+    }
+
+    private int jjMoveStringLiteralDfa3_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjMoveNfa_0(5, 2);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 2);
+        }
+        switch (curChar) {
+            case 65:
+                return jjMoveStringLiteralDfa4_0(active0, 0x2000L);
+            case 69:
+                if ((active0 & 0x1000L) != 0L) {
+                    jjmatchedKind = 12;
+                    jjmatchedPos = 3;
+                } else if ((active0 & 0x10000L) != 0L) {
+                    jjmatchedKind = 16;
+                    jjmatchedPos = 3;
+                }
+                break;
+            case 76:
+                if ((active0 & 0x40000L) != 0L) {
+                    jjmatchedKind = 18;
+                    jjmatchedPos = 3;
+                }
+                break;
+            case 83:
+                return jjMoveStringLiteralDfa4_0(active0, 0x20000L);
+            case 87:
+                return jjMoveStringLiteralDfa4_0(active0, 0x800L);
+            case 97:
+                return jjMoveStringLiteralDfa4_0(active0, 0x2000L);
+            case 101:
+                if ((active0 & 0x1000L) != 0L) {
+                    jjmatchedKind = 12;
+                    jjmatchedPos = 3;
+                } else if ((active0 & 0x10000L) != 0L) {
+                    jjmatchedKind = 16;
+                    jjmatchedPos = 3;
+                }
+                break;
+            case 108:
+                if ((active0 & 0x40000L) != 0L) {
+                    jjmatchedKind = 18;
+                    jjmatchedPos = 3;
+                }
+                break;
+            case 115:
+                return jjMoveStringLiteralDfa4_0(active0, 0x20000L);
+            case 119:
+                return jjMoveStringLiteralDfa4_0(active0, 0x800L);
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 3);
+    }
+
+    private int jjMoveStringLiteralDfa4_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjMoveNfa_0(5, 3);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 3);
+        }
+        switch (curChar) {
+            case 69:
+                if ((active0 & 0x20000L) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 4;
+                }
+                return jjMoveStringLiteralDfa5_0(active0, 0x800L);
+            case 80:
+                return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
+            case 101:
+                if ((active0 & 0x20000L) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 4;
+                }
+                return jjMoveStringLiteralDfa5_0(active0, 0x800L);
+            case 112:
+                return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 4);
+    }
+
+    private int jjMoveStringLiteralDfa5_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjMoveNfa_0(5, 4);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 4);
+        }
+        switch (curChar) {
+            case 69:
+                if ((active0 & 0x2000L) != 0L) {
+                    jjmatchedKind = 13;
+                    jjmatchedPos = 5;
+                }
+                return jjMoveStringLiteralDfa6_0(active0, 0x800L);
+            case 101:
+                if ((active0 & 0x2000L) != 0L) {
+                    jjmatchedKind = 13;
+                    jjmatchedPos = 5;
+                }
+                return jjMoveStringLiteralDfa6_0(active0, 0x800L);
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 5);
+    }
+
+    private int jjMoveStringLiteralDfa6_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjMoveNfa_0(5, 5);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return jjMoveNfa_0(5, 5);
+        }
+        switch (curChar) {
+            case 78:
+                if ((active0 & 0x800L) != 0L) {
+                    jjmatchedKind = 11;
+                    jjmatchedPos = 6;
+                }
+                break;
+            case 110:
+                if ((active0 & 0x800L) != 0L) {
+                    jjmatchedKind = 11;
+                    jjmatchedPos = 6;
+                }
+                break;
+            default:
+                break;
+        }
+        return jjMoveNfa_0(5, 6);
+    }
+
+    static final long[] jjbitVec0 = { 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL };
+    static final long[] jjbitVec2 = { 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL };
+
+    private int jjMoveNfa_0(int startState, int curPos) {
+        int strKind = jjmatchedKind;
+        int strPos = jjmatchedPos;
+        int seenUpto;
+        input_stream.backup(seenUpto = curPos + 1);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            throw new Error("Internal Error");
+        }
+        curPos = 0;
+        int startsAt = 0;
+        jjnewStateCnt = 48;
+        int i = 1;
+        jjstateSet[0] = startState;
+        int kind = 0x7fffffff;
+        for (;;) {
+            if (++jjround == 0x7fffffff)
+                ReInitRounds();
+            if (curChar < 64) {
+                long l = 1L << curChar;
+                do {
+                    switch (jjstateSet[--i]) {
+                        case 5:
+                            if ((0x3ff000000000000L & l) != 0L)
+                                jjCheckNAddStates(0, 3);
+                            else if (curChar == 34)
+                                jjCheckNAddStates(4, 6);
+                            else if (curChar == 36) {
+                                if (kind > 25)
+                                    kind = 25;
+                                jjCheckNAdd(27);
+                            } else if (curChar == 39)
+                                jjCheckNAddStates(7, 9);
+                            else if (curChar == 46)
+                                jjCheckNAdd(17);
+                            else if (curChar == 47)
+                                jjstateSet[jjnewStateCnt++] = 6;
+                            else if (curChar == 45)
+                                jjstateSet[jjnewStateCnt++] = 0;
+                            if ((0x3fe000000000000L & l) != 0L) {
+                                if (kind > 19)
+                                    kind = 19;
+                                jjCheckNAddTwoStates(14, 15);
+                            } else if (curChar == 48) {
+                                if (kind > 21)
+                                    kind = 21;
+                                jjCheckNAddTwoStates(45, 47);
+                            }
+                            break;
+                        case 0:
+                            if (curChar == 45)
+                                jjCheckNAddStates(10, 12);
+                            break;
+                        case 1:
+                            if ((0xffffffffffffdbffL & l) != 0L)
+                                jjCheckNAddStates(10, 12);
+                            break;
+                        case 2:
+                            if ((0x2400L & l) != 0L && kind > 6)
+                                kind = 6;
+                            break;
+                        case 3:
+                            if (curChar == 10 && kind > 6)
+                                kind = 6;
+                            break;
+                        case 4:
+                            if (curChar == 13)
+                                jjstateSet[jjnewStateCnt++] = 3;
+                            break;
+                        case 6:
+                            if (curChar == 42)
+                                jjCheckNAddTwoStates(7, 8);
+                            break;
+                        case 7:
+                            if ((0xfffffbffffffffffL & l) != 0L)
+                                jjCheckNAddTwoStates(7, 8);
+                            break;
+                        case 8:
+                            if (curChar == 42)
+                                jjCheckNAddStates(13, 15);
+                            break;
+                        case 9:
+                            if ((0xffff7bffffffffffL & l) != 0L)
+                                jjCheckNAddTwoStates(10, 8);
+                            break;
+                        case 10:
+                            if ((0xfffffbffffffffffL & l) != 0L)
+                                jjCheckNAddTwoStates(10, 8);
+                            break;
+                        case 11:
+                            if (curChar == 47 && kind > 7)
+                                kind = 7;
+                            break;
+                        case 12:
+                            if (curChar == 47)
+                                jjstateSet[jjnewStateCnt++] = 6;
+                            break;
+                        case 13:
+                            if ((0x3fe000000000000L & l) == 0L)
+                                break;
+                            if (kind > 19)
+                                kind = 19;
+                            jjCheckNAddTwoStates(14, 15);
+                            break;
+                        case 14:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 19)
+                                kind = 19;
+                            jjCheckNAddTwoStates(14, 15);
+                            break;
+                        case 16:
+                            if (curChar == 46)
+                                jjCheckNAdd(17);
+                            break;
+                        case 17:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAddTwoStates(17, 18);
+                            break;
+                        case 19:
+                            if ((0x280000000000L & l) != 0L)
+                                jjCheckNAdd(20);
+                            break;
+                        case 20:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAdd(20);
+                            break;
+                        case 21:
+                        case 22:
+                            if (curChar == 39)
+                                jjCheckNAddStates(7, 9);
+                            break;
+                        case 23:
+                            if (curChar == 39)
+                                jjstateSet[jjnewStateCnt++] = 22;
+                            break;
+                        case 24:
+                            if ((0xffffff7fffffffffL & l) != 0L)
+                                jjCheckNAddStates(7, 9);
+                            break;
+                        case 25:
+                            if (curChar == 39 && kind > 24)
+                                kind = 24;
+                            break;
+                        case 26:
+                            if (curChar != 36)
+                                break;
+                            if (kind > 25)
+                                kind = 25;
+                            jjCheckNAdd(27);
+                            break;
+                        case 27:
+                            if ((0x3ff001000000000L & l) == 0L)
+                                break;
+                            if (kind > 25)
+                                kind = 25;
+                            jjCheckNAdd(27);
+                            break;
+                        case 28:
+                        case 29:
+                            if (curChar == 34)
+                                jjCheckNAddStates(4, 6);
+                            break;
+                        case 30:
+                            if (curChar == 34)
+                                jjstateSet[jjnewStateCnt++] = 29;
+                            break;
+                        case 31:
+                            if ((0xfffffffbffffffffL & l) != 0L)
+                                jjCheckNAddStates(4, 6);
+                            break;
+                        case 32:
+                            if (curChar == 34 && kind > 26)
+                                kind = 26;
+                            break;
+                        case 33:
+                            if ((0x3ff000000000000L & l) != 0L)
+                                jjCheckNAddStates(0, 3);
+                            break;
+                        case 34:
+                            if ((0x3ff000000000000L & l) != 0L)
+                                jjCheckNAddTwoStates(34, 35);
+                            break;
+                        case 35:
+                            if (curChar != 46)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAddTwoStates(36, 37);
+                            break;
+                        case 36:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAddTwoStates(36, 37);
+                            break;
+                        case 38:
+                            if ((0x280000000000L & l) != 0L)
+                                jjCheckNAdd(39);
+                            break;
+                        case 39:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAdd(39);
+                            break;
+                        case 40:
+                            if ((0x3ff000000000000L & l) != 0L)
+                                jjCheckNAddTwoStates(40, 41);
+                            break;
+                        case 42:
+                            if ((0x280000000000L & l) != 0L)
+                                jjCheckNAdd(43);
+                            break;
+                        case 43:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 22)
+                                kind = 22;
+                            jjCheckNAdd(43);
+                            break;
+                        case 44:
+                            if (curChar != 48)
+                                break;
+                            if (kind > 21)
+                                kind = 21;
+                            jjCheckNAddTwoStates(45, 47);
+                            break;
+                        case 46:
+                            if ((0x3ff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 20)
+                                kind = 20;
+                            jjstateSet[jjnewStateCnt++] = 46;
+                            break;
+                        case 47:
+                            if ((0xff000000000000L & l) == 0L)
+                                break;
+                            if (kind > 21)
+                                kind = 21;
+                            jjCheckNAdd(47);
+                            break;
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
+            } else if (curChar < 128) {
+                long l = 1L << (curChar & 077);
+                do {
+                    switch (jjstateSet[--i]) {
+                        case 5:
+                        case 27:
+                            if ((0x7fffffe87fffffeL & l) == 0L)
+                                break;
+                            if (kind > 25)
+                                kind = 25;
+                            jjCheckNAdd(27);
+                            break;
+                        case 1:
+                            jjAddStates(10, 12);
+                            break;
+                        case 7:
+                            jjCheckNAddTwoStates(7, 8);
+                            break;
+                        case 9:
+                        case 10:
+                            jjCheckNAddTwoStates(10, 8);
+                            break;
+                        case 15:
+                            if ((0x100000001000L & l) != 0L && kind > 19)
+                                kind = 19;
+                            break;
+                        case 18:
+                            if ((0x2000000020L & l) != 0L)
+                                jjAddStates(16, 17);
+                            break;
+                        case 24:
+                            jjAddStates(7, 9);
+                            break;
+                        case 31:
+                            jjAddStates(4, 6);
+                            break;
+                        case 37:
+                            if ((0x2000000020L & l) != 0L)
+                                jjAddStates(18, 19);
+                            break;
+                        case 41:
+                            if ((0x2000000020L & l) != 0L)
+                                jjAddStates(20, 21);
+                            break;
+                        case 45:
+                            if ((0x100000001000000L & l) != 0L)
+                                jjCheckNAdd(46);
+                            break;
+                        case 46:
+                            if ((0x7e0000007eL & l) == 0L)
+                                break;
+                            if (kind > 20)
+                                kind = 20;
+                            jjCheckNAdd(46);
+                            break;
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
+            } else {
+                int hiByte = curChar >> 8;
+                int i1 = hiByte >> 6;
+                long l1 = 1L << (hiByte & 077);
+                int i2 = (curChar & 0xff) >> 6;
+                long l2 = 1L << (curChar & 077);
+                do {
+                    switch (jjstateSet[--i]) {
+                        case 1:
+                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                jjAddStates(10, 12);
+                            break;
+                        case 7:
+                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                jjCheckNAddTwoStates(7, 8);
+                            break;
+                        case 9:
+                        case 10:
+                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                jjCheckNAddTwoStates(10, 8);
+                            break;
+                        case 24:
+                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                jjAddStates(7, 9);
+                            break;
+                        case 31:
+                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                jjAddStates(4, 6);
+                            break;
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
             }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 5:
-               case 27:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 25)
-                     kind = 25;
-                  jjCheckNAdd(27);
-                  break;
-               case 1:
-                  jjAddStates(10, 12);
-                  break;
-               case 7:
-                  jjCheckNAddTwoStates(7, 8);
-                  break;
-               case 9:
-               case 10:
-                  jjCheckNAddTwoStates(10, 8);
-                  break;
-               case 15:
-                  if ((0x100000001000L & l) != 0L && kind > 19)
-                     kind = 19;
-                  break;
-               case 18:
-                  if ((0x2000000020L & l) != 0L)
-                     jjAddStates(16, 17);
-                  break;
-               case 24:
-                  jjAddStates(7, 9);
-                  break;
-               case 31:
-                  jjAddStates(4, 6);
-                  break;
-               case 37:
-                  if ((0x2000000020L & l) != 0L)
-                     jjAddStates(18, 19);
-                  break;
-               case 41:
-                  if ((0x2000000020L & l) != 0L)
-                     jjAddStates(20, 21);
-                  break;
-               case 45:
-                  if ((0x100000001000000L & l) != 0L)
-                     jjCheckNAdd(46);
-                  break;
-               case 46:
-                  if ((0x7e0000007eL & l) == 0L)
-                     break;
-                  if (kind > 20)
-                     kind = 20;
-                  jjCheckNAdd(46);
-                  break;
-               default : break;
+            if (kind != 0x7fffffff) {
+                jjmatchedKind = kind;
+                jjmatchedPos = curPos;
+                kind = 0x7fffffff;
             }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int hiByte = (int)(curChar >> 8);
-         int i1 = hiByte >> 6;
-         long l1 = 1L << (hiByte & 077);
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(10, 12);
-                  break;
-               case 7:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddTwoStates(7, 8);
-                  break;
-               case 9:
-               case 10:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjCheckNAddTwoStates(10, 8);
-                  break;
-               case 24:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(7, 9);
-                  break;
-               case 31:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     jjAddStates(4, 6);
-                  break;
-               default : break;
+            ++curPos;
+            if ((i = jjnewStateCnt) == (startsAt = 48 - (jjnewStateCnt = startsAt)))
+                break;
+            try {
+                curChar = input_stream.readChar();
+            } catch (java.io.IOException e) {
+                break;
             }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 48 - (jjnewStateCnt = startsAt)))
-         break;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { break; }
-   }
-   if (jjmatchedPos > strPos)
-      return curPos;
+        }
+        if (jjmatchedPos > strPos)
+            return curPos;
 
-   int toRet = Math.max(curPos, seenUpto);
+        int toRet = Math.max(curPos, seenUpto);
 
-   if (curPos < toRet)
-      for (i = toRet - Math.min(curPos, seenUpto); i-- > 0; )
-         try { curChar = input_stream.readChar(); }
-         catch(java.io.IOException e) { throw new Error("Internal Error : Please send a bug report."); }
+        if (curPos < toRet)
+            for (i = toRet - Math.min(curPos, seenUpto); i-- > 0;)
+                try {
+                    curChar = input_stream.readChar();
+                } catch (java.io.IOException e) {
+                    throw new Error("Internal Error : Please send a bug report.");
+                }
 
-   if (jjmatchedPos < strPos)
-   {
-      jjmatchedKind = strKind;
-      jjmatchedPos = strPos;
-   }
-   else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
-      jjmatchedKind = strKind;
+        if (jjmatchedPos < strPos) {
+            jjmatchedKind = strKind;
+            jjmatchedPos = strPos;
+        } else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
+            jjmatchedKind = strKind;
 
-   return toRet;
-}
-static final int[] jjnextStates = {
-   34, 35, 40, 41, 30, 31, 32, 23, 24, 25, 1, 2, 4, 8, 9, 11, 
-   19, 20, 38, 39, 42, 43, 
-};
-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
-{
-   switch(hiByte)
-   {
-      case 0:
-         return ((jjbitVec2[i2] & l2) != 0L);
-      default :
-         if ((jjbitVec0[i1] & l1) != 0L)
-            return true;
-         return false;
-   }
-}
+        return toRet;
+    }
 
-/** Token literal values. */
-public static final String[] jjstrLiteralImages = {
-"", null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-"\75", "\74\76", "\76", "\76\75", "\74", "\74\75", "\50", "\54", "\51", "\53", "\55", 
-"\52", "\57", "\45", };
+    static final int[] jjnextStates = { 34, 35, 40, 41, 30, 31, 32, 23, 24, 25, 1, 2, 4, 8, 9, 11, 19, 20, 38, 39, 42, 43, };
 
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-static final long[] jjtoToken = {
-   0x1ffff7fff01L, 
-};
-static final long[] jjtoSkip = {
-   0xfeL, 
-};
-static final long[] jjtoSpecial = {
-   0x3eL, 
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[48];
-private final int[] jjstateSet = new int[96];
-protected char curChar;
-/** Constructor. */
-public SelectorParserImplTokenManager(SimpleCharStream stream){
-   if (SimpleCharStream.staticFlag)
-      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-   input_stream = stream;
-}
+    private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {
+        switch (hiByte) {
+            case 0:
+                return ((jjbitVec2[i2] & l2) != 0L);
+            default:
+                if ((jjbitVec0[i1] & l1) != 0L)
+                    return true;
+                return false;
+        }
+    }
 
-/** Constructor. */
-public SelectorParserImplTokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
+    /** Token literal values. */
+    public static final String[] jjstrLiteralImages = { "", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, "\75", "\74\76", "\76", "\76\75", "\74", "\74\75", "\50", "\54", "\51", "\53", "\55",
+        "\52", "\57", "\45", };
 
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 48; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
+    /** Lexer state names. */
+    public static final String[] lexStateNames = { "DEFAULT", };
+    static final long[] jjtoToken = { 0x1ffff7fff01L, };
+    static final long[] jjtoSkip = { 0xfeL, };
+    static final long[] jjtoSpecial = { 0x3eL, };
+    protected SimpleCharStream input_stream;
+    private final int[] jjrounds = new int[48];
+    private final int[] jjstateSet = new int[96];
+    protected char curChar;
 
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
+    public SelectorParserImplTokenManager(SimpleCharStream stream) {
+        if (SimpleCharStream.staticFlag)
+            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+        input_stream = stream;
+    }
 
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
-   if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
+    public SelectorParserImplTokenManager(SimpleCharStream stream, int lexState) {
+        this(stream);
+        SwitchTo(lexState);
+    }
 
-protected Token jjFillToken()
-{
-   final Token t;
-   final String curTokenImage;
-   final int beginLine;
-   final int endLine;
-   final int beginColumn;
-   final int endColumn;
-   String im = jjstrLiteralImages[jjmatchedKind];
-   curTokenImage = (im == null) ? input_stream.GetImage() : im;
-   beginLine = input_stream.getBeginLine();
-   beginColumn = input_stream.getBeginColumn();
-   endLine = input_stream.getEndLine();
-   endColumn = input_stream.getEndColumn();
-   t = Token.newToken(jjmatchedKind, curTokenImage);
+    public void ReInit(SimpleCharStream stream) {
+        jjmatchedPos = jjnewStateCnt = 0;
+        curLexState = defaultLexState;
+        input_stream = stream;
+        ReInitRounds();
+    }
 
-   t.beginLine = beginLine;
-   t.endLine = endLine;
-   t.beginColumn = beginColumn;
-   t.endColumn = endColumn;
+    private void ReInitRounds() {
+        int i;
+        jjround = 0x80000001;
+        for (i = 48; i-- > 0;)
+            jjrounds[i] = 0x80000000;
+    }
 
-   return t;
-}
+    public void ReInit(SimpleCharStream stream, int lexState) {
+        ReInit(stream);
+        SwitchTo(lexState);
+    }
+
+    public void SwitchTo(int lexState) {
+        if (lexState >= 1 || lexState < 0)
+            throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+        else
+            curLexState = lexState;
+    }
+
+    protected Token jjFillToken() {
+        final Token t;
+        final String curTokenImage;
+        final int beginLine;
+        final int endLine;
+        final int beginColumn;
+        final int endColumn;
+        String im = jjstrLiteralImages[jjmatchedKind];
+        curTokenImage = (im == null) ? input_stream.GetImage() : im;
+        beginLine = input_stream.getBeginLine();
+        beginColumn = input_stream.getBeginColumn();
+        endLine = input_stream.getEndLine();
+        endColumn = input_stream.getEndColumn();
+        t = Token.newToken(jjmatchedKind, curTokenImage);
+
+        t.beginLine = beginLine;
+        t.endLine = endLine;
+        t.beginColumn = beginColumn;
+        t.endColumn = endColumn;
 
-int curLexState = 0;
-int defaultLexState = 0;
-int jjnewStateCnt;
-int jjround;
-int jjmatchedPos;
-int jjmatchedKind;
+        return t;
+    }
 
-/** Get the next Token. */
-public Token getNextToken() 
-{
-  Token specialToken = null;
-  Token matchedToken;
-  int curPos = 0;
+    int curLexState = 0;
+    int defaultLexState = 0;
+    int jjnewStateCnt;
+    int jjround;
+    int jjmatchedPos;
+    int jjmatchedKind;
 
-  EOFLoop :
-  for (;;)
-  {
-   try
-   {
-      curChar = input_stream.BeginToken();
-   }
-   catch(java.io.IOException e)
-   {
-      jjmatchedKind = 0;
-      matchedToken = jjFillToken();
-      matchedToken.specialToken = specialToken;
-      return matchedToken;
-   }
+    /**
+     * @return the next token in the chain.
+     */
+    public Token getNextToken() {
+        Token specialToken = null;
+        Token matchedToken;
+        int curPos = 0;
 
-   jjmatchedKind = 0x7fffffff;
-   jjmatchedPos = 0;
-   curPos = jjMoveStringLiteralDfa0_0();
-   if (jjmatchedKind != 0x7fffffff)
-   {
-      if (jjmatchedPos + 1 < curPos)
-         input_stream.backup(curPos - jjmatchedPos - 1);
-      if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
-      {
-         matchedToken = jjFillToken();
-         matchedToken.specialToken = specialToken;
-         return matchedToken;
-      }
-      else
-      {
-         if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
-         {
-            matchedToken = jjFillToken();
-            if (specialToken == null)
-               specialToken = matchedToken;
-            else
-            {
-               matchedToken.specialToken = specialToken;
-               specialToken = (specialToken.next = matchedToken);
+        EOFLoop: for (;;) {
+            try {
+                curChar = input_stream.BeginToken();
+            } catch (java.io.IOException e) {
+                jjmatchedKind = 0;
+                matchedToken = jjFillToken();
+                matchedToken.specialToken = specialToken;
+                return matchedToken;
             }
-         }
-         continue EOFLoop;
-      }
-   }
-   int error_line = input_stream.getEndLine();
-   int error_column = input_stream.getEndColumn();
-   String error_after = null;
-   boolean EOFSeen = false;
-   try { input_stream.readChar(); input_stream.backup(1); }
-   catch (java.io.IOException e1) {
-      EOFSeen = true;
-      error_after = curPos <= 1 ? "" : input_stream.GetImage();
-      if (curChar == '\n' || curChar == '\r') {
-         error_line++;
-         error_column = 0;
-      }
-      else
-         error_column++;
-   }
-   if (!EOFSeen) {
-      input_stream.backup(1);
-      error_after = curPos <= 1 ? "" : input_stream.GetImage();
-   }
-   throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
-  }
-}
 
-private void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-private void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-private void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
+            jjmatchedKind = 0x7fffffff;
+            jjmatchedPos = 0;
+            curPos = jjMoveStringLiteralDfa0_0();
+            if (jjmatchedKind != 0x7fffffff) {
+                if (jjmatchedPos + 1 < curPos)
+                    input_stream.backup(curPos - jjmatchedPos - 1);
+                if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
+                    matchedToken = jjFillToken();
+                    matchedToken.specialToken = specialToken;
+                    return matchedToken;
+                } else {
+                    if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
+                        matchedToken = jjFillToken();
+                        if (specialToken == null)
+                            specialToken = matchedToken;
+                        else {
+                            matchedToken.specialToken = specialToken;
+                            specialToken = (specialToken.next = matchedToken);
+                        }
+                    }
+                    continue EOFLoop;
+                }
+            }
+            int error_line = input_stream.getEndLine();
+            int error_column = input_stream.getEndColumn();
+            String error_after = null;
+            boolean EOFSeen = false;
+            try {
+                input_stream.readChar();
+                input_stream.backup(1);
+            } catch (java.io.IOException e1) {
+                EOFSeen = true;
+                error_after = curPos <= 1 ? "" : input_stream.GetImage();
+                if (curChar == '\n' || curChar == '\r') {
+                    error_line++;
+                    error_column = 0;
+                } else
+                    error_column++;
+            }
+            if (!EOFSeen) {
+                input_stream.backup(1);
+                error_after = curPos <= 1 ? "" : input_stream.GetImage();
+            }
+            throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+        }
+    }
 
-private void jjCheckNAddStates(int start, int end)
-{
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
+    private void jjCheckNAdd(int state) {
+        if (jjrounds[state] != jjround) {
+            jjstateSet[jjnewStateCnt++] = state;
+            jjrounds[state] = jjround;
+        }
+    }
+
+    private void jjAddStates(int start, int end) {
+        do {
+            jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+        } while (start++ != end);
+    }
+
+    private void jjCheckNAddTwoStates(int state1, int state2) {
+        jjCheckNAdd(state1);
+        jjCheckNAdd(state2);
+    }
 
+    private void jjCheckNAddStates(int start, int end) {
+        do {
+            jjCheckNAdd(jjnextStates[start]);
+        } while (start++ != end);
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org