[Zaf-commit] SF.net SVN: zaf:[9674] trunk/dict/zu/hunspell/zu_aff.py

[<fri...@us...>]

Revision: 9674
          http://zaf.svn.sourceforge.net/zaf/?rev=9674&view=rev
Author:   friedelwolff
Date:     2009-02-25 07:31:56 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Change some class flags to reflect their public (capital) / private (small) nature. Add classes for more proper locative handling.

Modified Paths:
--------------
    trunk/dict/zu/hunspell/zu_aff.py

Modified: trunk/dict/zu/hunspell/zu_aff.py
===================================================================
--- trunk/dict/zu/hunspell/zu_aff.py	2009-02-24 09:52:02 UTC (rev 9673)
+++ trunk/dict/zu/hunspell/zu_aff.py	2009-02-25 07:31:56 UTC (rev 9674)
@@ -38,6 +38,7 @@
 #TODO: auxilary verbs
 #TODO: consider avoiding illegal reflexives
 #TODO: hortative particle words
+#TODO: noun continuation class for infinitive+obj and negative infinitives?
 
 #NOUNS:
 #TODO: locatives
@@ -412,21 +413,30 @@
     negative_anga = aff.add_group(suffix=True, flag="f")
     # This groups contains the suffixes for the negative indicative (past)
 
-    imperative = aff.add_group(suffix=True, flag="F")
+    imperative = aff.add_group(suffix=True, flag="g")
     # This contains suffixes for imperative mode
 
-    question = aff.add_group(suffix=True, flag="I")
+    question = aff.add_group(suffix=True, flag="i")
     # This group contains rules for forming question words
 
-    locative = aff.add_group(suffix=False, flag="n")
-    # This group will contain rules for locative prefixes
+    noun = aff.add_group(suffix=False, flag="N")
+    # This group will contain most prefixes for nouns
 
-    locative_sfx = aff.add_group(suffix=True, flag="m")
+    locative_e_ini = aff.add_group(suffix=False, flag="M")
+    # This group will contain rules for locative prefixes in the form e...ini
+
+    locative_o_ini = aff.add_group(suffix=False, flag="O")
+    # This group will contain rules for locative prefixes in the form o...ini
+
+    locative_ku = aff.add_group(suffix=False, flag="P")
+    # This group will contain rules for locative prefixes with the prefix ku- and kwa-
+
+    locative_kwi = aff.add_group(suffix=False, flag="Q")
+    # This group will contain rules for locative prefixes with the prefix kwi-
+
+    locative_sfx_ini = aff.add_group(suffix=True, flag="m")
     # This group will contain rules for locative suffixes
 
-    noun = aff.add_group(suffix=False, flag="N")
-    # This group will contain most prefixes for nouns
-
     for morpheme in subject_morphemes:
         # Indicative short form, present, positive with subject morpheme only
         verb_rules(main_subjects, affix=morpheme, continuation_classes=[past_indicative, question])
@@ -476,7 +486,7 @@
     verb_rules(infixes, affix="sayoku", needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
 
     #infinitive
-    verb_rules(infixes, affix="uku", morphology="INFINITIVE", continuation_classes=[locative, noun])
+    verb_rules(infixes, affix="uku", morphology="INFINITIVE", continuation_classes=[locative_e_ini, noun])
     # Infinitive forms are by defintion also class 15 nouns, and should
     # therefore be handled as nouns. Therefore the noun rules are added as a
     # continuation class. This allows us to recognise forms such as
@@ -498,7 +508,7 @@
     # directly to the verb stem along with the infinitive prefix.
 
     #infinitive + -sa- progressive aspectual morpheme
-    verb_rules(infixes, affix="ukusa", morphology="INFINITIVE_PROG", continuation_classes=[locative])
+    verb_rules(infixes, affix="ukusa", morphology="INFINITIVE_PROG", continuation_classes=[locative_e_ini])
     #infinitive, negative
     verb_rules(infixes, affix="ukunga", needaffix=True, circumfix=True, morphology="INFINITIVE_NEG", continuation_classes=[negative_i])#XXX
     #infinitive, negative, with -ka- exclusive aspectual morpheme
@@ -539,11 +549,11 @@
         verb_rules(infixes, affix="sayuku"+morpheme, needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
 
         #infinitive with object morpheme
-        verb_rules(infixes, affix="uku"+morpheme, morphology="INFINITIVE_with_OBJ", continuation_classes=[locative])
+        verb_rules(infixes, affix="uku"+morpheme, morphology="INFINITIVE_with_OBJ", continuation_classes=[locative_e_ini])
         #negative infinitive with object morpheme
         verb_rules(infixes, affix="ukunga"+morpheme, needaffix=True, circumfix=True, morphology="INFINITIVE_NEG_with_OBJ", continuation_classes=[negative_i])
         #infinitive + -sa- progressive aspectual morpheme
-        verb_rules(infixes, affix="ukusa"+morpheme, morphology="INFINITIVE_PROG_with_OBJ", continuation_classes=[locative])
+        verb_rules(infixes, affix="ukusa"+morpheme, morphology="INFINITIVE_PROG_with_OBJ", continuation_classes=[locative_e_ini])
 
     infixes.add_rule(affix="", condition="[^aeiou]", morphology="IMPERATIVE", continuation_classes=[imperative])
     infixes.add_rule(affix="y", condition="[aeiou]", morphology="IMPERATIVE", continuation_classes=[imperative])
@@ -561,9 +571,9 @@
     question.add_rule(affix="elani", strip="a", condition="a", morphology="Q_PRESENT_why")
     question.add_rule(affix="eleni", strip="a", condition="a", morphology="Q_PAST_why")
 
-    locative.add_rule(affix="e", strip="u", morphology="LOC_pfx", circumfix=True, continuation_classes=[locative_sfx])
+    locative_e_ini.add_rule(affix="e", strip="u", morphology="LOC_pfx", circumfix=True, continuation_classes=[locative_sfx_ini])
 
-    locative_sfx.add_rule(affix="eni", strip="a", circumfix=True, morphology="LOC_sfx")
+    locative_sfx_ini.add_rule(affix="eni", strip="a", circumfix=True, morphology="LOC_sfx")
 
 
     ###  Nouns  ###


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.