Changeset 22193 in project

Timestamp:

01/03/11 06:43:32 (9 years ago)

Author:

Alan Post

Message:

jbogenturfa'i: clean up morphology interface.

Add Y as a cmavo class.

Make sure the morphology public rule uses the header productions.

File:

• release/4/jbogenturfahi/trunk/rafske_gumgau.peg (modified) (2 diffs)

release/4/jbogenturfahi/trunk/rafske_gumgau.peg

@@ -1 @@
-; Ignore the -morph bits here if searching for these non-terminals.
-;; out of date: BU is before spaces in front so we can catch Y + BU before anything else.
-morphology <- `initial-spaces?
-              ( ( CMAVO
-                / BRIVLA
-                / CMENE
-                / non-lojban-word )
-              `spaces? )*
+morphology <- `spaces? ( any-word `spaces? )* `EOF
+;morphology <- ( BU-clause / `spaces )* ( any-word `spaces? )* `EOF
 
-; morphology <- (BU-clause-morph / spaces-morph)* (any-word-morph spaces-morph?)* EOF-morph
+any-word <- LOJBAN-WORD
+          / non-lojban-word
 
-;         any single lexable Lojban words
-;any-word <- CMAVO / BRIVLA / CMENE / non-lojban-word
+LOJBAN-WORD <- CMENE
+             / CMAVO
+             / BRIVLA
 
 CMENE  <- cmene
-BRIVLA <- gismu
-        / lujvo
-        / fuhivla
+BRIVLA <- brivla
 
-;CMAVO <- !A !BAI !BAhE !BE !BEI !BEhO !BIhE !BIhI !BO !BOI !BU !BY !CAhA !CAI !CEI !CEhE !CO !COI !CU !CUhE !DAhO !DOI !DOhU !FA !FAhA !FAhO !FEhE !FEhU !FIhO !FOI !FUhA !FUhE !FUhO !GA !GAhO !GEhU !GI !GIhA !GOI !GOhA !GUhA !I !JA !JAI !JOhI !JOI !KE !KEhE !KEI !KI !KOhA !KU !KUhE !KUhO !LA !LAU !LAhE !LE !LEhU !LI !LIhU !LOhO !LOhU !LU !LUhU !MAhO !MAI !ME !MEhU !MOhE !MOhI !MOI !NA !NAI !NAhE !NAhU !NIhE !NIhO !NOI !NU !NUhA !NUhI !NUhU !PA !PEhE !PEhO !PU !RAhO !ROI !SA !SE !SEI !SEhU !SI !SOI !SU !TAhE !TEhU !TEI !TO !TOI !TUhE !TUhU !UI !VA !VAU !VEI !VEhO !VUhU !VEhA !VIhA !VUhO !XI !ZAhO !ZEhA !ZEI !ZI !ZIhE !ZO !ZOI !ZOhU cmavo
 CMAVO <- A
        / BAI
@@ -132 +125 @@
        / VUhO
        / XI
+       / Y
        / ZAhO
        / ZEhA