Revision 44139 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/SQLLexicalAnalyzer.java

View differences:

SQLLexicalAnalyzer.java
89 89
            token.set(Token.OP_GT, ">");
90 90
            return token;
91 91

  
92
        case '|':
93
            ch = getch();
94
            switch( ch ) {
95
            case EOF:
96
                throw new ExpressionSyntaxException(I18N.unexpected_end_of_source(), this);
97
            case '|':
98
                token.set(Token.OP_CONCAT, "||");
99
                return token;
100
            }
101
            ungetch();
102
            token.set(Token.OP_GT, "|");
103
            return token;
104

  
92 105
        case '.': // SQL Extension to access object methods and attributes
93 106
            token.set(Token.OP_GETATTR, ".");
94 107
            return token;
......
153 166
            token.set(Token.IDENTIFIER, buffer.toString());
154 167
            return token;
155 168

  
169
        case ']':
170
            token.set(Token.CLOSED_BRACKET, "]");
171
            return token;
156 172
        case '[':
173
            if( !this.useBracketsForIdentifiers ) {
174
                token.set(Token.OPEN_BRACKET, "[");
175
                return token;
176
            }
157 177
            buffer.clear();
158 178
            ch = getch();
159 179
            while( ch != ']' ) {
......
193 213
            return token;
194 214
        }
195 215

  
196
        token.set(Token.EOF, null, null);
216
        token.set(Token.CHAR, Character.toString(ch), Character.toString(ch));
197 217
        return token;
198 218
    }
199 219

  

Also available in: Unified diff