restoring Arabic to new API

4 files changed, 63 insertions, 51 deletions

diff --git a/next-lib/src/api/ConstructorsAra.gf b/next-lib/src/api/ConstructorsAra.gf
new file mode 100644
index 000000000..777f3a249
--- /dev/null
+++ b/next-lib/src/api/ConstructorsAra.gf
@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource ConstructorsAra = Constructors with (Grammar = GrammarAra) ;
diff --git a/next-lib/src/api/SyntaxAra.gf b/next-lib/src/api/SyntaxAra.gf
new file mode 100644
index 000000000..095006527
--- /dev/null
+++ b/next-lib/src/api/SyntaxAra.gf
@@ -0,0 +1,4 @@
+--# -path=.:alltenses:prelude
+
+instance SyntaxAra of Syntax = ConstructorsAra, CatAra, StructuralAra, CombinatorsAra ;
+
diff --git a/next-lib/src/arabic/ParadigmsAra.gf b/next-lib/src/arabic/ParadigmsAra.gf
index 752039bd5..9e9a1c598 100644
--- a/next-lib/src/arabic/ParadigmsAra.gf
+++ b/next-lib/src/arabic/ParadigmsAra.gf
@@ -187,58 +187,16 @@ resource ParadigmsAra = open
 -- The definitions should not bother the user of the API. So they are
 -- hidden from the document.
 
-
-----AR AED's original definition of regV
-  regV_orig : Str -> V = \wo ->
+  regV : Str -> V = \wo ->
+    let rau : Str * Vowel * Vowel = 
     case wo of {
-      "يَ" + f@_ + c@_ + "ُ" + l@_ => v1 (f+c+l) a u ;
-      "يَ" + f@_ + c@_ + "ِ" + l@_ => v1 (f+c+l) a i ;
-      "يَ" + f@_ + c@_ + "َ" + l@_ => v1 (f+c+l) a a ;
-      f@_ + "َ" + c@_ + "ِ" + l@_  => v1 (f+c+l) i a ;
-      _ => Predef.error "regV not applicable"
-    };
-
-
-  regV_o : Str -> Str = \word ->
-    case word of {
-      "يَ" + f@_ + c@_ + "ُ" + l@_ => "a" ;
-      "يَ" + f@_ + c@_ + "ِ" + l@_ => "b" ;
-      "يَ" + f@_ + c@_ + "َ" + l@_ => "c" ; 
-      f@_ + "َ" + c@_ + "ِ" + l@_  => "d" ;
-      _ => "q"
-    };
-  aa = a ; uu = u ; ii = i ; 
-  ----AR for debug end
-
-
----- begin workaround for a problem with pattern matching, AR 27/6/2008
-
-  regV = \word ->
-    case Predef.eqStr (Predef.take 2 word) "يَ" of {
-      Predef.PTrue => vYa (Predef.drop 2 word) ; 
-      _ => vCo word
-    };
-
-  vYa : Str -> V = \word ->
-    let
-      fcl = Predef.take 2 word + Predef.drop 3 word ;
-      voc = case Predef.take 1 (Predef.drop 2 word) of {
-        "ُ" => u ;
-        "ِ" => i ;
-        _ => a 
-        }
-    in
-    v1 fcl a voc ;
-    
-  vCo : Str -> V = \word -> 
-    let 
-      f = Predef.take 1 word ;
-      c = Predef.take 1 (Predef.drop 2 word) ;
-      l = Predef.drop 4 word
-    in
-    v1 (f + c + l) i a ;
-
----- end workaround definition
+      "يَ" + fc + "ُ" + l => <fc+l, a, u> ;
+      "يَ" + fc + "ِ" + l => <fc+l, a, i> ;
+      "يَ" + fc + "َ" + l => <fc+l, a, a> ;
+      f@? + "َ" + c@? + "ِ" + l  => <f+c+l, i, a> ;
+      _ => Predef.error ("regV not applicable to" ++ wo)
+    }
+    in v1 rau.p1 rau.p2 rau.p3 ;
 
   v1 = \rootStr,vPerf,vImpf -> 
     let { raw = v1' rootStr vPerf vImpf } in
diff --git a/next-lib/src/arabic/SymbolAra.gf b/next-lib/src/arabic/SymbolAra.gf
new file mode 100644
index 000000000..d8003eaf8
--- /dev/null
+++ b/next-lib/src/arabic/SymbolAra.gf
@@ -0,0 +1,47 @@
+--# -path=.:abstract:common
+
+concrete SymbolAra of Symbol = CatAra ** open Prelude, ResAra in {
+
+{-
+lin
+  SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c
+  IntPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
+  FloatPN i  = {s = \\c => i.s ; g = Neutr} ; --- c
+  NumPN i  = {s = i.s ! Neutr ; g = Neutr} ; --- c
+
+  CNIntNP cn i = {
+    s = \\c => cn.s ! Weak ! Sg ! Nom ++ i.s ;
+    a = agrP3 Sg ;
+    isPron = False
+    } ;
+  CNSymbNP det cn xs = let g = cn.g in {
+    s = \\c => det.s ! g ! c ++ cn.s !  adjfCase det.a c ! det.n ! c ++ xs.s ; 
+    a = agrP3 det.n ;
+    isPron = False
+    } ;
+  CNNumNP cn i = {
+    s = \\c => artDef ! (GSg cn.g) ! c ++ cn.s ! Weak ! Sg ! Nom ++ i.s ! Neutr ! c ;
+    a = agrP3 Sg ;
+    isPron = False
+    } ;
+
+  SymbS sy = {s = \\_ => sy.s} ;
+
+  SymbNum n = {s = \\_,_ => n.s ; n = Pl ; isNum = True} ;
+  SymbOrd n = {s = \\_   => n.s ++ "."} ;
+
+
+lincat 
+
+  Symb, [Symb] = SS ;
+
+lin
+
+  MkSymb s = s ;
+
+  BaseSymb = infixSS "und" ;
+  ConsSymb = infixSS "," ;
+-}
+
+}
+