From a0abbc5cddb710da9c844585c752e8faf26a0425 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 6 Mar 2009 13:15:52 +0000 Subject: [PATCH] next-resource Make extended; bronezeage compilable again --- examples/bronzeage/SwadeshDan.gf | 7 +- examples/bronzeage/SwadeshFin.gf | 1 - examples/bronzeage/SwadeshFre.gf | 1 - examples/bronzeage/SwadeshGer.gf | 1 - examples/bronzeage/SwadeshI.gf | 348 +++++++++++++++---------------- examples/bronzeage/SwadeshIta.gf | 1 - examples/bronzeage/SwadeshNor.gf | 1 - examples/bronzeage/SwadeshRus.gf | 1 - examples/bronzeage/SwadeshSpa.gf | 1 - examples/bronzeage/SwadeshSwe.gf | 1 - next-lib/src/Make.hs | 4 +- 11 files changed, 180 insertions(+), 187 deletions(-) diff --git a/examples/bronzeage/SwadeshDan.gf b/examples/bronzeage/SwadeshDan.gf index e667609f3..43dc891de 100644 --- a/examples/bronzeage/SwadeshDan.gf +++ b/examples/bronzeage/SwadeshDan.gf @@ -1,5 +1,6 @@ ---# -path=.:present:prelude +--# -path=.:present -concrete SwadeshDan of Swadesh = CatDan ** SwadeshI with - (Lang = LangDan) ; +concrete SwadeshDan of Swadesh = SwadeshI with + (Lexicon = LexiconDan), + (Syntax = SyntaxDan) ; diff --git a/examples/bronzeage/SwadeshFin.gf b/examples/bronzeage/SwadeshFin.gf index 8c05ca529..85c6cc9c4 100644 --- a/examples/bronzeage/SwadeshFin.gf +++ b/examples/bronzeage/SwadeshFin.gf @@ -1,7 +1,6 @@ --# -path=.:present:prelude concrete SwadeshFin of Swadesh = SwadeshI with - (L = LexiconFin), (Lexicon = LexiconFin), (Syntax = SyntaxFin) ; diff --git a/examples/bronzeage/SwadeshFre.gf b/examples/bronzeage/SwadeshFre.gf index 16c069944..c7b0b66a8 100644 --- a/examples/bronzeage/SwadeshFre.gf +++ b/examples/bronzeage/SwadeshFre.gf @@ -1,7 +1,6 @@ --# -path=.:present concrete SwadeshFre of Swadesh = SwadeshI with - (L = LexiconFre), (Lexicon = LexiconFre), (Syntax = SyntaxFre) ; diff --git a/examples/bronzeage/SwadeshGer.gf b/examples/bronzeage/SwadeshGer.gf index 49b76fd03..78fb6ebce 100644 --- a/examples/bronzeage/SwadeshGer.gf +++ b/examples/bronzeage/SwadeshGer.gf @@ -1,6 +1,5 @@ --# -path=.:present concrete SwadeshGer of Swadesh = SwadeshI with - (L = LexiconGer), (Lexicon = LexiconGer), (Syntax = SyntaxGer) ; diff --git a/examples/bronzeage/SwadeshI.gf b/examples/bronzeage/SwadeshI.gf index f060cf4bf..331f926aa 100644 --- a/examples/bronzeage/SwadeshI.gf +++ b/examples/bronzeage/SwadeshI.gf @@ -1,4 +1,4 @@ -incomplete concrete SwadeshI of Swadesh = open Syntax, (L = Lexicon) in { +incomplete concrete SwadeshI of Swadesh = open Syntax, Lexicon in { lincat V = Syntax.V ; @@ -50,7 +50,7 @@ incomplete concrete SwadeshI of Swadesh = open Syntax, (L = Lexicon) in { where_IAdv = Syntax.where_IAdv; when_IAdv = Syntax.when_IAdv; how_IAdv = Syntax.how_IAdv; - far_Adv = L.far_Adv ; + far_Adv = Lexicon.far_Adv ; -- not : Adv ; -- ? -- Conjunctions and_Conj = and_Conj ; @@ -65,179 +65,179 @@ incomplete concrete SwadeshI of Swadesh = open Syntax, (L = Lexicon) in { five_Num = mkCard n5_Numeral ; -- Adjectives - bad_A = L.bad_A ; - big_A = L.big_A ; - black_A = L.black_A ; - cold_A = L.cold_A ; - correct_A = L.correct_A ; - dirty_A = L.dirty_A ; - dry_A = L.dry_A ; - dull_A = L.dull_A ; - full_A = L.full_A ; - good_A = L.good_A ; - green_A = L.green_A ; - heavy_A = L.heavy_A ; - long_A = L.long_A ; - narrow_A = L.narrow_A ; - near_A = L.near_A ; - new_A = L.new_A ; - old_A = L.old_A ; ----- other_A = L.other_A ; - red_A = L.red_A ; - rotten_A = L.rotten_A ; - round_A = L.round_A ; - sharp_A = L.sharp_A ; - short_A = L.short_A ; - small_A = L.small_A ; - smooth_A = L.smooth_A ; - straight_A = L.straight_A ; - thick_A = L.thick_A ; - thin_A = L.thin_A ; - warm_A = L.warm_A ; - wet_A = L.wet_A ; - white_A = L.white_A ; - wide_A = L.wide_A ; - yellow_A = L.yellow_A ; + bad_A = Lexicon.bad_A ; + big_A = Lexicon.big_A ; + black_A = Lexicon.black_A ; + cold_A = Lexicon.cold_A ; + correct_A = Lexicon.correct_A ; + dirty_A = Lexicon.dirty_A ; + dry_A = Lexicon.dry_A ; + dull_A = Lexicon.dull_A ; + full_A = Lexicon.full_A ; + good_A = Lexicon.good_A ; + green_A = Lexicon.green_A ; + heavy_A = Lexicon.heavy_A ; + long_A = Lexicon.long_A ; + narrow_A = Lexicon.narrow_A ; + near_A = Lexicon.near_A ; + new_A = Lexicon.new_A ; + old_A = Lexicon.old_A ; +---- other_A = Lexicon.other_A ; + red_A = Lexicon.red_A ; + rotten_A = Lexicon.rotten_A ; + round_A = Lexicon.round_A ; + sharp_A = Lexicon.sharp_A ; + short_A = Lexicon.short_A ; + small_A = Lexicon.small_A ; + smooth_A = Lexicon.smooth_A ; + straight_A = Lexicon.straight_A ; + thick_A = Lexicon.thick_A ; + thin_A = Lexicon.thin_A ; + warm_A = Lexicon.warm_A ; + wet_A = Lexicon.wet_A ; + white_A = Lexicon.white_A ; + wide_A = Lexicon.wide_A ; + yellow_A = Lexicon.yellow_A ; -- Nouns - animal_N = L.animal_N ; - ashes_N = L.ashes_N ; - back_N = L.back_N ; - bark_N = L.bark_N ; - belly_N = L.belly_N ; - bird_N = L.bird_N; - blood_N = L.blood_N ; - bone_N = L.bone_N ; - breast_N = L.breast_N ; - child_N = L.child_N ; - cloud_N = L.cloud_N ; - day_N = L.day_N ; - dog_N = L.dog_N ; - dust_N = L.dust_N ; - ear_N = L.ear_N ; - earth_N = L.earth_N ; - egg_N = L.egg_N ; - eye_N = L.eye_N ; - fat_N = L.fat_N ; - feather_N = L.feather_N ; - fingernail_N = L.fingernail_N ; - fire_N = L.fire_N ; - fish_N = L.fish_N ; - flower_N = L.flower_N ; - fog_N = L.fog_N ; - foot_N = L.foot_N ; - forest_N = L.forest_N ; - fruit_N = L.fruit_N ; - grass_N = L.grass_N ; - guts_N = L.guts_N ; - hair_N = L.hair_N ; - hand_N = L.hand_N ; - head_N = L.head_N ; - heart_N = L.heart_N ; - horn_N = L.horn_N ; - husband_N = L.man_N ; --- aviomies - ice_N = L.ice_N ; - knee_N = L.knee_N ; - lake_N = L.lake_N ; - leaf_N = L.leaf_N ; - leg_N = L.leg_N ; - liver_N = L.liver_N ; - louse_N = L.louse_N ; - man_N = L.man_N ; - meat_N = L.meat_N ; - moon_N = L.moon_N ; ----- mother_N = L.mother_N ; - mountain_N = L.mountain_N ; - mouth_N = L.mouth_N ; - name_N = L.name_N ; - neck_N = L.neck_N ; - night_N = L.night_N ; - nose_N = L.nose_N ; - person_N = L.person_N ; - rain_N = L.rain_N ; - river_N = L.river_N ; - road_N = L.road_N ; - root_N = L.root_N ; - rope_N = L.rope_N ; - salt_N = L.salt_N ; - sand_N = L.sand_N ; - sea_N = L.sea_N ; - seed_N = L.seed_N ; - skin_N = L.skin_N ; - sky_N = L.sky_N ; - smoke_N = L.smoke_N ; - snake_N = L.snake_N ; - snow_N = L.snow_N ; - star_N = L.star_N ; - stick_N = L.stick_N ; - stone_N = L.stone_N ; - sun_N = L.sun_N ; - tail_N = L.tail_N ; - tongue_N = L.tongue_N ; - tooth_N = L.tooth_N ; - tree_N = L.tree_N ; - water_N = L.water_N ; - wife_N = L.wife_N ; - wind_N = L.wind_N ; - wing_N = L.wing_N ; - woman_N = L.woman_N ; - worm_N = L.worm_N ; - year_N = L.year_N ; + animal_N = Lexicon.animal_N ; + ashes_N = Lexicon.ashes_N ; + back_N = Lexicon.back_N ; + bark_N = Lexicon.bark_N ; + belly_N = Lexicon.belly_N ; + bird_N = Lexicon.bird_N; + blood_N = Lexicon.blood_N ; + bone_N = Lexicon.bone_N ; + breast_N = Lexicon.breast_N ; + child_N = Lexicon.child_N ; + cloud_N = Lexicon.cloud_N ; + day_N = Lexicon.day_N ; + dog_N = Lexicon.dog_N ; + dust_N = Lexicon.dust_N ; + ear_N = Lexicon.ear_N ; + earth_N = Lexicon.earth_N ; + egg_N = Lexicon.egg_N ; + eye_N = Lexicon.eye_N ; + fat_N = Lexicon.fat_N ; + feather_N = Lexicon.feather_N ; + fingernail_N = Lexicon.fingernail_N ; + fire_N = Lexicon.fire_N ; + fish_N = Lexicon.fish_N ; + flower_N = Lexicon.flower_N ; + fog_N = Lexicon.fog_N ; + foot_N = Lexicon.foot_N ; + forest_N = Lexicon.forest_N ; + fruit_N = Lexicon.fruit_N ; + grass_N = Lexicon.grass_N ; + guts_N = Lexicon.guts_N ; + hair_N = Lexicon.hair_N ; + hand_N = Lexicon.hand_N ; + head_N = Lexicon.head_N ; + heart_N = Lexicon.heart_N ; + horn_N = Lexicon.horn_N ; + husband_N = Lexicon.man_N ; --- aviomies + ice_N = Lexicon.ice_N ; + knee_N = Lexicon.knee_N ; + lake_N = Lexicon.lake_N ; + leaf_N = Lexicon.leaf_N ; + leg_N = Lexicon.leg_N ; + liver_N = Lexicon.liver_N ; + louse_N = Lexicon.louse_N ; + man_N = Lexicon.man_N ; + meat_N = Lexicon.meat_N ; + moon_N = Lexicon.moon_N ; +---- mother_N = Lexicon.mother_N ; + mountain_N = Lexicon.mountain_N ; + mouth_N = Lexicon.mouth_N ; + name_N = Lexicon.name_N ; + neck_N = Lexicon.neck_N ; + night_N = Lexicon.night_N ; + nose_N = Lexicon.nose_N ; + person_N = Lexicon.person_N ; + rain_N = Lexicon.rain_N ; + river_N = Lexicon.river_N ; + road_N = Lexicon.road_N ; + root_N = Lexicon.root_N ; + rope_N = Lexicon.rope_N ; + salt_N = Lexicon.salt_N ; + sand_N = Lexicon.sand_N ; + sea_N = Lexicon.sea_N ; + seed_N = Lexicon.seed_N ; + skin_N = Lexicon.skin_N ; + sky_N = Lexicon.sky_N ; + smoke_N = Lexicon.smoke_N ; + snake_N = Lexicon.snake_N ; + snow_N = Lexicon.snow_N ; + star_N = Lexicon.star_N ; + stick_N = Lexicon.stick_N ; + stone_N = Lexicon.stone_N ; + sun_N = Lexicon.sun_N ; + tail_N = Lexicon.tail_N ; + tongue_N = Lexicon.tongue_N ; + tooth_N = Lexicon.tooth_N ; + tree_N = Lexicon.tree_N ; + water_N = Lexicon.water_N ; + wife_N = Lexicon.wife_N ; + wind_N = Lexicon.wind_N ; + wing_N = Lexicon.wing_N ; + woman_N = Lexicon.woman_N ; + worm_N = Lexicon.worm_N ; + year_N = Lexicon.year_N ; -- Verbs - bite_V2 = L.bite_V2 ; - blow_V = L.blow_V ; - breathe_V = L.breathe_V ; - burn_V = L.burn_V ; - come_V = L.come_V ; - count_V2 = L.count_V2 ; - cut_V2 = L.cut_V2 ; - die_V = L.die_V ; - dig_V = L.dig_V ; - drink_V2 = L.drink_V2 ; - eat_V2 = L.eat_V2 ; - fall_V = L.fall_V ; - fear_V2 = L.fear_V2 ; - fight_V2 = L.fight_V2 ; - float_V = L.float_V ; - flow_V = L.flow_V ; - fly_V = L.fly_V ; - freeze_V = L.freeze_V ; - give_V3 = L.give_V3 ; - hear_V2 = L.hear_V2 ; - hit_V2 = L.hit_V2 ; - hold_V2 = L.hold_V2 ; - hunt_V2 = L.hunt_V2 ; - kill_V2 = L.kill_V2 ; - know_V2 = L.know_V2 ; - laugh_V = L.laugh_V ; - lie_V = L.lie_V ; - live_V = L.live_V ; --- play_V = L. play_V2 ; - pull_V2 = L.pull_V2 ; - push_V2 = L.push_V2 ; - rub_V2 = L.rub_V2 ; --- say_V = L.say_VS ; - scratch_V2 = L.scratch_V2 ; - see_V2 = L.see_V2 ; - sew_V = L.sew_V ; - sing_V = L.sing_V ; - sit_V = L.sit_V ; - sleep_V = L.sleep_V ; - smell_V = L.smell_V ; - spit_V = L.spit_V ; - split_V2 = L.split_V2 ; - squeeze_V2 = L.squeeze_V2 ; - stab_V2 = L.stab_V2 ; - stand_V = L.stand_V ; - suck_V2 = L.suck_V2 ; - swell_V = L.swell_V ; - swim_V = L.swim_V ; - think_V = L.think_V ; - throw_V2 = L.throw_V2 ; - tie_V2 = L.tie_V2 ; - turn_V = L.turn_V ; - vomit_V = L.vomit_V ; - walk_V = L.walk_V ; - wash_V2 = L.wash_V2 ; - wipe_V2 = L.wipe_V2 ; + bite_V2 = Lexicon.bite_V2 ; + blow_V = Lexicon.blow_V ; + breathe_V = Lexicon.breathe_V ; + burn_V = Lexicon.burn_V ; + come_V = Lexicon.come_V ; + count_V2 = Lexicon.count_V2 ; + cut_V2 = Lexicon.cut_V2 ; + die_V = Lexicon.die_V ; + dig_V = Lexicon.dig_V ; + drink_V2 = Lexicon.drink_V2 ; + eat_V2 = Lexicon.eat_V2 ; + fall_V = Lexicon.fall_V ; + fear_V2 = Lexicon.fear_V2 ; + fight_V2 = Lexicon.fight_V2 ; + float_V = Lexicon.float_V ; + flow_V = Lexicon.flow_V ; + fly_V = Lexicon.fly_V ; + freeze_V = Lexicon.freeze_V ; + give_V3 = Lexicon.give_V3 ; + hear_V2 = Lexicon.hear_V2 ; + hit_V2 = Lexicon.hit_V2 ; + hold_V2 = Lexicon.hold_V2 ; + hunt_V2 = Lexicon.hunt_V2 ; + kill_V2 = Lexicon.kill_V2 ; + know_V2 = Lexicon.know_V2 ; + laugh_V = Lexicon.laugh_V ; + lie_V = Lexicon.lie_V ; + live_V = Lexicon.live_V ; +-- play_V = Lexicon. play_V2 ; + pull_V2 = Lexicon.pull_V2 ; + push_V2 = Lexicon.push_V2 ; + rub_V2 = Lexicon.rub_V2 ; +-- say_V = Lexicon.say_VS ; + scratch_V2 = Lexicon.scratch_V2 ; + see_V2 = Lexicon.see_V2 ; + sew_V = Lexicon.sew_V ; + sing_V = Lexicon.sing_V ; + sit_V = Lexicon.sit_V ; + sleep_V = Lexicon.sleep_V ; + smell_V = Lexicon.smell_V ; + spit_V = Lexicon.spit_V ; + split_V2 = Lexicon.split_V2 ; + squeeze_V2 = Lexicon.squeeze_V2 ; + stab_V2 = Lexicon.stab_V2 ; + stand_V = Lexicon.stand_V ; + suck_V2 = Lexicon.suck_V2 ; + swell_V = Lexicon.swell_V ; + swim_V = Lexicon.swim_V ; + think_V = Lexicon.think_V ; + throw_V2 = Lexicon.throw_V2 ; + tie_V2 = Lexicon.tie_V2 ; + turn_V = Lexicon.turn_V ; + vomit_V = Lexicon.vomit_V ; + walk_V = Lexicon.walk_V ; + wash_V2 = Lexicon.wash_V2 ; + wipe_V2 = Lexicon.wipe_V2 ; } diff --git a/examples/bronzeage/SwadeshIta.gf b/examples/bronzeage/SwadeshIta.gf index eef7f2dd1..7e3a5c158 100644 --- a/examples/bronzeage/SwadeshIta.gf +++ b/examples/bronzeage/SwadeshIta.gf @@ -1,7 +1,6 @@ --# -path=.:present:prelude concrete SwadeshIta of Swadesh = SwadeshI with - (L = LexiconIta), (Lexicon = LexiconIta), (Syntax = SyntaxIta) ; diff --git a/examples/bronzeage/SwadeshNor.gf b/examples/bronzeage/SwadeshNor.gf index f75254265..742828899 100644 --- a/examples/bronzeage/SwadeshNor.gf +++ b/examples/bronzeage/SwadeshNor.gf @@ -1,7 +1,6 @@ --# -path=.:present concrete SwadeshNor of Swadesh = SwadeshI with - (L = LexiconNor), (Lexicon = LexiconNor), (Syntax = SyntaxNor) ; diff --git a/examples/bronzeage/SwadeshRus.gf b/examples/bronzeage/SwadeshRus.gf index 54439b095..af0689f4e 100644 --- a/examples/bronzeage/SwadeshRus.gf +++ b/examples/bronzeage/SwadeshRus.gf @@ -1,6 +1,5 @@ --# -path=.:present concrete SwadeshRus of Swadesh = SwadeshI with - (L = LexiconRus), (Lexicon = LexiconRus), (Syntax = SyntaxRus) ; diff --git a/examples/bronzeage/SwadeshSpa.gf b/examples/bronzeage/SwadeshSpa.gf index 8dbbfa6a5..18f9a98f6 100644 --- a/examples/bronzeage/SwadeshSpa.gf +++ b/examples/bronzeage/SwadeshSpa.gf @@ -1,7 +1,6 @@ --# -path=.:present concrete SwadeshSpa of Swadesh = SwadeshI with - (L = LexiconSpa), (Lexicon = LexiconSpa), (Syntax = SyntaxSpa) ; diff --git a/examples/bronzeage/SwadeshSwe.gf b/examples/bronzeage/SwadeshSwe.gf index 58c870430..6db832346 100644 --- a/examples/bronzeage/SwadeshSwe.gf +++ b/examples/bronzeage/SwadeshSwe.gf @@ -1,7 +1,6 @@ --# -path=.:present concrete SwadeshSwe of Swadesh = SwadeshI with - (L = LexiconSwe), (Lexicon = LexiconSwe), (Syntax = SyntaxSwe) ; diff --git a/next-lib/src/Make.hs b/next-lib/src/Make.hs index fd9449b41..8ab2a4f44 100644 --- a/next-lib/src/Make.hs +++ b/next-lib/src/Make.hs @@ -50,10 +50,10 @@ langsCoding = [ langs = map fst langsCoding -- languagues for which to compile Lang -langsLang = langs `except` ["Ara","Bul","Ina","Rus","Hin","Tha"] +langsLang = langs `except` ["Ara","Ina"] -- languages for which to compile Try -langsAPI = langsLang `except` ["Ara","Bul","Hin","Ina","Rus","Tha"] +langsAPI = langsLang `except` ["Ara","Hin","Ina","Tha"] -- languages for which to run treebank test langsTest = langsLang `except` ["Ara","Bul","Cat","Hin","Rus","Spa","Tha"]