Author: scabanovich Date: 2008-10-03 09:52:25 -0400 (Fri, 03 Oct 2008) New Revision: 10655 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java Log: JBIDE-1497. Minor improvements Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java 2008-10-03 13:35:45 UTC (rev 10654) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/parser/Tokenizer.java 2008-10-03 13:52:25 UTC (rev 10655) @@ -24,7 +24,7 @@ * */ public class Tokenizer { - static int LITERAL = -10; + public static int LITERAL = -10; private Map<Integer, ITokenDescription> tokenDescriptions = new HashMap<Integer, ITokenDescription>(); private Map<Integer, List<IRule>> rules = new HashMap<Integer, List<IRule>>(); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2008-10-03 13:35:45 UTC (rev 10654) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2008-10-03 13:52:25 UTC (rev 10655) @@ -12,6 +12,7 @@ import org.jboss.tools.common.el.core.model.ELObjectType; import org.jboss.tools.common.el.core.parser.LexicalToken; +import org.jboss.tools.common.el.core.parser.Tokenizer; import org.jboss.tools.common.el.internal.core.model.ELArgumentImpl; import org.jboss.tools.common.el.internal.core.model.ELArgumentExpressionImpl; import org.jboss.tools.common.el.internal.core.model.ELComplexExpressionImpl; @@ -288,7 +289,10 @@ private LexicalToken lookUpNextToken(LexicalToken token) { LexicalToken c = token; - while(c != null && (c == token || c.getType() == WhiteSpaceTokenDescription.WHITESPACE)) { + while(c != null + && (c == token + || c.getType() == WhiteSpaceTokenDescription.WHITESPACE + || c.getType() == Tokenizer.LITERAL)) { c = c.getNextToken(); } return c;