From c5afb08b5529e4515a426a3fc482976bf9dedb59 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 29 May 2012 17:55:57 +0000
Subject: [PATCH] API term as ResourceDemo view

---
 lib/src/demo/Makefile           |  4 ++--
 lib/src/demo/ResourceDemoAPI.gf | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile
index 9e96a103d..33ad78aa5 100644
--- a/lib/src/demo/Makefile
+++ b/lib/src/demo/Makefile
@@ -6,7 +6,7 @@ src:
 	runghc MkMini.hs
 
 compdemo:
-	$(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) API Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
 
 linkdemo:
-	$(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
+	$(compile) -link API Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd
diff --git a/lib/src/demo/ResourceDemoAPI.gf b/lib/src/demo/ResourceDemoAPI.gf
index c506f708d..19a158981 100644
--- a/lib/src/demo/ResourceDemoAPI.gf
+++ b/lib/src/demo/ResourceDemoAPI.gf
@@ -1,3 +1,5 @@
+--# -path=.:alltenses
+
 concrete ResourceDemoAPI of ResourceDemo = open Prelude in {
 
 lincat Text = SS ;
@@ -32,12 +34,12 @@ oper mkTerm = overload {
 
 
 lin AAnter = mkTerm "anteriorAnt" ;
-lin ASimul = mkTerm "" ;
+lin ASimul = mkTerm (hide "simultaneousAnt") ;
 lin AdAP ada_1 ap_2 = mkTerm "mkAP" ada_1 ap_2 ;
 lin AdvCN cn_1 prep_2 np_3 = mkTerm "mkCN" cn_1 prep_2 np_3 ;
 lin AdvVP vp_1 adv_2 = mkTerm "mkVP" vp_1 adv_2 ;
 lin CompAP ap_1 = mkTerm "mkVP" ap_1 ;
-lin CompAdv prep_1 np_2 = mkTerm "mkVP" prep_1 np_2 ;
+lin CompAdv prep_1 np_2 = mkTerm "mkVP" (mkTerm "mkAdv" prep_1 np_2) ;
 lin ComplV2 v2_1 np_2 = mkTerm "mkVP" v2_1 np_2 ;
 lin ComplVQ vq_1 qs_2 = mkTerm "mkVP" vq_1 qs_2 ;
 lin ComplVS vs_1 s_2 = mkTerm "mkVP" vs_1 s_2 ;
@@ -45,16 +47,16 @@ lin ComplVV vv_1 vp_2 = mkTerm "mkVP" vv_1 vp_2 ;
 lin ConjAP conj_1 ap_2 ap_3 = mkTerm "mkAP" conj_1 ap_2 ap_3 ;
 lin ConjNP conj_1 np_2 np_3 = mkTerm "mkNP" conj_1 np_2 np_3 ;
 lin ConjS conj_1 s_2 s_3 = mkTerm "mkS" conj_1 s_2 s_3 ;
-lin D_0 = mkTerm "D_0" ;
-lin D_1 = mkTerm "D_1" ;
-lin D_2 = mkTerm "D_2" ;
-lin D_3 = mkTerm "D_3" ;
-lin D_4 = mkTerm "D_4" ;
-lin D_5 = mkTerm "D_5" ;
-lin D_6 = mkTerm "D_6" ;
-lin D_7 = mkTerm "D_7" ;
-lin D_8 = mkTerm "D_8" ;
-lin D_9 = mkTerm "D_9" ;
+lin D_0 = mkTerm "n0_Dig" ;
+lin D_1 = mkTerm "n1_Dig" ;
+lin D_2 = mkTerm "n2_Dig" ;
+lin D_3 = mkTerm "n3_Dig" ;
+lin D_4 = mkTerm "n4_Dig" ;
+lin D_5 = mkTerm "n5_Dig" ;
+lin D_6 = mkTerm "n6_Dig" ;
+lin D_7 = mkTerm "n7_Dig" ;
+lin D_8 = mkTerm "n8_Dig" ;
+lin D_9 = mkTerm "n9_Dig" ;
 lin DetCN det_1 cn_2 = mkTerm "mkNP" det_1 cn_2 ;
 lin IDig dig_1 = mkTerm "mkDigits" dig_1 ;
 lin IIDig dig_1 digits_2 = mkTerm "mkDigits" dig_1 digits_2 ;
@@ -74,10 +76,9 @@ lin SubjS subj_1 s_2 s_3 = mkTerm "mkS" subj_1 s_2 s_3 ;
 lin TCond = mkTerm "conditionalTense" ;
 lin TFut = mkTerm "futureTense" ;
 lin TPast = mkTerm "pastTense" ;
-lin TPres = mkTerm "" ;
+lin TPres = mkTerm (hide "presentTense") ;
 lin TTAnt tense_1 ant_2 = mkTerm "mkTense" tense_1 ant_2 ;
--- lin TTAnt tense_1 ant_2 = mkTerm "mkTemp" tense_1 ant_2 ;
-lin TextImp vp_1 = ss (useTerm (mkTerm "mkText" vp_1)) ;
+lin TextImp vp_1 = ss (useTerm (mkTerm "mkText" (mkTerm "mkImp" vp_1))) ;
 lin TextQS qs_1 = ss (useTerm (mkTerm "mkText" qs_1)) ;
 lin TextS s_1 = ss (useTerm (mkTerm "mkText" s_1)) ;
 lin UseCl temp_1 pol_2 cl_3 = mkTerm "mkS" (flatTerm temp_1) pol_2 cl_3 ;