switched to unmodified BNFC-generated components

1 files changed, 77 insertions, 75 deletions

diff --git a/src/GF/Source/PrintGF.hs b/src/GF/Source/PrintGF.hs
index ed45d39c4..54a582c38 100644
--- a/src/GF/Source/PrintGF.hs
+++ b/src/GF/Source/PrintGF.hs
@@ -1,10 +1,10 @@
-module GF.Source.PrintGF where --H
+{-# OPTIONS -fno-warn-incomplete-patterns #-}
+module GF.Source.PrintGF where
 
--- pretty-printer generated by the BNF converter, except --H
+-- pretty-printer generated by the BNF converter
 
-import GF.Infra.Ident --H
-import GF.Source.AbsGF --H
-import Data.Char --H
+import GF.Source.AbsGF
+import Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String
@@ -18,12 +18,6 @@ doc = (:)
 render :: Doc -> String
 render d = rend 0 (map ($ "") $ d []) "" where
   rend i ss = case ss of
-    --H these four are hand-written
-    "{0"     :ts -> showChar '{' . rend (i+1) ts
-    t :"}0"  :ts -> showString t . space "}" . rend (i-1) ts
-    t : "."  :ts -> showString t . showString "." . rend i ts
-    "\\"     :ts -> showString "\\" . rend i ts
-
     "["      :ts -> showChar '[' . rend i ts
     "("      :ts -> showChar '(' . rend i ts
     "{"      :ts -> showChar '{' . new (i+1) . rend (i+1) ts
@@ -83,17 +77,18 @@ instance Print Double where
   prt _ x = doc (shows x)
 
 
-instance Print Ident where
-  prt _ i = doc (showString $ prIdent i) --H
-  prtList es = case es of
-   [x] -> (concatD [prt 0 x])
-   x:xs -> (concatD [prt 0 x , doc (showString ",") , prt 0 xs])
-
 
 instance Print LString where
   prt _ (LString i) = doc (showString i)
 
 
+instance Print PIdent where
+  prt _ (PIdent (_,i)) = doc (showString i)
+  prtList es = case es of
+   [x] -> (concatD [prt 0 x])
+   x:xs -> (concatD [prt 0 x , doc (showString ",") , prt 0 xs])
+
+
 
 instance Print Grammar where
   prt i e = case e of
@@ -102,7 +97,7 @@ instance Print Grammar where
 
 instance Print ModDef where
   prt i e = case e of
-   MMain id0 id concspecs -> prPrec i 0 (concatD [doc (showString "grammar") , prt 0 id0 , doc (showString "=") , doc (showString "{") , doc (showString "abstract") , doc (showString "=") , prt 0 id , doc (showString ";") , prt 0 concspecs , doc (showString "}")])
+   MMain pident0 pident concspecs -> prPrec i 0 (concatD [doc (showString "grammar") , prt 0 pident0 , doc (showString "=") , doc (showString "{") , doc (showString "abstract") , doc (showString "=") , prt 0 pident , doc (showString ";") , prt 0 concspecs , doc (showString "}")])
    MModule complmod modtype modbody -> prPrec i 0 (concatD [prt 0 complmod , prt 0 modtype , doc (showString "=") , prt 0 modbody])
 
   prtList es = case es of
@@ -111,7 +106,7 @@ instance Print ModDef where
 
 instance Print ConcSpec where
   prt i e = case e of
-   ConcSpec id concexp -> prPrec i 0 (concatD [prt 0 id , doc (showString "=") , prt 0 concexp])
+   ConcSpec pident concexp -> prPrec i 0 (concatD [prt 0 pident , doc (showString "=") , prt 0 concexp])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -120,7 +115,7 @@ instance Print ConcSpec where
 
 instance Print ConcExp where
   prt i e = case e of
-   ConcExp id transfers -> prPrec i 0 (concatD [prt 0 id , prt 0 transfers])
+   ConcExp pident transfers -> prPrec i 0 (concatD [prt 0 pident , prt 0 transfers])
 
 
 instance Print Transfer where
@@ -134,25 +129,26 @@ instance Print Transfer where
 
 instance Print ModType where
   prt i e = case e of
-   MTAbstract id -> prPrec i 0 (concatD [doc (showString "abstract") , prt 0 id])
-   MTResource id -> prPrec i 0 (concatD [doc (showString "resource") , prt 0 id])
-   MTInterface id -> prPrec i 0 (concatD [doc (showString "interface") , prt 0 id])
-   MTConcrete id0 id -> prPrec i 0 (concatD [doc (showString "concrete") , prt 0 id0 , doc (showString "of") , prt 0 id])
-   MTInstance id0 id -> prPrec i 0 (concatD [doc (showString "instance") , prt 0 id0 , doc (showString "of") , prt 0 id])
-   MTTransfer id open0 open -> prPrec i 0 (concatD [doc (showString "transfer") , prt 0 id , doc (showString ":") , prt 0 open0 , doc (showString "->") , prt 0 open])
+   MTAbstract pident -> prPrec i 0 (concatD [doc (showString "abstract") , prt 0 pident])
+   MTResource pident -> prPrec i 0 (concatD [doc (showString "resource") , prt 0 pident])
+   MTInterface pident -> prPrec i 0 (concatD [doc (showString "interface") , prt 0 pident])
+   MTConcrete pident0 pident -> prPrec i 0 (concatD [doc (showString "concrete") , prt 0 pident0 , doc (showString "of") , prt 0 pident])
+   MTInstance pident0 pident -> prPrec i 0 (concatD [doc (showString "instance") , prt 0 pident0 , doc (showString "of") , prt 0 pident])
+   MTTransfer pident open0 open -> prPrec i 0 (concatD [doc (showString "transfer") , prt 0 pident , doc (showString ":") , prt 0 open0 , doc (showString "->") , prt 0 open])
 
 
 instance Print ModBody where
   prt i e = case e of
-   MNoBody includeds -> prPrec i 0 (concatD [prt 0 includeds])
-   MWithBody included opens0 opens topdefs -> prPrec i 0 (concatD [prt 0 included , doc (showString "with") , prt 0 opens0 , doc (showString "**") , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")])
-   MWithEBody includeds included opens0 opens topdefs -> prPrec i 0 (concatD [prt 0 includeds , doc (showString "**") , prt 0 included , doc (showString "with") , prt 0 opens0 , doc (showString "**") , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")])
    MBody extend opens topdefs -> prPrec i 0 (concatD [prt 0 extend , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")])
+   MNoBody includeds -> prPrec i 0 (concatD [prt 0 includeds])
    MWith included opens -> prPrec i 0 (concatD [prt 0 included , doc (showString "with") , prt 0 opens])
+   MWithBody included opens0 opens topdefs -> prPrec i 0 (concatD [prt 0 included , doc (showString "with") , prt 0 opens0 , doc (showString "**") , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")])
    MWithE includeds included opens -> prPrec i 0 (concatD [prt 0 includeds , doc (showString "**") , prt 0 included , doc (showString "with") , prt 0 opens])
-   MReuse id -> prPrec i 0 (concatD [doc (showString "reuse") , prt 0 id])
+   MWithEBody includeds included opens0 opens topdefs -> prPrec i 0 (concatD [prt 0 includeds , doc (showString "**") , prt 0 included , doc (showString "with") , prt 0 opens0 , doc (showString "**") , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")])
+   MReuse pident -> prPrec i 0 (concatD [doc (showString "reuse") , prt 0 pident])
    MUnion includeds -> prPrec i 0 (concatD [doc (showString "union") , prt 0 includeds])
 
+
 instance Print Extend where
   prt i e = case e of
    Ext includeds -> prPrec i 0 (concatD [prt 0 includeds , doc (showString "**")])
@@ -167,9 +163,9 @@ instance Print Opens where
 
 instance Print Open where
   prt i e = case e of
-   OName id -> prPrec i 0 (concatD [prt 0 id])
-   OQualQO qualopen id -> prPrec i 0 (concatD [doc (showString "(") , prt 0 qualopen , prt 0 id , doc (showString ")")])
-   OQual qualopen id0 id -> prPrec i 0 (concatD [doc (showString "(") , prt 0 qualopen , prt 0 id0 , doc (showString "=") , prt 0 id , doc (showString ")")])
+   OName pident -> prPrec i 0 (concatD [prt 0 pident])
+   OQualQO qualopen pident -> prPrec i 0 (concatD [doc (showString "(") , prt 0 qualopen , prt 0 pident , doc (showString ")")])
+   OQual qualopen pident0 pident -> prPrec i 0 (concatD [doc (showString "(") , prt 0 qualopen , prt 0 pident0 , doc (showString "=") , prt 0 pident , doc (showString ")")])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -191,9 +187,9 @@ instance Print QualOpen where
 
 instance Print Included where
   prt i e = case e of
-   IAll id -> prPrec i 0 (concatD [prt 0 id])
-   ISome id ids -> prPrec i 0 (concatD [prt 0 id , doc (showString "[") , prt 0 ids , doc (showString "]")])
-   IMinus id ids -> prPrec i 0 (concatD [prt 0 id , doc (showString "-") , doc (showString "[") , prt 0 ids , doc (showString "]")])
+   IAll pident -> prPrec i 0 (concatD [prt 0 pident])
+   ISome pident pidents -> prPrec i 0 (concatD [prt 0 pident , doc (showString "[") , prt 0 pidents , doc (showString "]")])
+   IMinus pident pidents -> prPrec i 0 (concatD [prt 0 pident , doc (showString "-") , doc (showString "[") , prt 0 pidents , doc (showString "]")])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -230,9 +226,9 @@ instance Print TopDef where
    DefPrintOld printdefs -> prPrec i 0 (concatD [doc (showString "printname") , prt 0 printdefs])
    DefLintype defs -> prPrec i 0 (concatD [doc (showString "lintype") , prt 0 defs])
    DefPattern defs -> prPrec i 0 (concatD [doc (showString "pattern") , prt 0 defs])
-   DefPackage id topdefs -> prPrec i 0 (concatD [doc (showString "package") , prt 0 id , doc (showString "=") , doc (showString "{") , prt 0 topdefs , doc (showString "}") , doc (showString ";")])
+   DefPackage pident topdefs -> prPrec i 0 (concatD [doc (showString "package") , prt 0 pident , doc (showString "=") , doc (showString "{") , prt 0 topdefs , doc (showString "}") , doc (showString ";")])
    DefVars defs -> prPrec i 0 (concatD [doc (showString "var") , prt 0 defs])
-   DefTokenizer id -> prPrec i 0 (concatD [doc (showString "tokenizer") , prt 0 id , doc (showString ";")])
+   DefTokenizer pident -> prPrec i 0 (concatD [doc (showString "tokenizer") , prt 0 pident , doc (showString ";")])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -240,9 +236,9 @@ instance Print TopDef where
 
 instance Print CatDef where
   prt i e = case e of
-   SimpleCatDef id ddecls -> prPrec i 0 (concatD [prt 0 id , prt 0 ddecls])
-   ListCatDef id ddecls -> prPrec i 0 (concatD [doc (showString "[") , prt 0 id , prt 0 ddecls , doc (showString "]")])
-   ListSizeCatDef id ddecls n -> prPrec i 0 (concatD [doc (showString "[") , prt 0 id , prt 0 ddecls , doc (showString "]") , doc (showString "{") , prt 0 n , doc (showString "}")])
+   SimpleCatDef pident ddecls -> prPrec i 0 (concatD [prt 0 pident , prt 0 ddecls])
+   ListCatDef pident ddecls -> prPrec i 0 (concatD [doc (showString "[") , prt 0 pident , prt 0 ddecls , doc (showString "]")])
+   ListSizeCatDef pident ddecls n -> prPrec i 0 (concatD [doc (showString "[") , prt 0 pident , prt 0 ddecls , doc (showString "]") , doc (showString "{") , prt 0 n , doc (showString "}")])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])
@@ -250,7 +246,7 @@ instance Print CatDef where
 
 instance Print FunDef where
   prt i e = case e of
-   FunDef ids exp -> prPrec i 0 (concatD [prt 0 ids , doc (showString ":") , prt 0 exp])
+   FunDef pidents exp -> prPrec i 0 (concatD [prt 0 pidents , doc (showString ":") , prt 0 exp])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])
@@ -258,7 +254,7 @@ instance Print FunDef where
 
 instance Print DataDef where
   prt i e = case e of
-   DataDef id dataconstrs -> prPrec i 0 (concatD [prt 0 id , doc (showString "=") , prt 0 dataconstrs])
+   DataDef pident dataconstrs -> prPrec i 0 (concatD [prt 0 pident , doc (showString "=") , prt 0 dataconstrs])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])
@@ -266,8 +262,8 @@ instance Print DataDef where
 
 instance Print DataConstr where
   prt i e = case e of
-   DataId id -> prPrec i 0 (concatD [prt 0 id])
-   DataQId id0 id -> prPrec i 0 (concatD [prt 0 id0 , doc (showString ".") , prt 0 id])
+   DataId pident -> prPrec i 0 (concatD [prt 0 pident])
+   DataQId pident0 pident -> prPrec i 0 (concatD [prt 0 pident0 , doc (showString ".") , prt 0 pident])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -276,9 +272,9 @@ instance Print DataConstr where
 
 instance Print ParDef where
   prt i e = case e of
-   ParDefDir id parconstrs -> prPrec i 0 (concatD [prt 0 id , doc (showString "=") , prt 0 parconstrs])
-   ParDefIndir id0 id -> prPrec i 0 (concatD [prt 0 id0 , doc (showString "=") , doc (showString "(") , doc (showString "in") , prt 0 id , doc (showString ")")])
-   ParDefAbs id -> prPrec i 0 (concatD [prt 0 id])
+   ParDefDir pident parconstrs -> prPrec i 0 (concatD [prt 0 pident , doc (showString "=") , prt 0 parconstrs])
+   ParDefIndir pident0 pident -> prPrec i 0 (concatD [prt 0 pident0 , doc (showString "=") , doc (showString "(") , doc (showString "in") , prt 0 pident , doc (showString ")")])
+   ParDefAbs pident -> prPrec i 0 (concatD [prt 0 pident])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])
@@ -286,7 +282,7 @@ instance Print ParDef where
 
 instance Print ParConstr where
   prt i e = case e of
-   ParConstr id ddecls -> prPrec i 0 (concatD [prt 0 id , prt 0 ddecls])
+   ParConstr pident ddecls -> prPrec i 0 (concatD [prt 0 pident , prt 0 ddecls])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -303,7 +299,7 @@ instance Print PrintDef where
 
 instance Print FlagDef where
   prt i e = case e of
-   FlagDef id0 id -> prPrec i 0 (concatD [prt 0 id0 , doc (showString "=") , prt 0 id])
+   FlagDef pident0 pident -> prPrec i 0 (concatD [prt 0 pident0 , doc (showString "=") , prt 0 pident])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])
@@ -311,8 +307,8 @@ instance Print FlagDef where
 
 instance Print Name where
   prt i e = case e of
-   IdentName id -> prPrec i 0 (concatD [prt 0 id])
-   ListName id -> prPrec i 0 (concatD [doc (showString "[") , prt 0 id , doc (showString "]")])
+   IdentName pident -> prPrec i 0 (concatD [prt 0 pident])
+   ListName pident -> prPrec i 0 (concatD [doc (showString "[") , prt 0 pident , doc (showString "]")])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x])
@@ -320,9 +316,9 @@ instance Print Name where
 
 instance Print LocDef where
   prt i e = case e of
