Merge branch 'null-conjunct'

Author: robintown

src/grammar.ts

@@ -163,18 +163,18 @@ const grammar: Grammar = {
     {"name": "SigmaPcon_sub", "symbols": ["SigmaP_sub"], "postprocess": id},
     {"name": "SigmaPcon_main", "symbols": ["SigmaP_main", "Conjunction", "SigmaPcon_main"], "postprocess": makeConn},
     {"name": "SigmaPcon_sub", "symbols": ["SigmaP_sub", "Conjunction", "SigmaPcon_sub"], "postprocess": makeConn},
-    {"name": "SigmaP_main", "symbols": ["Sigmacon", "TP_main"], "postprocess": makeBranch('ΣP')},
-    {"name": "SigmaP_sub", "symbols": ["Sigmacon", "TP_sub"], "postprocess": makeBranch('ΣP')},
-    {"name": "SigmaPdet", "symbols": ["Sigmacon", "TPdet"], "postprocess": makeBranch('ΣP')},
-    {"name": "TP_main", "symbols": ["Tcon", "AspP_main"], "postprocess": makeBranch('TP')},
-    {"name": "TP_sub", "symbols": ["Tcon", "AspP_sub"], "postprocess": makeBranch('TP')},
+    {"name": "SigmaP_main", "symbols": ["Sigmaconopt", "TP_main"], "postprocess": makeBranch('ΣP')},
+    {"name": "SigmaP_sub", "symbols": ["Sigmaconopt", "TP_sub"], "postprocess": makeBranch('ΣP')},
+    {"name": "SigmaPdet", "symbols": ["Sigmaconopt", "TPdet"], "postprocess": makeBranch('ΣP')},
+    {"name": "TP_main", "symbols": ["Tconopt", "AspP_main"], "postprocess": makeBranch('TP')},
+    {"name": "TP_sub", "symbols": ["Tconopt", "AspP_sub"], "postprocess": makeBranch('TP')},
     {"name": "TP_main", "symbols": ["EvA", "vP_sub", "DPcon"], "postprocess": makeEvAP},
     {"name": "TP_sub", "symbols": ["EvA", "vP_sub", "DPcon"], "postprocess": makeEvAP},
-    {"name": "TPdet", "symbols": ["Tcon", "AspPdet"], "postprocess": makeBranch('TP')},
+    {"name": "TPdet", "symbols": ["Tconopt", "AspPdet"], "postprocess": makeBranch('TP')},
     {"name": "TPdet", "symbols": ["EvA", "vP_sub"], "postprocess": makeEvAPdet},
-    {"name": "AspP_main", "symbols": ["Aspcon", "vP_main"], "postprocess": makeBranch('AspP')},
-    {"name": "AspP_sub", "symbols": ["Aspcon", "vP_sub"], "postprocess": makeBranch('AspP')},
-    {"name": "AspPdet", "symbols": ["Aspcon", "vPdet"], "postprocess": makeBranch('AspP')},
+    {"name": "AspP_main", "symbols": ["Aspconopt", "vP_main"], "postprocess": makeBranch('AspP')},
+    {"name": "AspP_sub", "symbols": ["Aspconopt", "vP_sub"], "postprocess": makeBranch('AspP')},
+    {"name": "AspPdet", "symbols": ["Aspconopt", "vPdet"], "postprocess": makeBranch('AspP')},
     {"name": "vP_main$ebnf$1", "symbols": []},
     {"name": "vP_main$ebnf$1", "symbols": ["vP_main$ebnf$1", "AdjunctPcon"], "postprocess": (d) => d[0].concat([d[1]])},
     {"name": "vP_main$ebnf$2$subexpression$1$ebnf$1", "symbols": ["VocArgument"]},
@@ -228,14 +228,17 @@ const grammar: Grammar = {
     {"name": "CParg", "symbols": ["CPsub"], "postprocess": makeBranchCovertLeft('DP', 'D')},
     {"name": "CPrelcon", "symbols": ["CPrel"], "postprocess": id},
     {"name": "CPrelcon", "symbols": ["CPrel", "Conjunction", "CPrelcon"], "postprocess": makeConn},
-    {"name": "Sigmacon", "symbols": [], "postprocess": makeCovertLeaf('Σ')},
+    {"name": "Sigmaconopt", "symbols": [], "postprocess": makeCovertLeaf('Σ')},
+    {"name": "Sigmaconopt", "symbols": ["Sigmacon"], "postprocess": id},
     {"name": "Sigmacon", "symbols": ["Sigma"], "postprocess": id},
     {"name": "Sigmacon", "symbols": ["Sigma", "Conjunction", "Sigmacon"], "postprocess": makeConn},
-    {"name": "Tcon", "symbols": [], "postprocess": makeCovertLeaf('T')},
+    {"name": "Tconopt", "symbols": [], "postprocess": makeCovertLeaf('T')},
+    {"name": "Tconopt", "symbols": ["Tcon"], "postprocess": id},
     {"name": "Tcon", "symbols": ["T"], "postprocess": id},
     {"name": "Tcon", "symbols": ["T_prefix"], "postprocess": id},
     {"name": "Tcon", "symbols": ["T", "Conjunction", "Tcon"], "postprocess": makeConn},
-    {"name": "Aspcon", "symbols": [], "postprocess": makeCovertLeaf('Asp')},
+    {"name": "Aspconopt", "symbols": [], "postprocess": makeCovertLeaf('Asp')},
+    {"name": "Aspconopt", "symbols": ["Aspcon"], "postprocess": id},
     {"name": "Aspcon", "symbols": ["Asp"], "postprocess": id},
     {"name": "Aspcon", "symbols": ["Asp_prefix"], "postprocess": id},
     {"name": "Aspcon", "symbols": ["Asp", "Conjunction", "Aspcon"], "postprocess": makeConn},

src/toaq.kuna.ne

@@ -129,26 +129,26 @@ MSPdet -> Sigma Modal SigmaPdet {% makeSigmaT1ModalvP %}
 # jeo pu chum hao jí
 SigmaPcon<S> -> SigmaP<S> {% id %}
 SigmaPcon<S> -> SigmaP<S> Conjunction SigmaPcon<S> {% makeConn %}
-SigmaP<S> -> Sigmacon TP<S> {% makeBranch('ΣP') %}
+SigmaP<S> -> Sigmaconopt TP<S> {% makeBranch('ΣP') %}
 
 # (sá) jeo pu chum hao
-SigmaPdet -> Sigmacon TPdet {% makeBranch('ΣP') %}
+SigmaPdet -> Sigmaconopt TPdet {% makeBranch('ΣP') %}
 
 # pu chum hao jí
-TP<S> -> Tcon AspP<S> {% makeBranch('TP') %}
+TP<S> -> Tconopt AspP<S> {% makeBranch('TP') %}
 # ë marao óguı ráı
 TP<S> -> EvA vP<sub> DPcon {% makeEvAP %}
 
 # (sá) pu chum hao
-TPdet -> Tcon AspPdet {% makeBranch('TP') %}
+TPdet -> Tconopt AspPdet {% makeBranch('TP') %}
 # (sá) ë marao óguı
 TPdet -> EvA vP<sub> {% makeEvAPdet %}
 
 # chum hao jí
-AspP<S> -> Aspcon vP<S> {% makeBranch('AspP') %}
+AspP<S> -> Aspconopt vP<S> {% makeBranch('AspP') %}
 
 # (sá) chum hao
-AspPdet -> Aspcon vPdet {% makeBranch('AspP') %}
+AspPdet -> Aspconopt vPdet {% makeBranch('AspP') %}
 
 # tua hao tî kúe jí súq râo níchaq
 vP<S> -> Serial AdjunctPcon:* (VocArgument:+ AdjunctPcon:*):? {% makevP<S> %}
@@ -196,14 +196,17 @@ CPargfoc -> Focus CParg {% makeBranch('FocusP') %}
 CParg -> CPsub {% makeBranchCovertLeft('DP', 'D') %}
 CPrelcon -> CPrel {% id %}
 CPrelcon -> CPrel Conjunction CPrelcon {% makeConn %}
-Sigmacon -> null {% makeCovertLeaf('Σ') %}
+Sigmaconopt -> null {% makeCovertLeaf('Σ') %}
+Sigmaconopt -> Sigmacon {% id %}
 Sigmacon -> Sigma {% id %}
 Sigmacon -> Sigma Conjunction Sigmacon {% makeConn %}
-Tcon -> null {% makeCovertLeaf('T') %}
+Tconopt -> null {% makeCovertLeaf('T') %}
+Tconopt -> Tcon {% id %}
 Tcon -> T {% id %}
 Tcon -> T_prefix {% id %}
 Tcon -> T Conjunction Tcon {% makeConn %}
-Aspcon -> null {% makeCovertLeaf('Asp') %}
+Aspconopt -> null {% makeCovertLeaf('Asp') %}
+Aspconopt -> Aspcon {% id %}
 Aspcon -> Asp {% id %}
 Aspcon -> Asp_prefix {% id %}
 Aspcon -> Asp Conjunction Aspcon {% makeConn %}