summaryrefslogtreecommitdiff
path: root/src/GF/Printing
diff options
context:
space:
mode:
authorbringert <unknown>2005-06-17 13:15:16 +0000
committerbringert <unknown>2005-06-17 13:15:16 +0000
commit2c48a10236bb19d8b04382cb1e957ce18b9d29fd (patch)
tree1194fc1981b5cd2a144b72f4fff261edfeb1af2e /src/GF/Printing
parent05b5ffe5bf03a870f6fe0728ace6c0d8de69b89e (diff)
Changed name of Con constructor in GFC.cf to avoid errors on Windows when generating Java code with BNFC for the GFC grammar. CON is a reserved filename on Windows. Con was changed to Par, and all the code using was changed too.
Diffstat (limited to 'src/GF/Printing')
-rw-r--r--src/GF/Printing/PrintSimplifiedTerm.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/GF/Printing/PrintSimplifiedTerm.hs b/src/GF/Printing/PrintSimplifiedTerm.hs
index 309fe8f6d..ccd107558 100644
--- a/src/GF/Printing/PrintSimplifiedTerm.hs
+++ b/src/GF/Printing/PrintSimplifiedTerm.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/04/21 16:23:17 $
+-- > CVS $Date: 2005/06/17 14:15:19 $
-- > CVS $Author: bringert $
--- > CVS $Revision: 1.3 $
+-- > CVS $Revision: 1.4 $
--
-- Instances for printing terms in a simplified format
-----------------------------------------------------------------------------
@@ -23,8 +23,8 @@ import qualified GF.Canon.PrintGFC as P
instance Print Term where
prt (Arg arg) = prt arg
- prt (con `Con` []) = prt con
- prt (con `Con` terms) = prt con ++ "(" ++ prtSep ", " terms ++ ")"
+ prt (con `Par` []) = prt con
+ prt (con `Par` terms) = prt con ++ "(" ++ prtSep ", " terms ++ ")"
prt (LI ident) = prt ident
prt (R record) = "{" ++ prtSep ";" record ++ "}"
prt (term `P` lbl) = prt term ++ "." ++ prt lbl
@@ -112,7 +112,7 @@ sizeCT (Cn cn) = 1
sizeCT (TStr) = 1
sizeT :: Term -> Int
-sizeT (_ `Con` ts) = 2 + sum (map sizeT ts)
+sizeT (_ `Par` ts) = 2 + sum (map sizeT ts)
sizeT (R rec) = 1 + sum [ sizeT t | _ `Ass` t <- rec ]
sizeT (t `P` _) = 1 + sizeT t
sizeT (T _ tbl) = 1 + sum [ sum (map sizeP ps) + sizeT t | ps `Cas` t <- tbl ]