polished the syntax grammar for the book

1 files changed, 19 insertions, 9 deletions

diff --git a/examples/tutorial/syntax/Grammar.gf b/examples/tutorial/syntax/Grammar.gf
index 5484321ee..c48e89a21 100644
--- a/examples/tutorial/syntax/Grammar.gf
+++ b/examples/tutorial/syntax/Grammar.gf
@@ -6,12 +6,15 @@ abstract Grammar = {
     Phr ;  -- any complete sentence e.g. "Is this pizza good?"
     S ;    -- declarative sentence  e.g. "this pizza is good"
     QS ;   -- question sentence     e.g. "is this pizza good"
+    Cl ;   -- declarative clause    e.g. "this pizza is good"
+    QCl ;  -- question clause       e.g. "is this pizza good"
     NP ;   -- noun phrase           e.g. "this pizza"
     IP ;   -- interrogative phrase  e.g  "which pizza"
     CN ;   -- common noun phrase    e.g. "very good pizza"
     Det ;  -- determiner            e.g. "this"
     IDet ; -- interrog. determiner  e.g. "which"
     AP ;   -- adjectival phrase     e.g. "very good"
+    Adv ;  -- adverb                e.g. "today"
     AdA ;  -- adadjective           e.g. "very"
     VP ;   -- verb phrase           e.g. "is good"
     N ;    -- noun                  e.g. "pizza"
@@ -20,24 +23,31 @@ abstract Grammar = {
     V2 ;   -- two-place verb        e.g. "eat"
     Pol ;  -- polarity (pos or neg)           
     Conj ; -- conjunction           e.g. "and"
+    Subj ; -- conjunction           e.g. "because"
 
   fun
     PhrS    : S  -> Phr ;
     PhrQS   : QS -> Phr ;
 
-    PredVP  : Pol -> NP -> VP -> S ;
-    QuestVP : Pol -> NP -> VP -> QS ;
+    UseCl   : Pol -> Cl -> S ;
+    UseQCl  : Pol -> QCl -> QS ;
 
-    IPPredVP : Pol -> IP -> VP -> QS ;
-    IPPredV2 : Pol -> IP -> NP -> V2 -> QS ;
+    QuestCl : Cl -> QCl ;
+
+    SubjS   : Subj -> S -> Adv ;
+
+    PredVP  : NP -> VP -> Cl ;
+
+    QuestVP : IP -> VP -> QCl ;
+    QuestV2 : IP -> NP -> V2 -> QCl ;
  
     ComplV2 : V2 -> NP -> VP ;
     ComplAP : AP -> VP ;
 
     DetCN   : Det -> CN -> NP ;
 
-    ModCN   : AP -> CN -> CN ;
-
+    ModCN   : AP  -> CN -> CN ;
+    AdVP    : Adv -> VP -> VP ;
     AdAP    : AdA -> AP -> AP ;
 
     IDetCN  : IDet -> CN -> IP ;
@@ -63,12 +73,12 @@ abstract Grammar = {
     indef_Det : Det ;
     plur_Det  : Det ;
     two_Det   : Det ;
-
     which_IDet : IDet ;
-
+    today_Adv  : Adv ;
     very_AdA  : AdA ;
-
     and_Conj  : Conj ;
+    because_Subj : Subj ;
+
   -- polarities
 
     PPos, PNeg : Pol ;