diff --git a/grammars/resource/swedish/Morpho.gf b/grammars/resource/swedish/MorphoSwe.gf similarity index 99% rename from grammars/resource/swedish/Morpho.gf rename to grammars/resource/swedish/MorphoSwe.gf index d7b2c66fa..bacf136d6 100644 --- a/grammars/resource/swedish/Morpho.gf +++ b/grammars/resource/swedish/MorphoSwe.gf @@ -8,7 +8,7 @@ -- -- We use the parameter types and word classes defined for morphology. -resource Morpho = Types ** open Prelude in { +resource MorphoSwe = TypesSwe ** open Prelude in { -- The indefinite and definite article oper diff --git a/grammars/resource/swedish/ResSwe.gf b/grammars/resource/swedish/ResSwe.gf index 747929d59..725708a67 100644 --- a/grammars/resource/swedish/ResSwe.gf +++ b/grammars/resource/swedish/ResSwe.gf @@ -12,12 +12,12 @@ -- -- The users of the resource grammar should not look at this file for the -- linearization rules, which are in fact hidden in the document version. --- They should use $resource.Abs.gf$ to access the syntactic rules. +-- They should use $ResAbs.gf$ to access the syntactic rules. -- This file can be consulted in those, hopefully rare, occasions in which -- one has to know how the syntactic categories are --- implemented. The parameter types are defined in $Types.gf$. +-- implemented. The parameter types are defined in $TypesSwe.gf$. -concrete ResSwe of ResAbs = open Prelude, Syntax in { +concrete ResSwe of ResAbs = open Prelude, SyntaxSwe in { flags startcat=Phr ; diff --git a/grammars/resource/swedish/Svenska.gf b/grammars/resource/swedish/Svenska.gf deleted file mode 100644 index b86c1bb1d..000000000 --- a/grammars/resource/swedish/Svenska.gf +++ /dev/null @@ -1 +0,0 @@ -resource Svenska = reuse ResSwe ; diff --git a/grammars/resource/swedish/Swedish.gf b/grammars/resource/swedish/Swedish.gf new file mode 100644 index 000000000..64a6223a5 --- /dev/null +++ b/grammars/resource/swedish/Swedish.gf @@ -0,0 +1,4 @@ +-- use this path to read the grammar from the same directory +--# -path=.:../abstract:../../prelude + +resource Swedish = reuse ResSwe ; diff --git a/grammars/resource/swedish/Syntax.gf b/grammars/resource/swedish/SyntaxSwe.gf similarity index 99% rename from grammars/resource/swedish/Syntax.gf rename to grammars/resource/swedish/SyntaxSwe.gf index dab69b406..2deb412bc 100644 --- a/grammars/resource/swedish/Syntax.gf +++ b/grammars/resource/swedish/SyntaxSwe.gf @@ -7,7 +7,7 @@ -- -- The following modules are presupposed: -resource Syntax = Morpho ** open Prelude, (CO = Coordination) in { +resource SyntaxSwe = MorphoSwe ** open Prelude, (CO = Coordination) in { --2 Common Nouns -- diff --git a/grammars/resource/swedish/TestSwe.gf b/grammars/resource/swedish/TestSwe.gf index 3819a2b13..3b6d8388a 100644 --- a/grammars/resource/swedish/TestSwe.gf +++ b/grammars/resource/swedish/TestSwe.gf @@ -1,7 +1,7 @@ -- use this path to read the grammar from the same directory --# -path=.:../abstract:../../prelude -concrete TestSwe of TestAbs = ResSwe ** open Syntax in { +concrete TestSwe of TestAbs = ResSwe ** open SyntaxSwe in { flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; @@ -12,6 +12,9 @@ lin Small = liten_1146 ; Old = gammal_16 ; Young = ung_29 ; + American = extAdjective (aFin "amerikansk") ; + Finnish = extAdjective (aFin "finsk") ; + Married = extAdjective (aAbstrakt "gift") ** {s2 = "med"} ; Man = extCommNoun Masc man_1144 ; Woman = extCommNoun NoMasc (sApa "kvinn") ; Car = extCommNoun NoMasc (sBil "bil") ; diff --git a/grammars/resource/swedish/Types.gf b/grammars/resource/swedish/TypesSwe.gf similarity index 99% rename from grammars/resource/swedish/Types.gf rename to grammars/resource/swedish/TypesSwe.gf index 21ddfcfc7..e328cd803 100644 --- a/grammars/resource/swedish/Types.gf +++ b/grammars/resource/swedish/TypesSwe.gf @@ -9,7 +9,7 @@ -- This GF grammar was obtained from the functional morphology file TypesSw.hs -- semi-automatically. The GF inflection engine obtained was obtained automatically. -resource Types = open Prelude in { +resource TypesSwe = open Prelude in { --