X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=9f67307f29b31a361d829a2f0208a47ee2d3d029;hp=c563ce50185457c9acbe10de1a7a9607f8f048f0;hb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6;hpb=df32ec862cecf0851a7f7342582b5786d04a4771 diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index c563ce5..9f67307 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -150,6 +150,7 @@ public class MetaGrammar extends StringWalker { else if ("psy".equals(head)) return (PreSequence)walk(tree, 0); else if ("->".equals(head)) { PreSequence p = (PreSequence)walk(tree, 0); p.noFollow = (Element)walk(tree, 1); return p; } else if ("/".equals(head)) return ((PreSequence)walk(tree, 0)).sparse((Element)walk(tree, 1)); + else if (" /".equals(head)) return ((PreSequence)walk(tree, 0)).sparse((Element)walk(tree, 1)); else if ("~".equals(head)) return new Hack(new Atom.Invert(new Atom.Infer((Element)walk(tree, 0)))); else if ("ps".equals(head)) return new PreSequence((Object[])walk(tree,0), null); else if (":".equals(head)) { @@ -276,8 +277,8 @@ public class MetaGrammar extends StringWalker { } else { if (keeping) drops[i] = true; } - if (oi==SELF) o2[j] = u.new Subset("(("+u+"))", set); - else o2[j] = (Element)oi; + /*if (oi==SELF) o2[j] = u.new Subset("(("+u+"))", set); + else*/ o2[j] = (Element)oi; if (MetaGrammar.dropAll.contains(o2[j])) drops[j] = true; nonDrop += drops[j] ? 0 : 1;