GA-YOGS now parses like G-YOGS and GAYOGS do.

This commit is contained in:
dchandler 2003-10-26 18:06:38 +00:00
parent 61cf19932e
commit e74547d743
2 changed files with 6 additions and 0 deletions

View file

@ -410,6 +410,9 @@ tstHelper("KA'", "[(K . A), (' . )]",
tstHelper("NE+YA", "{NE}{+-}{YA}", tstHelper("NE+YA", "{NE}{+-}{YA}",
null, null, "!null!"); null, null, "!null!");
tstHelper("GA-YOGS", "{GA}{-}{YO}{G}{S}",
new String[] { "{GA}{YO}{G+S}", "{GA}{YO}{G}{S}" }, null, "{GA}{YO}{G}{S}");
tstHelper("GDAMS'O", "{G}{DA}{M}{S'O}", tstHelper("GDAMS'O", "{G}{DA}{M}{S'O}",
new String[] { new String[] {
"{G+DA}{M+S'O}", "{G+DA}{M+S'O}",

View file

@ -354,6 +354,9 @@ class TPairList {
if (ddebug) System.out.println("i is " + i); if (ddebug) System.out.println("i is " + i);
TPair p = get(i); TPair p = get(i);
// GA-YOGS should be treated like GAYOGS or G-YOGS:
if (p.isDisambiguator()) continue;
boolean nn; boolean nn;
if ((nn = p.isNumeric()) && ("+".equals(get(i-1).getRight()) if ((nn = p.isNumeric()) && ("+".equals(get(i-1).getRight())
|| "+".equals(p.getRight()))) || "+".equals(p.getRight())))