Skip to content

Commit

Permalink
Fixes to 3PL/4SG middle prefix TAMA allomorphs in 0-IPFV-STAT
Browse files Browse the repository at this point in the history
Fixes to 3PL/4SG middle prefix TAMA allomorphs in 0-IPFV-STAT, making sure that checks against the presence or absence of direct object marking on the verb only apply to valence classes in which direct object marking can be found.
  • Loading branch information
coxchristopher authored May 27, 2024
1 parent fb7f4b7 commit 278f52e
Showing 1 changed file with 63 additions and 9 deletions.
72 changes: 63 additions & 9 deletions src/fst/morphology/affixes/verb_inner_affixes.lexc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Multichar_Symbols @D.OBJECTPERSON@ @D.PREFIX@ @D.SUBJECTPERSON.4@ @D.VALENCE.TRANSITIVE@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.MIDDLE@ @R.DISTRIBUTIVE.OFF@ @R.DISTRIBUTIVE.ON@ @R.OBJECTNUMBER.PL@ @R.OBJECTNUMBER.SG@ @R.OBJECTPERSON@ @R.OBJECTPERSON.1@ @R.OBJECTPERSON.2@ @R.OBJECTPERSON.3@ @R.OBJECTPERSON.4@ @R.OBJECTPERSON.RECIP@ @R.OBJECTPERSON.REFL@ @R.OBJECTPERSON.INDEF@ @D.OBJECTPERSON.INDEF@ @R.PREFIX.INNER@ @R.PREFIX.MIDDLE@ @R.PREFIX.OUTER@ @R.SUBJECTNUMBER.PL@ @R.SUBJECTNUMBER.SG@ @R.SUBJECTPERSON.3@ @R.SUBJECTPERSON.4@ @U.ASPECT.IPFV@ @U.ASPECT.PFV@ @U.ASPECT.POT@ @U.ASPECT.PROG@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.RECIP@ @U.OBJECTPERSON.REFL@ @U.PREFIX.OUTER@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.TAMA.%0@ @U.TAMA.%0-STAT@ @U.TAMA.i@ @U.TAMA.isi@ @U.TAMA.ni@ @U.TAMA.si@ @U.TAMA.yi-a@ @U.TAMA.yi-y@ @U.TAMA.yi@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.OO-EXPERIENCER@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.TRANSITIONAL@ @U.VALENCE.TRANSITIVE@ @U.VV.%0@ @U.VV.S@ @U.VV.I@ @D.VALENCE.TRANSITIONAL@ @D.OBJECTPERSON.3@ @D.OBJECTNUMBER.SG@ @D.SUBJECTPERSON.3@ @U.DIRECTOBJECT.GIVEN@ @D.DIRECTOBJECT.GIVEN@ @U.DIRECTOBJECT.EMPHATIC@ @D.DIRECTOBJECT.EMPHATIC@ @U.DIRECTOBJECT.NONE@ @U.DIALECT.BIGCROW@ @U.DIALECT.BIGPLUME@ @U.DIALECT.CROWCHIEF@ @R.LOWTONE.ON@ @P.LOWTONE.ON@ @D.LOWTONE@ i2 s2 s3 ^L
Multichar_Symbols @D.OBJECTPERSON@ @D.PREFIX@ @D.SUBJECTPERSON.4@ @D.VALENCE.TRANSITIVE@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.MIDDLE@ @R.DISTRIBUTIVE.OFF@ @R.DISTRIBUTIVE.ON@ @R.OBJECTNUMBER.PL@ @R.OBJECTNUMBER.SG@ @R.OBJECTPERSON@ @R.OBJECTPERSON.1@ @R.OBJECTPERSON.2@ @R.OBJECTPERSON.3@ @R.OBJECTPERSON.4@ @R.OBJECTPERSON.RECIP@ @R.OBJECTPERSON.REFL@ @R.OBJECTPERSON.INDEF@ @D.OBJECTPERSON.INDEF@ @R.PREFIX.INNER@ @R.PREFIX.MIDDLE@ @R.PREFIX.OUTER@ @R.SUBJECTNUMBER.PL@ @R.SUBJECTNUMBER.SG@ @R.SUBJECTPERSON.3@ @R.SUBJECTPERSON.4@ @U.ASPECT.IPFV@ @U.ASPECT.PFV@ @U.ASPECT.POT@ @U.ASPECT.PROG@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.RECIP@ @U.OBJECTPERSON.REFL@ @U.PREFIX.OUTER@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.TAMA.%0@ @U.TAMA.%0-STAT@ @U.TAMA.i@ @U.TAMA.isi@ @U.TAMA.ni@ @U.TAMA.si@ @U.TAMA.yi-a@ @U.TAMA.yi-y@ @U.TAMA.yi@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.OO-EXPERIENCER@ @U.VALENCE.DO-EXPERIENCER@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.TRANSITIONAL@ @U.VALENCE.TRANSITIVE@ @U.VV.%0@ @U.VV.S@ @U.VV.I@ @D.VALENCE.TRANSITIONAL@ @D.OBJECTPERSON.3@ @D.OBJECTNUMBER.SG@ @D.SUBJECTPERSON.3@ @U.DIRECTOBJECT.GIVEN@ @D.DIRECTOBJECT.GIVEN@ @U.DIRECTOBJECT.EMPHATIC@ @D.DIRECTOBJECT.EMPHATIC@ @U.DIRECTOBJECT.NONE@ @U.DIALECT.BIGCROW@ @U.DIALECT.BIGPLUME@ @U.DIALECT.CROWCHIEF@ @R.LOWTONE.ON@ @P.LOWTONE.ON@ @D.LOWTONE@ i2 s2 s3 ^L

