From 891ae30eef0e20d245eb0ec977055b9808dadd38 Mon Sep 17 00:00:00 2001
From: Krasimir Angelov <kr.angelov@gmail.com>
Date: Sun, 20 Sep 2026 12:10:25 +0200
Subject: [PATCH] rewrite without using SyntaxAfr

---
 src/afrikaans/ConstructionAfr.gf | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/afrikaans/ConstructionAfr.gf b/src/afrikaans/ConstructionAfr.gf
index da92ceb0..317166b8 100644
--- a/src/afrikaans/ConstructionAfr.gf
+++ b/src/afrikaans/ConstructionAfr.gf
@@ -1,25 +1,25 @@
 --# -path=.:../abstract:../common
 
 concrete ConstructionAfr of Construction = CatAfr **
-  open SyntaxAfr, GrammarAfr, ParadigmsAfr, Prelude,
-       (N = NounAfr), (L = LexiconAfr) in {
+  open GrammarAfr, ParadigmsAfr, Prelude in {
 
 lin
-  ready_VP = mkVP (mkA "gereed") ;
+  ready_VP = UseComp (CompAP (PositA (mkA "gereed"))) ;
 
-  has_age_VP card = mkVP
-    (lin AP (mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (mkN "jaar"))))
-                 (mkA "oud"))) ;
+  has_age_VP card =
+    UseComp (CompAP (AdAP (lin AdA (UttNP (DetCN (DetQuant IndefArt (NumCard card)) (UseN (mkN "jaar")))))
+                          (PositA (mkA "oud")))) ;
 
-  n_units_AP card cn a = mkAP
-    (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
+  n_units_AP card cn a =
+    AdAP (lin AdA (UttNP (DetCN (DetQuant IndefArt (NumCard card)) cn)))
+         (PositA a) ;
 
-  n_units_of_NP card cn np = N.AdvNP
-    (mkNP <lin Card card : Card> (lin CN cn))
-    (SyntaxAfr.mkAdv (mkPrep "van") (lin NP np)) ;
+  n_units_of_NP card cn np =
+    AdvNP (DetCN (DetQuant IndefArt (NumCard card)) cn)
+          (PrepNP (mkPrep "van") np) ;
 
-  cup_of_CN np = mkCN (mkCN (mkN "koppie"))
-                       (SyntaxAfr.mkAdv (mkPrep "van") (lin NP np)) ;
+  cup_of_CN np = AdvCN (UseN (mkN "koppie"))
+                       (PrepNP (mkPrep "van") np) ;
 
 lincat
   Weekday = N ;
@@ -28,8 +28,8 @@ lincat
   Monthday = {s : Str} ;
 
 lin
-  weekdayPunctualAdv w = SyntaxAfr.mkAdv (mkPrep "op") (mkNP w) ;
-  weekdayHabitualAdv w = SyntaxAfr.mkAdv (mkPrep "elke") (mkNP w) ;
+  weekdayPunctualAdv w = PrepNP (mkPrep "op") (MassNP (UseN w)) ;
+  weekdayHabitualAdv w = PrepNP (mkPrep "elke") (MassNP (UseN w)) ;
   yearAdv y = {s = "in" ++ y.s} ;
   intYear i = {s = i.s} ;