MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE with simple arithmetic expressions (e.g. 1+1)

Browse Source
This commit is contained in:
Sascha Weinreuter
2011-11-16 10:23:14 +01:00
parent 114f856443
commit 0e2f320bb0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xslt-debugger/engine/impl/src/org/intellij/plugins/xsltDebugger/rt/engine/local/saxon9/Saxon9StyleFrame.java
+8 -2
View File
@@ -17,6 +17,7 @@
package org.intellij.plugins.xsltDebugger.rt.engine.local.saxon9;
import net.sf.saxon.expr.Expression;
import net.sf.saxon.expr.ExpressionVisitor;
import net.sf.saxon.expr.StackFrame;
import net.sf.saxon.expr.XPathContext;
import net.sf.saxon.expr.instruct.GlobalVariable;
@@ -28,6 +29,8 @@ import net.sf.saxon.om.ValueRepresentation;
import net.sf.saxon.style.StyleElement;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.type.ItemType;
import net.sf.saxon.type.Type;
import net.sf.saxon.type.TypeHierarchy;
import org.intellij.plugins.xsltDebugger.rt.engine.Debugger;
import org.intellij.plugins.xsltDebugger.rt.engine.Value;
import org.intellij.plugins.xsltDebugger.rt.engine.local.VariableImpl;
@@ -58,7 +61,10 @@ class Saxon9StyleFrame<N extends StyleElement> extends AbstractSaxon9Frame<Debug
public Value eval(String expr) throws Debugger.EvaluationException {
try {
final Expression expression = myElement.makeExpression(expr);
Expression expression = myElement.makeExpression(expr);
final TypeHierarchy typeHierarchy = myXPathContext.getConfiguration().getTypeHierarchy();
expression = expression.typeCheck(ExpressionVisitor.make(myElement.getStaticContext(), expression.getExecutable()), Type.ITEM_TYPE);
final ItemType itemType = expression.getItemType(typeHierarchy);
final Item evaluate = expression.evaluateItem(myXPathContext);
return new Value() {
@Override
@@ -68,7 +74,7 @@ class Saxon9StyleFrame<N extends StyleElement> extends AbstractSaxon9Frame<Debug
@Override
public Type getType() {
return new ObjectType(expression.getItemType(myXPathContext.getConfiguration().getTypeHierarchy()).toString());
return new ObjectType(itemType.toString());
}
};
} catch (IllegalArgumentException e) {