From 0112bfb284f8e7696d4bb86392fec4e11e3524b8 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 7 Mar 2006 10:59:39 +0000 Subject: [PATCH] changed regN to be always of type Str -> N --- examples/bronzeage/SwadeshFre.gf | 120 +++++++++++++++---------------- examples/bronzeage/SwadeshNor.gf | 2 + 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/examples/bronzeage/SwadeshFre.gf b/examples/bronzeage/SwadeshFre.gf index 82f26f84e..63a418830 100644 --- a/examples/bronzeage/SwadeshFre.gf +++ b/examples/bronzeage/SwadeshFre.gf @@ -112,90 +112,90 @@ concrete SwadeshFre of Swadesh = CatFre -- Nouns - animal_N = regN "animal" masculine ; - ashes_N = regN "cendre" masculine ; - back_N = regN "dos" masculine ; - bark_N = regN "écorce" feminine ; - belly_N = regN "ventre" masculine ; + animal_N = regN "animal" ; + ashes_N = regGenN "cendre" masculine ; + back_N = regN "dos" ; + bark_N = regN "écorce" ; + belly_N = regGenN "ventre" masculine ; bird_N = bird_N; - blood_N = regN "sang" masculine ; - bone_N = regN "os" masculine ; - breast_N = regN "sein" masculine ; --- poitrine + blood_N = regN "sang" ; + bone_N = regN "os" ; + breast_N = regN "sein" ; --- poitrine child_N = child_N ; - cloud_N = regN "nuage" masculine ; - day_N = regN "jour" masculine ; + cloud_N = regGenN "nuage" masculine ; + day_N = regN "jour" ; dog_N = dog_N ; - dust_N = regN "poussière" feminine ; - ear_N = regN "oreille" feminine ; - earth_N = regN "terre" feminine ; - egg_N = regN "oeuf" masculine ; + dust_N = regN "poussière" ; + ear_N = regN "oreille" ; + earth_N = regN "terre" ; + egg_N = regN "oeuf" ; eye_N = mkN "oeil" "yeux" masculine ; - fat_N = regN "graisse" feminine ; + fat_N = regN "graisse" ; father_N = UseN2 father_N2 ; - feather_N = regN "plume" feminine ; - fingernail_N = regN "ongle" masculine ; - fire_N = regN "feu" masculine ; + feather_N = regN "plume" ; + fingernail_N = regGenN "ongle" masculine ; + fire_N = regN "feu" ; fish_N = fish_N ; - flower_N = regN "fleur" feminine ; - fog_N = regN "brouillard" masculine ; - foot_N = regN "pied" masculine ; - forest_N = regN "forêt" feminine ; + flower_N = regGenN "fleur" feminine ; + fog_N = regN "brouillard" ; + foot_N = regN "pied" ; + forest_N = regGenN "forêt" feminine ; fruit_N = fruit_N ; - grass_N = regN "herbe" feminine ; - guts_N = regN "entraille" feminine ; - hair_N = regN "cheveu" masculine ; - hand_N = regN "main" feminine ; - head_N = regN "tête" feminine ; - heart_N = regN "coeur" masculine ; - horn_N = regN "corne" masculine ; - husband_N = regN "mari" masculine ; - ice_N = regN "glace" feminine ; - knee_N = regN "genou" masculine ; + grass_N = regN "herbe" ; + guts_N = regN "entraille" ; + hair_N = regN "cheveu" ; + hand_N = regGenN "main" feminine ; + head_N = regN "tête" ; + heart_N = regN "coeur" ; + horn_N = regGenN "corne" masculine ; + husband_N = regN "mari" ; + ice_N = regN "glace" ; + knee_N = regN "genou" ; lake_N = lake_N ; - leaf_N = regN "feuille" feminine ; - leg_N = regN "jambe" feminine ; - liver_N = regN "foie" masculine ; - louse_N = regN "pou" masculine ; + leaf_N = regN "feuille" ; + leg_N = regN "jambe" ; + liver_N = regGenN "foie" masculine ; + louse_N = regN "pou" ; man_N = man_N ; meat_N = meat_N ; moon_N = moon_N ; mother_N = UseN2 mother_N2 ; mountain_N = mountain_N ; - mouth_N = regN "bouche" feminine ; - name_N = regN "nom" masculine ; + mouth_N = regN "bouche" ; + name_N = regN "nom" ; neck_N = mkN "cou" "cous" masculine ; - night_N = regN "nuit" feminine ; - nose_N = regN "nez" masculine ; - person_N = regN "personne" feminine ; - rain_N = regN "pluie" feminine ; + night_N = regGenN "nuit" feminine ; + nose_N = regN "nez" ; + person_N = regN "personne" ; + rain_N = regN "pluie" ; river_N = river_N ; - road_N = regN "route" feminine ; - root_N = regN "racine" feminine ; - rope_N = regN "corde" feminine ; - salt_N = regN "sel" masculine ; - sand_N = regN "sable" masculine ; + road_N = regN "route" ; + root_N = regN "racine" ; + rope_N = regN "corde" ; + salt_N = regN "sel" ; + sand_N = regGenN "sable" masculine ; sea_N = sea_N ; - seed_N = regN "graine" feminine ; - skin_N = regN "peau" masculine ; + seed_N = regN "graine" ; + skin_N = regN "peau" ; sky_N = mkN "ciel" "cieux" masculine ; - smoke_N = regN "fumée" feminine ; + smoke_N = regN "fumée" ; snake_N = snake_N ; - snow_N = regN "neige" feminine ; + snow_N = regN "neige" ; star_N = star_N ; - stick_N = regN "bâton" masculine ; + stick_N = regN "bâton" ; stone_N = stone_N ; sun_N = sun_N ; - tail_N = regN "queue" feminine ; - tongue_N = regN "langue" feminine ; - tooth_N = regN "dent" feminine ; + tail_N = regN "queue" ; + tongue_N = regN "langue" ; + tooth_N = regGenN "dent" feminine ; tree_N = tree_N ; water_N = water_N ; - wife_N = regN "femme" feminine ; - wind_N = regN "vent" masculine ; - wing_N = regN "aile" feminine ; + wife_N = regN "femme" ; + wind_N = regN "vent" ; + wing_N = regN "aile" ; woman_N = woman_N ; - worm_N = regN "ver" masculine ; - year_N = regN "an" masculine ; --- année + worm_N = regN "ver" ; + year_N = regN "an" ; --- année -- Verbs diff --git a/examples/bronzeage/SwadeshNor.gf b/examples/bronzeage/SwadeshNor.gf index 44d46b279..6b160146c 100644 --- a/examples/bronzeage/SwadeshNor.gf +++ b/examples/bronzeage/SwadeshNor.gf @@ -42,6 +42,8 @@ concrete SwadeshNor of Swadesh = CatNor when_IAdv = when_IAdv ; how_IAdv = how_IAdv ; + far_Adv = mkAdv "fjern" ; + -- not : Adv ; -- ? -- Conjunctions