-   LDDecl ids exp -> prPrec i 0 (concatD [prt 0 ids , doc (showString ":") , prt 0 exp])
-   LDDef ids exp -> prPrec i 0 (concatD [prt 0 ids , doc (showString "=") , prt 0 exp])
-   LDFull ids exp0 exp -> prPrec i 0 (concatD [prt 0 ids , doc (showString ":") , prt 0 exp0 , doc (showString "=") , prt 0 exp])
+   LDDecl pidents exp -> prPrec i 0 (concatD [prt 0 pidents , doc (showString ":") , prt 0 exp])
+   LDDef pidents exp -> prPrec i 0 (concatD [prt 0 pidents , doc (showString "=") , prt 0 exp])
+   LDFull pidents exp0 exp -> prPrec i 0 (concatD [prt 0 pidents , doc (showString ":") , prt 0 exp0 , doc (showString "=") , prt 0 exp])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -331,9 +327,9 @@ instance Print LocDef where
 
 instance Print Exp where
   prt i e = case e of
-   EIdent id -> prPrec i 6 (concatD [prt 0 id])
-   EConstr id -> prPrec i 6 (concatD [doc (showString "{0") , prt 0 id , doc (showString "}0")]) --H
-   ECons id -> prPrec i 6 (concatD [doc (showString "%") , prt 0 id , doc (showString "%")])
+   EIdent pident -> prPrec i 6 (concatD [prt 0 pident])
+   EConstr pident -> prPrec i 6 (concatD [doc (showString "{") , prt 0 pident , doc (showString "}")])
+   ECons pident -> prPrec i 6 (concatD [doc (showString "%") , prt 0 pident , doc (showString "%")])
    ESort sort -> prPrec i 6 (concatD [prt 0 sort])
    EString str -> prPrec i 6 (concatD [prt 0 str])
    EInt n -> prPrec i 6 (concatD [prt 0 n])
