X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Futil%2FGrammar.java;h=6ad25807f5d13cd05699bfacecd1721404332514;hb=163ff4c57ec557bb8615f80e875f045cdfbad696;hp=48018c77b1d9cc150fc152dc442032ec4abcc8e5;hpb=75b9e1e72f6067e59a1e5312c91d20d05ec8a927;p=org.ibex.core.git diff --git a/src/org/xwt/util/Grammar.java b/src/org/xwt/util/Grammar.java index 48018c7..6ad2580 100644 --- a/src/org/xwt/util/Grammar.java +++ b/src/org/xwt/util/Grammar.java @@ -6,7 +6,7 @@ import org.xwt.js.*; public abstract class Grammar extends JS { - public JSFunction action = null; + public JS action = null; public Grammar() { } // means we call()ed a Grammar that hasn't been bound to a scope yet @@ -22,7 +22,7 @@ public abstract class Grammar extends JS { final int ret = match(s, start, v2, scope); Object result = ret == -1 ? NULL : action == null ? s.substring(start, ret) : - action.cloneWithNewParentScope(new JSScope(scope) { + JS.cloneWithNewParentScope(action, new JSScope(scope) { public Object get(Object key) throws JSExn { Object val = v2.get(key); if (val == NULL) return null;