remove obsolete commented out code

This commit is contained in:
Krasimir Angelov
2026-09-18 08:25:49 +02:00
parent 18328afff7
commit 1900362cad
12 changed files with 11 additions and 670 deletions
-12
View File
@@ -2,19 +2,7 @@ concrete AdverbTel of Adverb = CatTel ** open ResTel, Prelude in {
lin lin
PositAdvAdj a = {s = a.s ! Masc ! Sg ! Dir} ; PositAdvAdj a = {s = a.s ! Masc ! Sg ! Dir} ;
PositAdAAdj a = {s = a.s ! Masc ! Sg ! Dir} ; PositAdAAdj a = {s = a.s ! Masc ! Sg ! Dir} ;
-- ComparAdvAdj cadv a np = {
-- s = cadv.s ++ a.s ! AAdv ++ "than" ++ np.s ! Nom
-- } ;
-- ComparAdvAdjS cadv a s = {
-- s = cadv.s ++ a.s ! AAdv ++ "than" ++ s.s
-- } ;
--
PrepNP prep np = {s = np.s ! NPC Obl ++ prep.s} ; PrepNP prep np = {s = np.s ! NPC Obl ++ prep.s} ;
--
AdAdv ada adv = {s = ada.s ++ adv.s} ; AdAdv ada adv = {s = ada.s ++ adv.s} ;
--
SubjS subj sent = {s = sent.s ++ subj.s} ; SubjS subj sent = {s = sent.s ++ subj.s} ;
--
-- AdnCAdv cadv = {s = cadv.s ++ "than"} ;
--
} }
-76
View File
@@ -1,76 +0,0 @@
----concrete BackwardTel of Backward = CatTel ** open ResTel in {
----
---- flags optimize=all_subs ;
----
---- lin
----
------ A repository of obsolete constructs, needed for backward compatibility.
------ They create spurious ambiguities if used in combination with Lang.
----
------ from Verb 19/4/2008
----
---- ComplV2 v np = insertObj (\\_ => v.c2 ++ np.s ! Acc) (predV v) ;
---- ComplV3 v np np2 =
---- insertObj (\\_ => v.c2 ++ np.s ! Acc ++ v.c3 ++ np2.s ! Acc) (predV v) ;
---- ComplV2V v np vp =
---- insertObj (\\a => infVP v.isAux vp a)
---- (insertObj (\\_ => v.c2 ++ np.s ! Acc) (predV v)) ;
---- ComplV2S v np s =
---- insertObj (\\_ => conjThat ++ s.s)
---- (insertObj (\\_ => v.c2 ++ np.s ! Acc) (predV v)) ;
---- ComplV2Q v np q =
---- insertObj (\\_ => q.s ! QIndir)
---- (insertObj (\\_ => v.c2 ++ np.s ! Acc) (predV v)) ;
---- ComplV2A v np ap =
---- insertObj (\\_ => v.c2 ++ np.s ! Acc ++ ap.s ! np.a) (predV v) ;
----
---- ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ;
----
------ from Sentence 19/4/2008
----
---- SlashV2 np v2 =
---- mkClause (np.s ! Nom) np.a (predV v2) ** {c2 = v2.c2} ;
----
---- SlashVVV2 np vv v2 =
---- mkClause (np.s ! Nom) np.a
---- (insertObj (\\a => infVP vv.isAux (predV v2) a) (predVV vv)) **
---- {c2 = v2.c2} ;
----
------ from Noun 19/4/2008
----
---- NumInt n = {s = n.s ; n = Pl} ;
---- OrdInt n = {s = n.s ++ "th"} ; --- DEPRECATED
----
---- DetSg quant ord = {
---- s = quant.s ! Sg ++ ord.s ;
---- n = Sg
---- } ;
----
---- DetPl quant num ord = {
---- s = quant.s ! num.n ++ num.s ++ ord.s ;
---- n = num.n
---- } ;
----
---- NoNum = {s = []; n = Pl } ;
----
---- DefArt = {s = \\_ => artDef} ;
----
---- IndefArt = {
---- s = table {
---- Sg => artIndef ;
---- Pl => []
---- }
---- } ;
----
---- MassDet = {s = \\_ => []} ;
----
----
----
------ from Structural 19/4/2008
----
---- that_NP = regNP "that" Sg ;
---- these_NP = regNP "these" Pl ;
---- this_NP = regNP "this" Sg ;
---- those_NP = regNP "those" Pl ;
----
----}
-2
View File
@@ -61,8 +61,6 @@ concrete CatTel of Cat = CommonX ** open ResTel, Prelude in {
---- Structural ---- Structural
-- --
Conj = {s1,s2 : Str ; n : Number} ; Conj = {s1,s2 : Str ; n : Number} ;
-----b Conj = {s : Str ; n : Number} ;
-----b DConj = {s1,s2 : Str ; n : Number} ;
Subj = {s : Str} ; Subj = {s : Str} ;
Prep = {s : Str} ; Prep = {s : Str} ;
-- --
+1 -25
View File
@@ -23,35 +23,11 @@ concrete ConjunctionTel of Conjunction =
BaseCN x y = {s1 = x.s ; s2 = y.s ; g = y.g} ; BaseCN x y = {s1 = x.s ; s2 = y.s ; g = y.g} ;
ConsCN x xs = {s1 = \\n,c => x.s ! n ! c ++ "," ++ xs.s1 ! n ! c ; s2 = xs.s2 ; g = xs.g} ; ConsCN x xs = {s1 = \\n,c => x.s ! n ! c ++ "," ++ xs.s1 ! n ! c ; s2 = xs.s2 ; g = xs.g} ;
ConjCN conj xs = {s = \\n,c => xs.s1 ! n ! c ++ conj.s2 ++ xs.s2 ! n ! c ; g = xs.g} ; ConjCN conj xs = {s = \\n,c => xs.s1 ! n ! c ++ conj.s2 ++ xs.s2 ! n ! c ; g = xs.g} ;
--
-- ConjS = conjunctDistrSS ;
--
-- ConjAdv = conjunctDistrSS ;
--
-- ConjNP conj ss = conjunctDistrTable Case conj ss ** {
-- a = conjAgr (agrP3 conj.n) ss.a
-- } ;
--
-- ConjAP conj ss = conjunctDistrTable Agr conj ss ** {
-- isPre = ss.isPre
-- } ;
--
---- These fun's are generated from the list cat's.
--
-- BaseS = twoSS ;
-- ConsS = consrSS comma ;
-- BaseAdv = twoSS ;
-- ConsAdv = consrSS comma ;
-- BaseNP x y = twoTable Case x y ** {a = conjAgr x.a y.a} ;
-- ConsNP xs x = consrTable Case comma xs x ** {a = conjAgr xs.a x.a} ;
-- BaseAP x y = twoTable Agr x y ** {isPre = andB x.isPre y.isPre} ;
-- ConsAP xs x = consrTable Agr comma xs x ** {isPre = andB xs.isPre x.isPre} ;
--
lincat lincat
[S] = {s1,s2 : Str} ; [S] = {s1,s2 : Str} ;
[Adv] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ;
[NP] = {s1,s2 : NPCase => Str ; a : Agr} ; [NP] = {s1,s2 : NPCase => Str ; a : Agr} ;
[AP] = {s1,s2 : Gender => Number => Case => Str} ; [AP] = {s1,s2 : Gender => Number => Case => Str} ;
[CN] = {s1,s2 : Number => Case => Str ; g : Gender} ; [CN] = {s1,s2 : Number => Case => Str ; g : Gender} ;
--
} }
-181
View File
@@ -1,181 +0,0 @@
------# -path=.:prelude:../abstract:../common
----
----concrete IrregTel of IrregTelAbs = CatTel ** open ParadigmsTel in {
----
----flags optimize=values ;
----
---- lin
---- awake_V = irregV "awake" "awoke" "awoken" ;
---- bear_V = irregV "bear" "bore" "born" ;
---- beat_V = irregV "beat" "beat" "beat" ;
---- become_V = irregV "become" "became" "become" ;
---- begin_V = irregV "begin" "began" "begun" ;
---- bend_V = irregV "bend" "bent" "bent" ;
---- beset_V = irregV "beset" "beset" "beset" ;
---- bet_V = irregDuplV "bet" "bet" "bet" ;
---- bid_V = irregDuplV "bid" (variants {"bid" ; "bade"}) (variants {"bid" ; "bidden"}) ;
---- bind_V = irregV "bind" "bound" "bound" ;
---- bite_V = irregV "bite" "bit" "bitten" ;
---- bleed_V = irregV "bleed" "bled" "bled" ;
---- blow_V = irregV "blow" "blew" "blown" ;
---- break_V = irregV "break" "broke" "broken" ;
---- breed_V = irregV "breed" "bred" "bred" ;
---- bring_V = irregV "bring" "brought" "brought" ;
---- broadcast_V = irregV "broadcast" "broadcast" "broadcast" ;
---- build_V = irregV "build" "built" "built" ;
---- burn_V = irregV "burn" (variants {"burned" ; "burnt"}) (variants {"burned" ; "burnt"}) ;
---- burst_V = irregV "burst" "burst" "burst" ;
---- buy_V = irregV "buy" "bought" "bought" ;
---- cast_V = irregV "cast" "cast" "cast" ;
---- catch_V = irregV "catch" "caught" "caught" ;
---- choose_V = irregV "choose" "chose" "chosen" ;
---- cling_V = irregV "cling" "clung" "clung" ;
---- come_V = irregV "come" "came" "come" ;
---- cost_V = irregV "cost" "cost" "cost" ;
---- creep_V = irregV "creep" "crept" "crept" ;
---- cut_V = irregDuplV "cut" "cut" "cut" ;
---- deal_V = irregV "deal" "dealt" "dealt" ;
---- dig_V = irregDuplV "dig" "dug" "dug" ;
---- dive_V = irregV "dive" (variants {"dived" ; "dove"}) "dived" ;
---- do_V = mk5V "do" "does" "did" "done" "doing" ;
---- draw_V = irregV "draw" "drew" "drawn" ;
---- dream_V = irregV "dream" (variants {"dreamed" ; "dreamt"}) (variants {"dreamed" ; "dreamt"}) ;
---- drive_V = irregV "drive" "drove" "driven" ;
---- drink_V = irregV "drink" "drank" "drunk" ;
---- eat_V = irregV "eat" "ate" "eaten" ;
---- fall_V = irregV "fall" "fell" "fallen" ;
---- feed_V = irregV "feed" "fed" "fed" ;
---- feel_V = irregV "feel" "felt" "felt" ;
---- fight_V = irregV "fight" "fought" "fought" ;
---- find_V = irregV "find" "found" "found" ;
---- fit_V = irregDuplV "fit" "fit" "fit" ;
---- flee_V = irregV "flee" "fled" "fled" ;
---- fling_V = irregV "fling" "flung" "flung" ;
---- fly_V = irregV "fly" "flew" "flown" ;
---- forbid_V = irregDuplV "forbid" "forbade" "forbidden" ;
---- forget_V = irregDuplV "forget" "forgot" "forgotten" ;
---- forgive_V = irregV "forgive" "forgave" "forgiven" ;
---- forsake_V = irregV "forsake" "forsook" "forsaken" ;
---- freeze_V = irregV "freeze" "froze" "frozen" ;
---- get_V = irregDuplV "get" "got" "gotten" ;
---- give_V = irregV "give" "gave" "given" ;
---- go_V = mk5V "go" "goes" "went" "gone" "going" ;
---- grind_V = irregV "grind" "ground" "ground" ;
---- grow_V = irregV "grow" "grew" "grown" ;
---- hang_V = irregV "hang" "hung" "hung" ;
---- have_V = mk5V "have" "has" "had" "had" "having" ;
---- hear_V = irregV "hear" "heard" "heard" ;
---- hide_V = irregV "hide" "hid" "hidden" ;
---- hit_V = irregDuplV "hit" "hit" "hit" ;
---- hold_V = irregV "hold" "held" "held" ;
---- hurt_V = irregV "hurt" "hurt" "hurt" ;
---- keep_V = irregV "keep" "kept" "kept" ;
---- kneel_V = irregV "kneel" "knelt" "knelt" ;
---- knit_V = irregDuplV "knit" "knit" "knit" ;
---- know_V = irregV "know" "knew" "know" ;
---- lay_V = irregV "lay" "laid" "laid" ;
---- lead_V = irregV "lead" "led" "led" ;
---- leap_V = irregV "leap" (variants {"leaped" ; "lept"}) (variants {"leaped" ; "lept"}) ;
---- learn_V = irregV "learn" (variants {"learned" ; "learnt"}) (variants {"learned" ; "learnt"}) ;
---- leave_V = irregV "leave" "left" "left" ;
---- lend_V = irregV "lend" "lent" "lent" ;
---- let_V = irregDuplV "let" "let" "let" ;
---- lie_V = irregV "lie" "lay" "lain" ;
---- light_V = irregV "light" (variants {"lighted" ; "lit"}) "lighted" ;
---- lose_V = irregV "lose" "lost" "lost" ;
---- make_V = irregV "make" "made" "made" ;
---- mean_V = irregV "mean" "meant" "meant" ;
---- meet_V = irregV "meet" "met" "met" ;
---- misspell_V = irregV "misspell" (variants {"misspelled" ; "misspelt"}) (variants {"misspelled" ; "misspelt"}) ;
---- mistake_V = irregV "mistake" "mistook" "mistaken" ;
---- mow_V = irregV "mow" "mowed" (variants {"mowed" ; "mown"}) ;
---- overcome_V = irregV "overcome" "overcame" "overcome" ;
---- overdo_V = mk5V "overdo" "overdoes" "overdid" "overdone" "overdoing" ;
---- overtake_V = irregV "overtake" "overtook" "overtaken" ;
---- overthrow_V = irregV "overthrow" "overthrew" "overthrown" ;
---- pay_V = irregV "pay" "paid" "paid" ;
---- plead_V = irregV "plead" "pled" "pled" ;
---- prove_V = irregV "prove" "proved" (variants {"proved" ; "proven"}) ;
---- put_V = irregDuplV "put" "put" "put" ;
---- quit_V = irregDuplV "quit" "quit" "quit" ;
---- read_V = irregV "read" "read" "read" ;
---- rid_V = irregDuplV "rid" "rid" "rid" ;
---- ride_V = irregV "ride" "rode" "ridden" ;
---- ring_V = irregV "ring" "rang" "rung" ;
---- rise_V = irregV "rise" "rose" "risen" ;
---- run_V = irregDuplV "run" "ran" "run" ;
---- saw_V = irregV "saw" "sawed" (variants {"sawed" ; "sawn"}) ;
---- say_V = irregV "say" "said" "said" ;
---- see_V = irregV "see" "saw" "seen" ;
---- seek_V = irregV "seek" "sought" "sought" ;
---- sell_V = irregV "sell" "sold" "sold" ;
---- send_V = irregV "send" "sent" "sent" ;
---- set_V = irregDuplV "set" "set" "set" ;
---- sew_V = irregV "sew" "sewed" (variants {"sewed" ; "sewn"}) ;
---- shake_V = irregV "shake" "shook" "shaken" ;
---- shave_V = irregV "shave" "shaved" (variants {"shaved" ; "shaven"}) ;
---- shear_V = irregV "shear" "shore" "shorn" ;
---- shed_V = irregDuplV "shed" "shed" "shed" ;
---- shine_V = irregV "shine" "shone" "shone" ;
---- shoe_V = irregV "shoe" "shoed" (variants {"shoed" ; "shod"}) ;
---- shoot_V = irregV "shoot" "shot" "shot" ;
---- show_V = irregV "show" "showed" (variants {"showed" ; "shown"}) ;
---- shrink_V = irregV "shrink" "shrank" "shrunk" ;
---- shut_V = irregDuplV "shut" "shut" "shut" ;
---- sing_V = irregV "sing" "sang" "sung" ;
---- sink_V = irregV "sink" "sank" "sunk" ;
---- sit_V = irregDuplV "sit" "sat" "sat" ;
---- sleep_V = irregV "sleep" "slept" "slept" ;
---- slay_V = irregV "slay" "slew" "slain" ;
---- slide_V = irregV "slide" "slid" "slid" ;
---- sling_V = irregV "sling" "slung" "slung" ;
---- slit_V = irregDuplV "slit" "slit" "slit" ;
---- smite_V = irregV "smite" "smote" "smitten" ;
---- sow_V = irregV "sow" "sowed" (variants {"sowed" ; "sown"}) ;
---- speak_V = irregV "speak" "spoke" "spoken" ;
---- speed_V = irregV "speed" "sped" "sped" ;
---- spend_V = irregV "spend" "spent" "spent" ;
---- spill_V = irregV "spill" (variants {"spilled" ; "spilt"}) (variants {"spilled" ; "spilt"}) ;
---- spin_V = irregDuplV "spin" "spun" "spun" ;
---- spit_V = irregDuplV "spit" (variants {"spit" ; "spat"}) "spit" ;
---- split_V = irregDuplV "split" "split" "split" ;
---- spread_V = irregV "spread" "spread" "spread" ;
---- spring_V = irregV "spring" (variants {"sprang" ; "sprung"}) "sprung" ;
---- stand_V = irregV "stand" "stood" "stood" ;
---- steal_V = irregV "steal" "stole" "stolen" ;
---- stick_V = irregV "stick" "stuck" "stuck" ;
---- sting_V = irregV "sting" "stung" "stung" ;
---- stink_V = irregV "stink" "stank" "stunk" ;
---- stride_V = irregV "stride" "strod" "stridden" ;
---- strike_V = irregV "strike" "struck" "struck" ;
---- string_V = irregV "string" "strung" "strung" ;
---- strive_V = irregV "strive" "strove" "striven" ;
---- swear_V = irregV "swear" "swore" "sworn" ;
---- sweep_V = irregV "sweep" "swept" "swept" ;
---- swell_V = irregV "swell" "swelled" (variants {"swelled" ; "swollen"}) ;
---- swim_V = irregDuplV "swim" "swam" "swum" ;
---- swing_V = irregV "swing" "swung" "swung" ;
---- take_V = irregV "take" "took" "taken" ;
---- teach_V = irregV "teach" "taught" "taught" ;
---- tear_V = irregV "tear" "tore" "torn" ;
---- tell_V = irregV "tell" "told" "told" ;
---- think_V = irregV "think" "thought" "thought" ;
---- thrive_V = irregV "thrive" (variants {"thrived" ; "throve"}) "thrived" ;
---- throw_V = irregV "throw" "threw" "thrown" ;
---- thrust_V = irregV "thrust" "thrust" "thrust" ;
---- tread_V = irregV "tread" "trod" "trodden" ;
---- understand_V = irregV "understand" "understood" "understood" ;
---- uphold_V = irregV "uphold" "upheld" "upheld" ;
---- upset_V = irregDuplV "upset" "upset" "upset" ;
---- wake_V = irregV "wake" "woke" "woken" ;
---- wear_V = irregV "wear" "wore" "worn" ;
---- weave_V = irregV "weave" (variants {"weaved" ; "wove"}) (variants {"weaved" ; "woven"}) ;
---- wed_V = irregDuplV "wed" "wed" "wed" ;
---- weep_V = irregV "weep" "wept" "wept" ;
---- wind_V = irregV "wind" "wound" "wound" ;
---- win_V = irregDuplV "win" "won" "won" ;
---- withhold_V = irregV "withhold" "withheld" "withheld" ;
---- withstand_V = irregV "withstand" "withstood" "withstood" ;
---- wring_V = irregV "wring" "wrung" "wrung" ;
---- write_V = irregV "write" "wrote" "written" ;
----}
+9 -53
View File
@@ -1,7 +1,5 @@
concrete NounTel of Noun = CatTel ** open ResTel, Prelude in { concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
flags optimize=all_subs ;
lin lin
DetCN det cn = { DetCN det cn = {
s = \\c => det.s ! cn.g ! npcase2case c ++ toNP (cn.s ! det.n) c ; s = \\c => det.s ! cn.g ! npcase2case c ++ toNP (cn.s ! det.n) c ;
@@ -10,22 +8,17 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
UsePN pn = {s = \\c => toNP pn.s c ; a = agrP3 pn.g Sg} ; UsePN pn = {s = \\c => toNP pn.s c ; a = agrP3 pn.g Sg} ;
UsePron p = {s = \\c => p.s ! np2pronCase c ; a = p.a} ; UsePron p = {s = \\c => p.s ! np2pronCase c ; a = p.a} ;
--
PredetNP pred np = { PredetNP pred np = {
s = \\c => pred.s ++ np.s ! c ; s = \\c => pred.s ++ np.s ! c ;
a = np.a a = np.a
} ; } ;
--
PPartNP np v2 = { PPartNP np v2 = {
s = \\c => np.s ! c ++ v2.s ! VStem ; s = \\c => np.s ! c ++ v2.s ! VStem ;
a = np.a a = np.a
} ; } ;
--
-- RelNP np rs = {
-- s = \\c => np.s ! c ++ "," ++ rs.s ! np.a ;
-- a = np.a
-- } ;
--
AdvNP np adv = { AdvNP np adv = {
s = \\c => adv.s ++ np.s ! c ; s = \\c => adv.s ++ np.s ! c ;
a = np.a a = np.a
@@ -35,7 +28,7 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
s = \\c => np.s ! c ++ "," ++ adv.s ; s = \\c => np.s ! c ++ "," ++ adv.s ;
a = np.a a = np.a
} ; } ;
--
DetQuantOrd quant num ord = { DetQuantOrd quant num ord = {
s = \\g,c => quant.s ! num.n ! g ! c ++ num.s ++ ord.s ; s = \\g,c => quant.s ! num.n ! g ! c ++ num.s ++ ord.s ;
n = num.n n = num.n
@@ -46,11 +39,6 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
n = num.n n = num.n
} ; } ;
-- DetNP det = {
-- s = \\c => det.s ; ---- case
-- a = agrP3 det.n
-- } ;
--
PossPron p = {s = \\_,_,_ => p.s ! PPoss} ; PossPron p = {s = \\_,_,_ => p.s ! PPoss} ;
NumSg = {s = []; n = Sg} ; NumSg = {s = []; n = Sg} ;
@@ -63,17 +51,8 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
AdNum adn card = {s = adn.s ++ card.s ; n = card.n} ; AdNum adn card = {s = adn.s ++ card.s ; n = card.n} ;
OrdNumeral numeral = {s = numeral.s} ; OrdNumeral numeral = {s = numeral.s} ;
OrdDigits digits = {s = digits.s ++ "వ"} ; OrdDigits digits = {s = digits.s ++ "వ"} ;
--
-- NumDigits n = {s = n.s ! NCard ; n = n.n} ;
-- OrdDigits n = {s = n.s ! NOrd} ;
--
NumNumeral numeral = {s = numeral.s ; n = Pl} ; NumNumeral numeral = {s = numeral.s ; n = Pl} ;
-- OrdNumeral numeral = {s = numeral.s ! NOrd} ;
--
-- AdNum adn num = {s = adn.s ++ num.s ; n = num.n} ;
--
-- OrdSuperl a = {s = a.s ! AAdj Superl} ;
--
DetArtOrd art num ord = { DetArtOrd art num ord = {
s = art.s ++ num.s ++ ord.s ; s = art.s ++ num.s ++ ord.s ;
n = num.n n = num.n
@@ -92,30 +71,13 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
MassNP cn = {s = \\c => cn.s ! Sg ! npcase2case c ; a = agrP3 cn.g Sg} ; MassNP cn = {s = \\c => cn.s ! Sg ! npcase2case c ; a = agrP3 cn.g Sg} ;
UseN n = n ; UseN n = n ;
UseN2 n = n ; UseN2 n = n ;
--
-- Use2N3 f = {
-- s = \\n,c => f.s ! n ! Nom ;
-- g = f.g ;
-- c2 = f.c2
-- } ;
--
-- Use3N3 f = {
-- s = \\n,c => f.s ! n ! Nom ;
-- g = f.g ;
-- c2 = f.c3
-- } ;
--
ComplN2 f x = { ComplN2 f x = {
s = \\n,c => x.s ! NPC c ++ f.c2 ++ f.s ! n ! c ; s = \\n,c => x.s ! NPC c ++ f.c2 ++ f.s ! n ! c ;
g = f.g g = f.g
} ; } ;
-- ComplN3 f x = {
-- s = \\n,c => f.s ! n ! Nom ++ f.c2 ++ x.s ! c ;
-- g = f.g ;
-- c2 = f.c3
-- } ;
AdjCN ap cn = { AdjCN ap cn = {
s = \\n,c => ap.s ! cn.g ! n ! c ++ cn.s ! n ! c ; s = \\n,c => ap.s ! cn.g ! n ! c ++ cn.s ! n ! c ;
@@ -127,12 +89,8 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
g = cn.g g = cn.g
} ; } ;
-- RelCN cn rs = {
-- s = \\n,c => cn.s ! n ! c ++ rs.s ! agrgP3 n cn.g ;
-- g = cn.g
-- } ;
AdvCN cn ad = {s = \\n,c => ad.s ++ cn.s ! n ! c ; g = cn.g} ; AdvCN cn ad = {s = \\n,c => ad.s ++ cn.s ! n ! c ; g = cn.g} ;
--
SentCN cn sc = {s = \\n,c => sc.s ++ cn.s ! n ! c ; g = cn.g} ; SentCN cn sc = {s = \\n,c => sc.s ++ cn.s ! n ! c ; g = cn.g} ;
PossNP cn np = { PossNP cn np = {
@@ -167,7 +125,5 @@ concrete NounTel of Noun = CatTel ** open ResTel, Prelude in {
s = \\c => rs.s ++ np.s ! c ; s = \\c => rs.s ++ np.s ! c ;
a = np.a a = np.a
} ; } ;
--
-- ApposCN cn np = {s = \\n,c => cn.s ! n ! Nom ++ np.s ! c ; g = cn.g} ;
--
} }
-87
View File
@@ -51,91 +51,4 @@ concrete NumeralTel of Numeral = CatTel [Numeral,Digits] ** open ResTel in {
PosDecimal ds = ds ; PosDecimal ds = ds ;
NegDecimal ds = {s = "-" ++ ds.s ; n = ds.n} ; NegDecimal ds = {s = "-" ++ ds.s ; n = ds.n} ;
IFrac dec d = {s = dec.s ++ "." ++ d.s ; n = dec.n} ; IFrac dec d = {s = dec.s ++ "." ++ d.s ; n = dec.n} ;
--
--lincat
-- Digit = {s : DForm => CardOrd => Str} ;
-- Sub10 = {s : DForm => CardOrd => Str ; n : Number} ;
-- Sub100 = {s : CardOrd => Str ; n : Number} ;
-- Sub1000 = {s : CardOrd => Str ; n : Number} ;
-- Sub1000000 = {s : CardOrd => Str ; n : Number} ;
--
--lin num x = x ;
--lin n2 = let two = mkNum "two" "twelve" "twenty" "second" in
-- {s = \\f,c => case <f,c> of {
-- <teen,NOrd> => "twelfth" ;
-- _ => two.s ! f ! c
-- }
-- } ;
--
--lin n3 = mkNum "three" "thirteen" "thirty" "third" ;
--lin n4 = mkNum "four" "fourteen" "forty" "fourth" ;
--lin n5 = mkNum "five" "fifteen" "fifty" "fifth" ;
--lin n6 = regNum "six" ;
--lin n7 = regNum "seven" ;
--lin n8 = mkNum "eight" "eighteen" "eighty" "eighth" ;
--lin n9 = mkNum "nine" "nineteen" "ninety" "ninth" ;
--
--lin pot01 = mkNum "one" "eleven" "ten" "first" ** {n = Sg} ;
--lin pot0 d = d ** {n = Pl} ;
--lin pot110 = regCardOrd "ten" ** {n = Pl} ;
--lin pot111 = regCardOrd "eleven" ** {n = Pl} ;
--lin pot1to19 d = {s = d.s ! teen} ** {n = Pl} ;
--lin pot0as1 n = {s = n.s ! unit} ** {n = n.n} ;
--lin pot1 d = {s = d.s ! ten} ** {n = Pl} ;
--lin pot1plus d e = {
-- s = \\c => d.s ! ten ! NCard ++ "-" ++ e.s ! unit ! c ; n = Pl} ;
--lin pot1as2 n = n ;
--lin pot2 d = {s = \\c => d.s ! unit ! NCard ++ mkCard c "hundred"} ** {n = Pl} ;
--lin pot2plus d e = {
-- s = \\c => d.s ! unit ! NCard ++ "hundred" ++ "and" ++ e.s ! c ; n = Pl} ;
--lin pot2as3 n = n ;
--lin pot3 n = {
-- s = \\c => n.s ! NCard ++ mkCard c "thousand" ; n = Pl} ;
--lin pot3plus n m = {
-- s = \\c => n.s ! NCard ++ "thousand" ++ m.s ! c ; n = Pl} ;
--
---- numerals as sequences of digits
--
-- lincat
-- Dig = TDigit ;
--
-- lin
-- IDig d = d ** {tail = T1} ;
--
-- IIDig d i = {
-- s = \\o => d.s ! NCard ++ commaIf i.tail ++ i.s ! o ;
-- n = Pl ;
-- tail = inc i.tail
-- } ;
--
-- D_0 = mkDig "0" ;
-- D_1 = mk3Dig "1" "1st" Sg ;
-- D_2 = mk2Dig "2" "2nd" ;
-- D_3 = mk2Dig "3" "3rd" ;
-- D_4 = mkDig "4" ;
-- D_5 = mkDig "5" ;
-- D_6 = mkDig "6" ;
-- D_7 = mkDig "7" ;
-- D_8 = mkDig "8" ;
-- D_9 = mkDig "9" ;
--
-- oper
-- commaIf : DTail -> Str = \t -> case t of {
-- T3 => BIND++","++BIND ;
-- _ => BIND
-- } ;
--
-- mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
-- mkDig : Str -> TDigit = \c -> mk2Dig c (c + "th") ;
--
-- mk3Dig : Str -> Str -> Number -> TDigit = \c,o,n -> {
-- s = table {NCard => c ; NOrd => o} ;
-- n = n
-- } ;
--
-- TDigit = {
-- n : Number ;
-- s : CardOrd => Str
-- } ;
--
} }
+1 -5
View File
@@ -1,5 +1,4 @@
concrete PhraseTel of Phrase = CatTel ** open Prelude, ResTel in { concrete PhraseTel of Phrase = CatTel ** open Prelude, ResTel in {
--
lin lin
PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
@@ -16,10 +15,7 @@ concrete PhraseTel of Phrase = CatTel ** open Prelude, ResTel in {
UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ; UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ;
NoPConj = {s = []} ; NoPConj = {s = []} ;
-- PConjConj conj = {s = conj.s2} ; ---
--
NoVoc = {s = []} ; NoVoc = {s = []} ;
VocNP np = {s = "," ++ np.s ! NPC Dir} ; VocNP np = {s = "," ++ np.s ! NPC Dir} ;
-- VocNP np = {s = "," ++ np.s ! Nom} ;
--
} }
-52
View File
@@ -1,7 +1,4 @@
concrete QuestionTel of Question = CatTel ** open ResTel, Prelude in { concrete QuestionTel of Question = CatTel ** open ResTel, Prelude in {
--
-- flags optimize=all_subs ;
--
lin lin
QuestCl cl = cl ; QuestCl cl = cl ;
@@ -20,53 +17,4 @@ concrete QuestionTel of Question = CatTel ** open ResTel, Prelude in {
IdetQuant iq num = {s = iq.s ! num.n ++ num.s ; n = num.n} ; IdetQuant iq num = {s = iq.s ! num.n ++ num.s ; n = num.n} ;
CompIAdv adv = {s = adv.s} ; CompIAdv adv = {s = adv.s} ;
CompIP ip = {s = ip.s ! Dir} ; CompIP ip = {s = ip.s ! Dir} ;
--
-- QuestCl cl = {
-- s = \\t,a,p =>
-- let cls = cl.s ! t ! a ! p
-- in table {
-- QDir => cls ! OQuest ;
-- QIndir => "if" ++ cls ! ODir
-- } ---- "whether" in ExtTel
-- } ;
--
-- QuestVP qp vp =
-- let cl = mkClause (qp.s ! Nom) (agrP3 qp.n) vp
-- in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! ODir} ;
--
-- QuestSlash ip slash =
-- mkQuestion (ss (slash.c2 ++ ip.s ! Acc)) slash ;
-- --- stranding in ExratTel
--
-- QuestIAdv iadv cl = mkQuestion iadv cl ;
--
-- QuestIComp icomp np =
-- mkQuestion icomp (mkClause (np.s ! Nom) np.a (predAux auxBe)) ;
--
--
-- PrepIP p ip = {s = p.s ++ ip.s ! Acc} ;
--
-- AdvIP ip adv = {
-- s = \\c => ip.s ! c ++ adv.s ;
-- n = ip.n
-- } ;
--
-- IdetCN idet cn = {
-- s = \\c => idet.s ++ cn.s ! idet.n ! c ;
-- n = idet.n
-- } ;
--
-- IdetIP idet = {
-- s = \\c => idet.s ;
-- n = idet.n
-- } ;
--
-- IdetQuant idet num = {
-- s = idet.s ! num.n ++ num.s ;
-- n = num.n
-- } ;
--
-- CompIAdv a = a ;
-- CompIP p = ss (p.s ! Nom) ;
--
} }
-51
View File
@@ -1,7 +1,4 @@
concrete RelativeTel of Relative = CatTel ** open ResTel in { concrete RelativeTel of Relative = CatTel ** open ResTel in {
--
-- flags optimize=all_subs ;
--
lin lin
RelCl cl = cl ; RelCl cl = cl ;
RelVP rp vp = { RelVP rp vp = {
@@ -16,52 +13,4 @@ concrete RelativeTel of Relative = CatTel ** open ResTel in {
} ; } ;
IdRP = {s = "ఏ"} ; IdRP = {s = "ఏ"} ;
FunRP prep np rp = {s = np.s ! NPC Obl ++ prep.s ++ rp.s} ; FunRP prep np rp = {s = np.s ! NPC Obl ++ prep.s ++ rp.s} ;
--
-- RelCl cl = {
-- s = \\t,a,p,_ => "such" ++ "that" ++ cl.s ! t ! a ! p ! ODir ;
-- c = Nom
-- } ;
--
-- RelVP rp vp = {
-- s = \\t,ant,b,ag =>
-- let
-- agr = case rp.a of {
-- RNoAg => ag ;
-- RAg a => a
-- } ;
-- cl = mkClause (rp.s ! RC (fromAgr agr).g Nom) agr vp
-- in
-- cl.s ! t ! ant ! b ! ODir ;
-- c = Nom
-- } ;
--
---- Pied piping: "at which we are looking". Stranding and empty
---- relative are defined in $ExtraTel.gf$ ("that we are looking at",
---- "we are looking at").
--
-- RelSlash rp slash = {
-- s = \\t,a,p,agr =>
-- slash.c2 ++ rp.s ! RPrep (fromAgr agr).g ++ slash.s ! t ! a ! p ! ODir ;
-- c = Acc
-- } ;
--
-- FunRP p np rp = {
-- s = \\c => np.s ! Acc ++ p.s ++ rp.s ! RPrep (fromAgr np.a).g ;
-- a = RAg np.a
-- } ;
--
-- IdRP =
-- let varr : Str -> Str = \x -> variants {x ; "that"} --- for bwc
-- in {
-- s = table {
-- RC _ Gen => "whose" ;
-- RC Neutr _ => varr "which" ;
-- RC _ Acc => varr "whom" ;
-- RC _ Nom => varr "who" ;
-- RPrep Neutr => "which" ;
-- RPrep _ => "whom"
-- } ;
-- a = RNoAg
-- } ;
--
} }
-5
View File
@@ -356,11 +356,6 @@ resource ResTel = ParamX ** open Prelude in {
---- the third is the vocative - is it really this way? ---- the third is the vocative - is it really this way?
-- the Telugu verb phrase -- the Telugu verb phrase
--- CTense = CPresent | CPast | CFuture ;
param param
VPHTense = VPHTense =
VPGenPres -- impf hum nahim "I go" VPGenPres -- impf hum nahim "I go"
-121
View File
@@ -86,129 +86,8 @@ concrete StructuralTel of Structural = CatTel **
youSg_Pron = personalPronoun P2 Sg ** {a = Ag Masc Sg P2} ; youSg_Pron = personalPronoun P2 Sg ** {a = Ag Masc Sg P2} ;
youPl_Pron = personalPronoun P2 Pl ** {a = Ag Masc Pl P2} ; youPl_Pron = personalPronoun P2 Pl ** {a = Ag Masc Pl P2} ;
youPol_Pron = personalPronoun P2 Pl ** {a = Ag Masc Pl P2} ; youPol_Pron = personalPronoun P2 Pl ** {a = Ag Masc Pl P2} ;
-- above_Prep = ss "above" ;
-- after_Prep = ss "after" ;
-- all_Predet = ss "all" ;
-- almost_AdA, almost_AdN = ss "almost" ;
-- although_Subj = ss "although" ;
-- always_AdV = ss "always" ;
-- and_Conj = sd2 [] "and" ** {n = Pl} ;
-----b and_Conj = ss "and" ** {n = Pl} ;
-- because_Subj = ss "because" ;
-- before_Prep = ss "before" ;
-- behind_Prep = ss "behind" ;
-- between_Prep = ss "between" ;
-- both7and_DConj = sd2 "both" "and" ** {n = Pl} ;
-- but_PConj = ss "but" ;
-- by8agent_Prep = ss "by" ;
-- by8means_Prep = ss "by" ;
-- can8know_VV, can_VV = {
-- s = table {
-- VVF VInf => ["be able to"] ;
-- VVF VPres => "can" ;
-- VVF VPPart => ["been able to"] ;
-- VVF VPresPart => ["being able to"] ;
-- VVF VPast => "could" ; --# notpresent
-- VVPastNeg => "couldn't" ; --# notpresent
-- VVPresNeg => "can't"
-- } ;
-- isAux = True
-- } ;
-- during_Prep = ss "during" ;
-- either7or_DConj = sd2 "either" "or" ** {n = Sg} ;
-- everybody_NP = regNP "everybody" Sg ;
-- every_Det = mkDeterminer Sg "every" ;
-- everything_NP = regNP "everything" Sg ;
-- everywhere_Adv = ss "everywhere" ;
-- few_Det = mkDeterminer Pl "few" ;
----- first_Ord = ss "first" ; DEPRECATED
-- for_Prep = ss "for" ;
-- from_Prep = ss "from" ;
he_Pron = personalPronoun P3 Sg ** {a = Ag Masc Sg P3} ; he_Pron = personalPronoun P3 Sg ** {a = Ag Masc Sg P3} ;
-- here_Adv = ss "here" ;
-- here7to_Adv = ss ["to here"] ;
-- here7from_Adv = ss ["from here"] ;
-- how_IAdv = ss "how" ;
-- how8many_IDet = mkDeterminer Pl ["how many"] ;
-- if_Subj = ss "if" ;
-- in8front_Prep = ss ["in front of"] ;
i_Pron = personalPronoun P1 Sg ** {a = Ag Masc Sg P1} ; i_Pron = personalPronoun P1 Sg ** {a = Ag Masc Sg P1} ;
in_Prep = ss "లో" ; in_Prep = ss "లో" ;
-- it_Pron = mkNP "it" "it" "its" Sg P3 Neutr ;
-- less_CAdv = ss "less" ;
-- many_Det = mkDeterminer Pl "many" ;
-- more_CAdv = ss "more" ;
-- most_Predet = ss "most" ;
-- much_Det = mkDeterminer Sg "much" ;
-- must_VV = {
-- s = table {
-- VVF VInf => ["have to"] ;
-- VVF VPres => "must" ;
-- VVF VPPart => ["had to"] ;
-- VVF VPresPart => ["having to"] ;
-- VVF VPast => ["had to"] ; --# notpresent
-- VVPastNeg => ["hadn't to"] ; --# notpresent
-- VVPresNeg => "mustn't"
-- } ;
-- isAux = True
-- } ;
-----b no_Phr = ss "no" ;
-- no_Utt = ss "no" ;
-- on_Prep = ss "on" ;
------ one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED
-- only_Predet = ss "only" ;
-- or_Conj = sd2 [] "or" ** {n = Sg} ;
-- otherwise_PConj = ss "otherwise" ;
-- part_Prep = ss "of" ;
-- please_Voc = ss "please" ;
-- possess_Prep = ss "of" ;
-- quite_Adv = ss "quite" ;
-- she_Pron = mkNP "she" "her" "her" Sg P3 Fem ;
-- so_AdA = ss "so" ;
-- somebody_NP = regNP "somebody" Sg ;
-- someSg_Det = mkDeterminer Sg "some" ;
-- somePl_Det = mkDeterminer Pl "some" ;
-- something_NP = regNP "something" Sg ;
-- somewhere_Adv = ss "somewhere" ;
-- that_Quant = mkQuant "that" "those" ;
-- there_Adv = ss "there" ;
-- there7to_Adv = ss "there" ;
-- there7from_Adv = ss ["from there"] ;
-- therefore_PConj = ss "therefore" ;
-- they_Pron = mkNP "they" "them" "their" Pl P3 Masc ; ----
-- this_Quant = mkQuant "this" "these" ;
-- through_Prep = ss "through" ;
-- too_AdA = ss "too" ;
-- to_Prep = ss "to" ;
-- under_Prep = ss "under" ;
-- very_AdA = ss "very" ;
-- want_VV = P.mkVV (P.regV "want") ;
we_Pron = personalPronoun P1 Pl ** {a = Ag Masc Pl P1} ; we_Pron = personalPronoun P1 Pl ** {a = Ag Masc Pl P1} ;
-- whatPl_IP = mkIP "what" "what" "what's" Sg ;
-- whatSg_IP = mkIP "what" "what" "what's" Sg ;
-- when_IAdv = ss "when" ;
-- when_Subj = ss "when" ;
-- where_IAdv = ss "where" ;
-- which_IQuant = {s = \\_ => "which"} ;
-----b whichPl_IDet = mkDeterminer Pl ["which"] ;
-----b whichSg_IDet = mkDeterminer Sg ["which"] ;
-- whoSg_IP = mkIP "who" "whom" "whose" Sg ;
-- whoPl_IP = mkIP "who" "whom" "whose" Pl ;
-- why_IAdv = ss "why" ;
-- without_Prep = ss "without" ;
-- with_Prep = ss "with" ;
-----b yes_Phr = ss "yes" ;
-- yes_Utt = ss "yes" ;
-- youSg_Pron = mkNP "you" "you" "your" Sg P2 Masc ;
-- youPl_Pron = mkNP "you" "you" "your" Pl P2 Masc ;
-- youPol_Pron = mkNP "you" "you" "your" Sg P2 Masc ;
--
--
--oper
-- mkQuant : Str -> Str -> {s : Number => Str} = \x,y -> {
-- s = table Number [x ; y]
-- } ;
--
} }
--