@@ -341,15 +337,15 @@ instance Print Exp where
    EMeta  -> prPrec i 6 (concatD [doc (showString "?")])
    EEmpty  -> prPrec i 6 (concatD [doc (showString "[") , doc (showString "]")])
    EData  -> prPrec i 6 (concatD [doc (showString "data")])
-   EList id exps -> prPrec i 6 (concatD [doc (showString "[") , prt 0 id , prt 0 exps , doc (showString "]")])
+   EList pident exps -> prPrec i 6 (concatD [doc (showString "[") , prt 0 pident , prt 0 exps , doc (showString "]")])
    EStrings str -> prPrec i 6 (concatD [doc (showString "[") , prt 0 str , doc (showString "]")])
    ERecord locdefs -> prPrec i 6 (concatD [doc (showString "{") , prt 0 locdefs , doc (showString "}")])
    ETuple tuplecomps -> prPrec i 6 (concatD [doc (showString "<") , prt 0 tuplecomps , doc (showString ">")])
-   EIndir id -> prPrec i 6 (concatD [doc (showString "(") , doc (showString "in") , prt 0 id , doc (showString ")")])
+   EIndir pident -> prPrec i 6 (concatD [doc (showString "(") , doc (showString "in") , prt 0 pident , doc (showString ")")])
    ETyped exp0 exp -> prPrec i 6 (concatD [doc (showString "<") , prt 0 exp0 , doc (showString ":") , prt 0 exp , doc (showString ">")])
    EProj exp label -> prPrec i 5 (concatD [prt 5 exp , doc (showString ".") , prt 0 label])
