fixed naming conflicts in resource

This commit is contained in:
aarne
2007-06-17 22:52:27 +00:00
parent 3adf824e8e
commit 6a2cbe19d2
21 changed files with 68337 additions and 68334 deletions

View File

@@ -5,26 +5,26 @@ concrete IdiomNor of Idiom = CatNor **
lin
ImpersCl vp = mkClause "det" (agrP3 neutrum Sg) vp ;
ImpersCl vp = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) vp ;
GenericCl vp = mkClause "man" (agrP3 utrum Sg) vp ;
CleftNP np rs = mkClause "det" (agrP3 neutrum Sg)
CleftNP np rs = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg)
(insertObj (\\_ => rs.s ! np.a)
(insertObj (\\_ => np.s ! rs.c) (predV verbBe))) ;
CleftAdv ad s = mkClause "det" (agrP3 neutrum Sg)
CleftAdv ad s = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg)
(insertObj (\\_ => "som" ++ s.s ! Sub)
(insertObj (\\_ => ad.s) (predV verbBe))) ;
ExistNP np =
mkClause "det" (agrP3 neutrum Sg) (insertObj
mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) (insertObj
(\\_ => np.s ! accusative) (predV (depV finne_V))) ;
ExistIP ip = {
s = \\t,a,p =>
let
cls =
(mkClause "det" (agrP3 neutrum Sg) (predV (depV finne_V))).s ! t ! a ! p ;
(mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) (predV (depV finne_V))).s ! t ! a ! p ;
who = ip.s ! accusative
in table {
QDir => who ++ cls ! Inv ;

View File

@@ -53,18 +53,18 @@ lin
close_V2 = dirV2 (mk2V "lukke" "lukket") ;
coat_N = regGenN "frakk" masculine ;
cold_A = regADeg "kald" ;
come_V = vaereV komme_V ;
come_V = vaereV IrregNor.komme_V ;
computer_N = mk2N "datamaskin" "datamaskinen" ;
country_N = mk2N "land" "landet" ;
cousin_N = mk2N "fetter" "fetteren" ; ----
cow_N = mkN "ku" "kua" "kyr" "kyrne" ; ----
die_V = vaereV dø_V ;
die_V = vaereV IrregNor.dø_V ;
dirty_A = mk3ADeg "skitten" "skittent" "skitne" ; ----
distance_N3 = mkN3 (regGenN "avstand" masculine) (mkPrep "fra") (mkPrep "til") ;
doctor_N = mk2N "lege" "legen" ;
dog_N = regGenN "hund" masculine ;
door_N = regGenN "dør" feminine ;
drink_V2 = dirV2 drikke_V ;
drink_V2 = dirV2 IrregNor.drikke_V ;
easy_A2V = mkA2V (regA "grei") (mkPrep "for") ;
eat_V2 = dirV2 (mk2V "spise" "spiste") ;
empty_A = mkADeg "tom" "tomt" "tomme" "tommere" "tommest" ;
@@ -85,12 +85,12 @@ lin
glove_N = regGenN "hanske" masculine ;
gold_N = regGenN "gull" neutrum ;
good_A = mkADeg "god" "godt" "gode" "bedre" "best" ;
go_V = vaereV gå_V ;
go_V = vaereV IrregNor.gå_V ;
green_A = mk2ADeg "grønn" "grønt" ;
harbour_N = regGenN "havn" feminine;
hate_V2 = dirV2 (regV "hate") ;
hat_N = regGenN "hatt" masculine ;
have_V2 = dirV2 ha_V ;
have_V2 = dirV2 IrregNor.ha_V ;
hear_V2 = dirV2 (mk2V "høre" "hørte") ;
hill_N = regGenN "haug" masculine ;
hope_VS = mkVS (regV "håpe") ;
@@ -101,7 +101,7 @@ lin
industry_N = mk2N "industri" "industrien" ;
iron_N = regGenN "jern" neutrum ;
king_N = regGenN "konge" masculine ;
know_V2 = dirV2 vite_V ;
know_V2 = dirV2 IrregNor.vite_V ;
lake_N = regGenN "vann" neutrum ;
lamp_N = regGenN "lampe" feminine ;
learn_V2 = dirV2 (mk2V "lære" "lærte") ;
@@ -150,7 +150,7 @@ lin
rock_N = regGenN "stein" masculine ;
roof_N = regGenN "tak" neutrum ;
rubber_N = mk2N "gummi" "gummien" ;
run_V = vaereV springe_V ;
run_V = vaereV IrregNor.springe_V ;
say_VS = mkVS si_V ;
school_N = regGenN "skole" feminine;
science_N = mk2N "vitenskap" "vitenskapen" ;
@@ -197,7 +197,7 @@ lin
university_N = regGenN "universitet" neutrum ;
village_N = mk2N "grend" "grenda" ;
wait_V2 = mkV2 (regV "vente") (mkPrep "på") ;
walk_V = vaereV gå_V ;
walk_V = vaereV IrregNor.gå_V ;
warm_A = regADeg "varm" ;
war_N = regGenN "krig" masculine ;
watch_V2 = mkV2 se_V (mkPrep "på") ;
@@ -313,7 +313,7 @@ lin
fight_V2 = dirV2 (slåss_V) ;
float_V = flyte_V ;
flow_V = renne_V ;
fly_V = vaereV fly_V ;
fly_V = vaereV IrregNor.fly_V ;
freeze_V = fryse_V ;
give_V3 = dirdirV3 gi_V ;
hit_V2 = dirV2 (slå_V) ;

View File

@@ -1,4 +1,4 @@
concrete NumeralNor of Numeral = CatNor ** open ResScand, MorphoNor in {
concrete NumeralNor of Numeral = CatNor ** open MorphoNor in {
lincat
Digit = {s : DForm => CardOrd => Str} ;