1
0
forked from GitHub/gf-rgl

(Ara) whitespace + other small cleanup here and there

This commit is contained in:
Inari Listenmaa
2018-12-31 18:01:33 +02:00
parent 10f5e126ab
commit a6948288b7
15 changed files with 55 additions and 64 deletions

View File

@@ -69,11 +69,6 @@ oper
s2 = x.s s2 = x.s
} ; } ;
conjunctTable5 :
(P,Q,R,T,S : PType) -> Conjunction -> ListTable5 P Q R T S -> {s : P => Q => R => T => S => Str} =
\P,Q,R,T,S,or,xs ->
{s = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ or.s ++ xs.s2 ! p ! q ! r ! t ! s} ;
conjunctDistrTable5 : conjunctDistrTable5 :
(P,Q,R,T,S : PType) -> ConjunctionDistr -> ListTable5 P Q R T S -> (P,Q,R,T,S : PType) -> ConjunctionDistr -> ListTable5 P Q R T S ->
{s : P => Q => R => T => S => Str} = {s : P => Q => R => T => S => Str} =

View File

@@ -9,5 +9,3 @@ concrete LangAra of Lang =
flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ; flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ;
} }

View File

@@ -27,7 +27,7 @@ lincat
lin n5 = num3_10 "خَمس" "خامِس"; lin n5 = num3_10 "خَمس" "خامِس";
lin n6 = num3_10 "سِتّ" "سادِس"; lin n6 = num3_10 "سِتّ" "سادِس";
lin n7 = num3_10 "سَبع" "سابِع"; lin n7 = num3_10 "سَبع" "سابِع";
lin n8 = num3_10 "ثَمانِي" "ثامِن"; lin n8 = num3_10 "ثَمَانِي" "ثامِن";
lin n9 = num3_10 "تِسع" "تاسِع"; lin n9 = num3_10 "تِسع" "تاسِع";
lin pot01 = mkNum "واحِد" "أَوَّل" "أُولى" ** { n = One } ; lin pot01 = mkNum "واحِد" "أَوَّل" "أُولى" ** { n = One } ;

View File

@@ -283,10 +283,10 @@ resource ParadigmsAra = open
-- questions, verb phrases, and adjectives. -- questions, verb phrases, and adjectives.
mkV0 : V -> V0 ; mkV0 : V -> V0 ;
-- mkVS = overload { mkVS : overload {
-- mkVS : V -> VS ; mkVS : V -> VS ;
-- mkVS : V -> Str -> VS mkVS : V -> Str -> VS
-- } ; } ;
mkV2S : V -> Str -> V2S ; mkV2S : V -> Str -> V2S ;
mkVV = overload { mkVV = overload {
mkVV : V -> VV = regVV ; mkVV : V -> VV = regVV ;

View File

@@ -20,8 +20,6 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA
cl = PredVP np vp ; cl = PredVP np vp ;
in { s = \\t,p,qf => cl.s ! t ! p ! toOrder qf } ; in { s = \\t,p,qf => cl.s ! t ! p ! toOrder qf } ;
---- AR guessed ---- AR guessed
QuestIAdv iadv cl = {s = \\t,p,qf => iadv.s ++ cl.s ! t ! p ! toOrder qf} ; QuestIAdv iadv cl = {s = \\t,p,qf => iadv.s ++ cl.s ! t ! p ! toOrder qf} ;