-   EQConstr id0 id -> prPrec i 5 (concatD [doc (showString "{0") , prt 0 id0 , doc (showString ".") , prt 0 id , doc (showString "}0")]) --H
-   EQCons id0 id -> prPrec i 5 (concatD [doc (showString "%") , prt 0 id0 , doc (showString ".") , prt 0 id])
+   EQConstr pident0 pident -> prPrec i 5 (concatD [doc (showString "{") , prt 0 pident0 , doc (showString ".") , prt 0 pident , doc (showString "}")])
+   EQCons pident0 pident -> prPrec i 5 (concatD [doc (showString "%") , prt 0 pident0 , doc (showString ".") , prt 0 pident])
    EApp exp0 exp -> prPrec i 4 (concatD [prt 4 exp0 , prt 5 exp])
    ETable cases -> prPrec i 4 (concatD [doc (showString "table") , doc (showString "{") , prt 0 cases , doc (showString "}")])
    ETTable exp cases -> prPrec i 4 (concatD [doc (showString "table") , prt 6 exp , doc (showString "{") , prt 0 cases , doc (showString "}")])
@@ -358,7 +354,9 @@ instance Print Exp where
    EVariants exps -> prPrec i 4 (concatD [doc (showString "variants") , doc (showString "{") , prt 0 exps , doc (showString "}")])
    EPre exp alterns -> prPrec i 4 (concatD [doc (showString "pre") , doc (showString "{") , prt 0 exp , doc (showString ";") , prt 0 alterns , doc (showString "}")])
    EStrs exps -> prPrec i 4 (concatD [doc (showString "strs") , doc (showString "{") , prt 0 exps , doc (showString "}")])
