From ff925031429edd05870db3213018383f374ab288 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Mon, 9 Sep 2013 19:52:08 +0000
Subject: [PATCH] Nonlinear patterns in concrete syntax are now detected and
 reported as errors

Before, they were silently converted to linear patterns.
Nonlinear patterns in MorphoCat.gf, ParadigmsGre.gf and ParadigmsFin.gf have
been make linear by renaming pattern variables.
---
 src/catalan/MorphoCat.gf    |  2 +-
 src/finnish/ParadigmsFin.gf |  4 ++--
 src/greek/ParadigmsGre.gf   | 23 ++++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/catalan/MorphoCat.gf b/src/catalan/MorphoCat.gf
index 7f65666c..21526565 100644
--- a/src/catalan/MorphoCat.gf
+++ b/src/catalan/MorphoCat.gf
@@ -236,7 +236,7 @@ oper
   mkAdj2Reg : Str -> Str -> Adj = \petit,petita ->
     case <petit,petita> of {
         <_, _ + ("b"|"c"|"d"|"e"|"f"|"g"|"h"|"i"|"j"|"k"|"l"|"m"|"n"|"o"|"p"|"q"|"r"|"s"|"t"|"u"|"v"|"x"|"y"|"z")> => adjFidel petit ; --feminine doesn't end in "a"
-        <p@(_ + ("t"|"l"|"ç")), p+"a"> => adjPrim petit ; --1) petit~petita 2) ridícul~ridícula, dolç~dolça
+        <p@(_ + ("t"|"l"|"ç")), p2+"a"> => adjPrim petit ; --1) petit~petita 2) ridícul~ridícula, dolç~dolça -- was nonlinear
         <_ + "ig", _> => adjIg petit petita ; --lleig~letja
         <_, _+ "na">  => adjVn petit ; --pla~plana
         <_, _ + ("à"|"é"|"è"|"í"|"ó"|"ò"|"ú") + _> => adjBlau petit petita ; --diari~diària
diff --git a/src/finnish/ParadigmsFin.gf b/src/finnish/ParadigmsFin.gf
index ecdcc822..8d488831 100644
--- a/src/finnish/ParadigmsFin.gf
+++ b/src/finnish/ParadigmsFin.gf
@@ -522,9 +522,9 @@ mkVS = overload {
           dSilakka ukko ukon ukkoja ;  -- auto,auton
         <_ + "mpi", _ + ("emman" | "emm�n")> => dSuurempi ukko ;
         <_ + "in", _ + ("imman" | "imm�n")> => dSuurin ukko ;
-        <terv + "e", terv + "een"> => 
+        <terv + "e", terv2 + "een"> => -- was nonlinear
           dRae ukko ukon ;
-        <taiv + ("as" | "�s"), taiv + ("aan" | "��n")> => 
+        <taiv + ("as" | "�s"), taiv2 + ("aan" | "��n")> =>  -- was nonlinear
           dRae ukko ukon ;
         <nukk + "e", nuk + "een"> => dRae ukko ukon ;
         <arp + "i", arv + "en"> => dArpi ukko ukon ;
diff --git a/src/greek/ParadigmsGre.gf b/src/greek/ParadigmsGre.gf
index f42cea8f..f5df9196 100644
--- a/src/greek/ParadigmsGre.gf
+++ b/src/greek/ParadigmsGre.gf
@@ -42,14 +42,15 @@ oper
 
   mkNending : Str -> Str -> Gender ->  N = \x,n,g ->
         case <x,n> of {
-          <c + "ος", c + "ων"> => mkNoun_anthropos x  n g ;
-          <c + "η", c + "εις"> => mkNoun_kivernisi x  n g ;
-          <c + "ης", c + "ηδες"> => mkNoun_fournaris x  n g ;
-          <c + "ας", c + "ων"> => mkNoun_filakas x  n g ;
-          <c + "ο", c + "ων"> => mkNoun_prosopo x  n g ;
-          <c + ("ώς" | "ός" | "ως" ) , c + ("ος"|"ός" ) > => mkNoun_fws x  n g ;
-          <c + ("μα" | "ιμο" ), c + "ατα"> => mkNoun_provlima x  n g ;
-          <c + "ος", c + "η"> => mkNoun_megethos x  n g 
+          -- all of these were nonlinear
+          <c + "ος", c2 + "ων"> => mkNoun_anthropos x  n g ;
+          <c + "η", c2 + "εις"> => mkNoun_kivernisi x  n g ;
+          <c + "ης", c2 + "ηδες"> => mkNoun_fournaris x  n g ;
+          <c + "ας", c2 + "ων"> => mkNoun_filakas x  n g ;
+          <c + "ο", c2 + "ων"> => mkNoun_prosopo x  n g ;
+          <c + ("ώς" | "ός" | "ως" ) , c2 + ("ος"|"ός" ) > => mkNoun_fws x  n g ;
+          <c + ("μα" | "ιμο" ), c2 + "ατα"> => mkNoun_provlima x  n g ;
+          <c + "ος", c2 + "η"> => mkNoun_megethos x  n g 
         }  ** {lock_N = <>} ;
    
 
@@ -128,9 +129,9 @@ oper
 
       mkA1 : Str -> Str ->  A = \x,n ->
           case <x,n> of {
-            <c + "ης", c + "ες"> => mkAdjective4 x n ; 
-            <c + "ων", c + "όντων"> => mkAdjective3 x n ;
-            <c + "ύς", c + "έως"> => mkAdjectiveIr x n  
+            <c + "ης", c2 + "ες"> => mkAdjective4 x n ;  -- was nonlinear
+            <c + "ων", c2 + "όντων"> => mkAdjective3 x n ;  -- was nonlinear
+            <c + "ύς", c2 + "έως"> => mkAdjectiveIr x n    -- was nonlinear
             }  ** {lock_A = <>} ;