From 3dcc336d5115588ba848e508f003fe65a796275c Mon Sep 17 00:00:00 2001
From: aarneranta <aarne@chalmers.se>
Date: Wed, 19 May 2021 11:11:27 +0200
Subject: [PATCH] renamed Doctor concretes

---
 lab2/grammar/application/DoctorEng.gf         | 20 ++++++++-----------
 .../{DoctorRGLEng.gf => DoctorMiniEng.gf}     | 14 ++++++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename lab2/grammar/application/{DoctorRGLEng.gf => DoctorMiniEng.gf} (94%)

diff --git a/lab2/grammar/application/DoctorEng.gf b/lab2/grammar/application/DoctorEng.gf
index a26b310..752f845 100644
--- a/lab2/grammar/application/DoctorEng.gf
+++ b/lab2/grammar/application/DoctorEng.gf
@@ -1,15 +1,11 @@
---# -path=.:../abstract:../english:../api
-
--- model implementation using Mini RGL
-
 concrete DoctorEng of Doctor =
   open
-    MiniSyntaxEng,
-    MiniParadigmsEng,
+    SyntaxEng,
+    ParadigmsEng,
     Prelude
   in {
 
--- application using your own Mini* modules
+-- application using standard RGL
 
 lincat
   Phrase = Utt ;
@@ -27,10 +23,10 @@ lin
   presNegPhrase fact = mkUtt (mkS negativePol fact) ;
   pastPosPhrase fact = mkUtt (mkS anteriorAnt fact) ;
   pastNegPhrase fact = mkUtt (mkS anteriorAnt negativePol fact) ;
-  -- presQuestionPhrase fact = mkUtt (mkQS (mkQCl fact)) ;
-  -- pastQuestionPhrase fact = mkUtt (mkQS anteriorAnt (mkQCl fact)) ;
-  presQuestionPhrase fact = let p : Utt = mkUtt (mkQS (mkQCl fact)) in p ** {s = p.s ++ SOFT_BIND ++ "?"} ;
-  pastQuestionPhrase fact = let p : Utt = mkUtt (mkQS anteriorAnt (mkQCl fact)) in p ** {s = p.s ++ SOFT_BIND ++ "?"} ;
+  presQuestionPhrase fact = mkUtt (mkQS (mkQCl fact)) ;
+  pastQuestionPhrase fact = mkUtt (mkQS anteriorAnt (mkQCl fact)) ;
+  --- presQuestionPhrase fact = let p : Utt = mkUtt (mkQS (mkQCl fact)) in p ** {s = p.s ++ SOFT_BIND ++ "?"} ;
+  --- pastQuestionPhrase fact = let p : Utt = mkUtt (mkQS anteriorAnt (mkQCl fact)) in p ** {s = p.s ++ SOFT_BIND ++ "?"} ;
 
 
   impPosPhrase action = mkUtt (mkImp action) ;
@@ -104,7 +100,7 @@ lin
   drugsSubstance = mkNP aPl_Det (mkN "drug") ;
 
 oper
-  pAdv : Str -> Adv = MiniParadigmsEng.mkAdv ;
+  pAdv : Str -> Adv = ParadigmsEng.mkAdv ;
 
   go_V = mkV "go" "went" "gone" ;
   stay_V = mkV "stay" ;
diff --git a/lab2/grammar/application/DoctorRGLEng.gf b/lab2/grammar/application/DoctorMiniEng.gf
similarity index 94%
rename from lab2/grammar/application/DoctorRGLEng.gf
rename to lab2/grammar/application/DoctorMiniEng.gf
index 0a0f75d..8358bb2 100644
--- a/lab2/grammar/application/DoctorRGLEng.gf
+++ b/lab2/grammar/application/DoctorMiniEng.gf
@@ -1,11 +1,15 @@
-concrete DoctorRGLEng of Doctor =
+--# -path=.:../abstract:../english:../api
+
+-- model implementation using Mini RGL
+
+concrete DoctorMiniEng of Doctor =
   open
-    SyntaxEng,
-    ParadigmsEng,
+    MiniSyntaxEng,
+    MiniParadigmsEng,
     Prelude
   in {
 
--- application using standard RGL
+-- application using your own Mini* modules
 
 lincat
   Phrase = Utt ;
@@ -100,7 +104,7 @@ lin
   drugsSubstance = mkNP aPl_Det (mkN "drug") ;
 
 oper
-  pAdv : Str -> Adv = ParadigmsEng.mkAdv ;
+  pAdv : Str -> Adv = MiniParadigmsEng.mkAdv ;
 
   go_V = mkV "go" "went" "gone" ;
   stay_V = mkV "stay" ;