-   EConAt id exp -> prPrec i 4 (concatD [prt 0 id , doc (showString "@") , prt 6 exp])
+   EConAt pident exp -> prPrec i 4 (concatD [prt 0 pident , doc (showString "@") , prt 6 exp])
+   EPatt patt -> prPrec i 4 (concatD [doc (showString "pattern") , prt 2 patt])
+   EPattType exp -> prPrec i 4 (concatD [doc (showString "pattern") , doc (showString "type") , prt 5 exp])
    ESelect exp0 exp -> prPrec i 3 (concatD [prt 3 exp0 , doc (showString "!") , prt 4 exp])
    ETupTyp exp0 exp -> prPrec i 3 (concatD [prt 3 exp0 , doc (showString "*") , prt 4 exp])
    EExtend exp0 exp -> prPrec i 3 (concatD [prt 3 exp0 , doc (showString "**") , prt 4 exp])
@@ -374,7 +372,7 @@ instance Print Exp where
    EEqs equations -> prPrec i 0 (concatD [doc (showString "fn") , doc (showString "{") , prt 0 equations , doc (showString "}")])
    EExample exp str -> prPrec i 0 (concatD [doc (showString "in") , prt 5 exp , prt 0 str])
    ELString lstring -> prPrec i 6 (concatD [prt 0 lstring])
