Merge remote-tracking branch 'remotes/upstream/master'

This commit is contained in:
Ayberk Tosun
2017-08-21 16:28:10 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -3,7 +3,7 @@ concrete ChunkJpn of Chunk = CatJpn, ExtensionsJpn [VPS,VPI] **
AdA_Chunk, AdV_Chunk, AdN_Chunk, PConj_Chunk, Symb_Chunk, AdA_Chunk, AdV_Chunk, AdN_Chunk, PConj_Chunk, Symb_Chunk,
fullstop_Chunk, exclmark_Chunk, questmark_Chunk, comma_Chunk, fullstop_Chunk, exclmark_Chunk, questmark_Chunk, comma_Chunk,
colon_Chunk, semicolon_Chunk, quote_Chunk, lpar_Chunk, colon_Chunk, semicolon_Chunk, quote_Chunk, lpar_Chunk,
rpar_Chunk, dash_Chunk] rpar_Chunk, dash_Chunk, sbSS]
with (Syntax = SyntaxJpn), (Extensions = ExtensionsJpn) ** with (Syntax = SyntaxJpn), (Extensions = ExtensionsJpn) **
open open
SyntaxJpn, (E = ExtensionsJpn), Prelude, SyntaxJpn, (E = ExtensionsJpn), Prelude,

View File

@@ -10,7 +10,7 @@ resource ResTur = ParamX ** open Prelude, Predef, HarmonyTur in {
param param
Case = Nom | Acc | Dat | Gen | Loc | Ablat | Abess Polarity ; Case = Nom | Acc | Dat | Gen | Loc | Ablat | Abess Polarity ;
Species = Indef | Def ; Species = Indef | Def ;
Contiguity = Con | Sep ; --Concatanate or Separate Contiguity = Con | Sep ; --Concatenate or Separate
oper oper
Agr = {n : Number ; p : Person} ; Agr = {n : Number ; p : Person} ;