LEXICON Root

Expand Down Expand Up @@ -160,35 +160,53 @@ LEXICON 0-IPFV-AFF-MiddlePrefix-DOIndef
0-IPFV-AFF-MiddlePrefix-4SG;

LEXICON 0-IPFV-AFF-MiddlePrefix-3PL
@U.VALENCE.INTRANSITIVE@í #;
@U.VALENCE.OBLIQUEOBJECT@í #;
@U.VALENCE.OO-EXPERIENCER@í #;
@U.VALENCE.TRANSITIVE@ 0-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DITRANSITIVE@ 0-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.TRANSITIONAL@ 0-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0-IPFV-AFF-MiddlePrefix-3PL-DObj;

LEXICON 0-IPFV-AFF-MiddlePrefix-3PL-DObj
! O ágílàg "they made O; they did (it to) O" (= cases where there is no
! object prefix on the verb)
@U.DIRECTOBJECT.GIVEN@í #;
@U.DIRECTOBJECT.GIVEN@í #;

! ágiyìlàg "they made it; they did (it to) it" (emphatic or non-emphatic);
! ásigìlàg "they made me; they did (it to) me"; áagìlàg "they mdae something;
! they did (it to) something" (= all cases where there is an object prefix on
! the verb)
@U.DIRECTOBJECT.EMPHATIC@i #;
@U.DIRECTOBJECT.NONE@i #;
@U.DIRECTOBJECT.EMPHATIC@i #;
@U.DIRECTOBJECT.NONE@i #;

LEXICON 0-IPFV-AFF-MiddlePrefix-4SG
@U.VALENCE.INTRANSITIVE@í #;
@U.VALENCE.OBLIQUEOBJECT@í #;
@U.VALENCE.OO-EXPERIENCER@í #;
@U.VALENCE.TRANSITIVE@ 0-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DITRANSITIVE@ 0-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.TRANSITIONAL@ 0-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0-IPFV-AFF-MiddlePrefix-4SG-DObj;

LEXICON 0-IPFV-AFF-MiddlePrefix-4SG-DObj
! O áts'ílá "someone will make O; someone will do (it to) O" (= no object
! prefix on the verb)
@U.DIRECTOBJECT.GIVEN@í #;
@U.DIRECTOBJECT.GIVEN@í #;

! áts'ílá "someone will make it; someone will do (it to) it" (= no object
! prefix on the verb)
@U.DIRECTOBJECT.NONE@@U.OBJECTPERSON.3@@U.OBJECTNUMBER.SG@í #;
@U.DIRECTOBJECT.NONE@@U.OBJECTPERSON.3@@U.OBJECTNUMBER.SG@í #;

! ásits'ìlá "someone will make me; someone will do (it to) me"; áats'ìlá
! "someone will make something; someone will do (it to) something" (= an
! object prefix appears on the verb)
@U.DIRECTOBJECT.NONE@@D.OBJECTPERSON.3@i #;
@U.DIRECTOBJECT.NONE@@D.OBJECTNUMBER.SG@i #;
@U.DIRECTOBJECT.NONE@@D.OBJECTPERSON.3@i #;
@U.DIRECTOBJECT.NONE@@D.OBJECTNUMBER.SG@i #;