-   ELin id -> prPrec i 4 (concatD [doc (showString "Lin") , prt 0 id])
+   ELin pident -> prPrec i 4 (concatD [doc (showString "Lin") , prt 0 pident])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -389,21 +387,25 @@ instance Print Exps where
 
 instance Print Patt where
   prt i e = case e of
+   PChar  -> prPrec i 2 (concatD [doc (showString "?")])
+   PChars str -> prPrec i 2 (concatD [doc (showString "[") , prt 0 str , doc (showString "]")])
+   PMacro pident -> prPrec i 2 (concatD [doc (showString "#") , prt 0 pident])
+   PM pident0 pident -> prPrec i 2 (concatD [doc (showString "#") , prt 0 pident0 , doc (showString ".") , prt 0 pident])
    PW  -> prPrec i 2 (concatD [doc (showString "_")])
-   PV id -> prPrec i 2 (concatD [prt 0 id])
-   PCon id -> prPrec i 2 (concatD [doc (showString "{0") , prt 0 id , doc (showString "}0")]) --H
-   PQ id0 id -> prPrec i 2 (concatD [prt 0 id0 , doc (showString ".") , prt 0 id])
+   PV pident -> prPrec i 2 (concatD [prt 0 pident])
+   PCon pident -> prPrec i 2 (concatD [doc (showString "{") , prt 0 pident , doc (showString "}")])
+   PQ pident0 pident -> prPrec i 2 (concatD [prt 0 pident0 , doc (showString ".") , prt 0 pident])
    PInt n -> prPrec i 2 (concatD [prt 0 n])
    PFloat d -> prPrec i 2 (concatD [prt 0 d])
    PStr str -> prPrec i 2 (concatD [prt 0 str])
    PR pattasss -> prPrec i 2 (concatD [doc (showString "{") , prt 0 pattasss , doc (showString "}")])
    PTup patttuplecomps -> prPrec i 2 (concatD [doc (showString "<") , prt 0 patttuplecomps , doc (showString ">")])
