Revision 46091 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
73 73 
            token.set(Token.OP_DIV, "/");
74 74 
            return token;
75 75 
        case '%':
76 
			ch = getch();
77 
            switch( ch ) {
78 
            case EOF:
79 
                throw new ExpressionSyntaxException(I18N.unexpected_end_of_source(), this);
80 
            case '>':
81 
                token.set(Token.END_$CONSTANT, "%>");
82 
                return token;
83 
            }
84 
            ungetch();
76 85 
            token.set(Token.OP_MOD, "%");
77 86 
            return token;
78 87 
        case '=':
......
112 121 
            case '=':
113 122 
                token.set(Token.OP_LE, "<=");
114 123 
                return token;
124 
            case '%':
125 
                token.set(Token.BEGIN_$CONSTANT, "<%");
126 
                return token;
115 127 
            }
116 128 
            ungetch();
117 129 
            token.set(Token.OP_LT, "<");
......
232 244 
        case '\'':
233 245 
            parseString();
234 246 
            return token;
235
247
236 248 
        case '@':
237 249 
            ungetch();
238 250 
            parseDMSNumber();
239 251 
            return token;
252 
//
253 
//        case '$':
254 
//            ch = getch();
255 
//            switch( ch ) {
256 
//            case EOF:
257 
//                throw new ExpressionSyntaxException(I18N.unexpected_end_of_source(), this);
258 
//            case '$':
259 
//                parseStringBlock();
260 
//                return token;
261 
//            }
262 
//            ungetch();
263 
//            ungetch();
264 
//            break;
240 265 
        }
241 266
242 267 
        if( Character.isDigit(ch) ) {
243 268 
            ungetch();
244 269 
            parseNumber();
245 270 
            return token;
246 
        }
271 
        }
247 272 
        if( Character.isAlphabetic(ch) || ch =='$' ) {
248 273 
            buffer.clear();
249 274 
            while( Character.isLetterOrDigit(ch) || ch =='$' || ch == '_' ) {

Also available in: Unified diff