! ámits'ìlá "someone will make *it*; someone will do (it to) *it*" (= an
! object prefix appears on the verb)
@U.DIRECTOBJECT.EMPHATIC@i #;
@U.DIRECTOBJECT.EMPHATIC@i #;

LEXICON 0-IPFV-AFF-OuterPrefix
@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@s #;
Expand Down Expand Up @@ -260,11 +278,29 @@ LEXICON 0s-IPFV-AFF-MiddlePrefix-DOIndef
0s-IPFV-AFF-MiddlePrefix-4SG;

LEXICON 0s-IPFV-AFF-MiddlePrefix-3PL
@U.VALENCE.INTRANSITIVE@ís #;
@U.VALENCE.OBLIQUEOBJECT@ís #;
@U.VALENCE.OO-EXPERIENCER@ís #;
@U.VALENCE.TRANSITIVE@ 0s-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DITRANSITIVE@ 0s-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.TRANSITIONAL@ 0s-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0s-IPFV-AFF-MiddlePrefix-3PL-DObj;

LEXICON 0s-IPFV-AFF-MiddlePrefix-3PL-DObj
@U.DIRECTOBJECT.GIVEN@ís #;
@U.DIRECTOBJECT.EMPHATIC@is #;
@U.DIRECTOBJECT.NONE@is #;

LEXICON 0s-IPFV-AFF-MiddlePrefix-4SG
@U.VALENCE.INTRANSITIVE@ís #;
@U.VALENCE.OBLIQUEOBJECT@ís #;
@U.VALENCE.OO-EXPERIENCER@ís #;
@U.VALENCE.TRANSITIVE@ 0s-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DITRANSITIVE@ 0s-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.TRANSITIONAL@ 0s-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0s-IPFV-AFF-MiddlePrefix-4SG-DObj;

LEXICON 0s-IPFV-AFF-MiddlePrefix-4SG-DObj
@U.DIRECTOBJECT.GIVEN@ís #;
@U.DIRECTOBJECT.NONE@@U.OBJECTPERSON.3@@U.OBJECTNUMBER.SG@ís #;
@U.DIRECTOBJECT.NONE@@D.OBJECTPERSON.3@is #;
Expand Down Expand Up @@ -341,11 +377,29 @@ LEXICON 0i-IPFV-AFF-MiddlePrefix-DOIndef
0i-IPFV-AFF-MiddlePrefix-4SG;

LEXICON 0i-IPFV-AFF-MiddlePrefix-3PL
@U.VALENCE.INTRANSITIVE@íí #;
@U.VALENCE.OBLIQUEOBJECT@íí #;
@U.VALENCE.OO-EXPERIENCER@íí #;
@U.VALENCE.TRANSITIVE@ 0i-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DITRANSITIVE@ 0i-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.TRANSITIONAL@ 0i-IPFV-AFF-MiddlePrefix-3PL-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0i-IPFV-AFF-MiddlePrefix-3PL-DObj;

LEXICON 0i-IPFV-AFF-MiddlePrefix-3PL-DObj
@U.DIRECTOBJECT.GIVEN@íí #;
@U.DIRECTOBJECT.EMPHATIC@ii #;
@U.DIRECTOBJECT.NONE@ii #;

LEXICON 0i-IPFV-AFF-MiddlePrefix-4SG
@U.VALENCE.INTRANSITIVE@íí #;
@U.VALENCE.OBLIQUEOBJECT@íí #;
@U.VALENCE.OO-EXPERIENCER@íí #;
@U.VALENCE.TRANSITIVE@ 0i-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DITRANSITIVE@ 0i-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.TRANSITIONAL@ 0i-IPFV-AFF-MiddlePrefix-4SG-DObj;
@U.VALENCE.DO-EXPERIENCER@ 0i-IPFV-AFF-MiddlePrefix-4SG-DObj;

LEXICON 0i-IPFV-AFF-MiddlePrefix-4SG-DObj
@U.DIRECTOBJECT.GIVEN@íí #;
@U.DIRECTOBJECT.NONE@@U.OBJECTPERSON.3@@U.OBJECTNUMBER.SG@íí #;
@U.DIRECTOBJECT.NONE@@D.OBJECTPERSON.3@ii #;
Expand Down

0 comments on commit 278f52e

Please sign in to comment.