-   PC id patts -> prPrec i 1 (concatD [prt 0 id , prt 0 patts])
-   PQC id0 id patts -> prPrec i 1 (concatD [prt 0 id0 , doc (showString ".") , prt 0 id , prt 0 patts])
+   PC pident patts -> prPrec i 1 (concatD [prt 0 pident , prt 0 patts])
+   PQC pident0 pident patts -> prPrec i 1 (concatD [prt 0 pident0 , doc (showString ".") , prt 0 pident , prt 0 patts])
    PDisj patt0 patt -> prPrec i 0 (concatD [prt 0 patt0 , doc (showString "|") , prt 1 patt])
    PSeq patt0 patt -> prPrec i 0 (concatD [prt 0 patt0 , doc (showString "+") , prt 1 patt])
    PRep patt -> prPrec i 1 (concatD [prt 2 patt , doc (showString "*")])
-   PAs id patt -> prPrec i 1 (concatD [prt 0 id , doc (showString "@") , prt 2 patt])
+   PAs pident patt -> prPrec i 1 (concatD [prt 0 pident , doc (showString "@") , prt 2 patt])
    PNeg patt -> prPrec i 1 (concatD [doc (showString "-") , prt 2 patt])
 
   prtList es = case es of
@@ -412,7 +414,7 @@ instance Print Patt where
 
 instance Print PattAss where
   prt i e = case e of
-   PA ids patt -> prPrec i 0 (concatD [prt 0 ids , doc (showString "=") , prt 0 patt])
+   PA pidents patt -> prPrec i 0 (concatD [prt 0 pidents , doc (showString "=") , prt 0 patt])
 
   prtList es = case es of
    [] -> (concatD [])
@@ -421,7 +423,7 @@ instance Print PattAss where
 
 instance Print Label where
   prt i e = case e of
-   LIdent id -> prPrec i 0 (concatD [prt 0 id])
+   LIdent pident -> prPrec i 0 (concatD [prt 0 pident])
    LVar n -> prPrec i 0 (concatD [doc (showString "$") , prt 0 n])
 
 
@@ -436,7 +438,7 @@ instance Print Sort where
 
 instance Print Bind where
   prt i e = case e of
-   BIdent id -> prPrec i 0 (concatD [prt 0 id])
+   BIdent pident -> prPrec i 0 (concatD [prt 0 pident])
    BWild  -> prPrec i 0 (concatD [doc (showString "_")])
 
   prtList es = case es of
@@ -517,11 +519,11 @@ instance Print Include where
 instance Print FileName where
   prt i e = case e of
    FString str -> prPrec i 0 (concatD [prt 0 str])
-   FIdent id -> prPrec i 0 (concatD [prt 0 id])
+   FIdent pident -> prPrec i 0 (concatD [prt 0 pident])
    FSlash filename -> prPrec i 0 (concatD [doc (showString "/") , prt 0 filename])
    FDot filename -> prPrec i 0 (concatD [doc (showString ".") , prt 0 filename])
    FMinus filename -> prPrec i 0 (concatD [doc (showString "-") , prt 0 filename])
-   FAddId id filename -> prPrec i 0 (concatD [prt 0 id , prt 0 filename])
+   FAddId pident filename -> prPrec i 0 (concatD [prt 0 pident , prt 0 filename])
 
   prtList es = case es of
    [x] -> (concatD [prt 0 x , doc (showString ";")])