GF/src is now for 2.9, and the new sources are in src-3.0 - keep it this way until the release of GF 3

536 files changed, 0 insertions, 0 deletions

diff --git a/src-2.9/FILES b/src-3.0/FILES
index 1311108b6..1311108b6 100644
--- a/src-2.9/FILES
+++ b/src-3.0/FILES
diff --git a/src-2.9/GF-embed.cabal b/src-3.0/GF-embed.cabal
index 54dce00b6..54dce00b6 100644
--- a/src-2.9/GF-embed.cabal
+++ b/src-3.0/GF-embed.cabal
diff --git a/src-2.9/GF.hs b/src-3.0/GF.hs
index 50afeb8e9..50afeb8e9 100644
--- a/src-2.9/GF.hs
+++ b/src-3.0/GF.hs
diff --git a/src-2.9/GF/API.hs b/src-3.0/GF/API.hs
index b1deeddfc..b1deeddfc 100644
--- a/src-2.9/GF/API.hs
+++ b/src-3.0/GF/API.hs
diff --git a/src-2.9/GF/API/BatchTranslate.hs b/src-3.0/GF/API/BatchTranslate.hs
index c1b124526..c1b124526 100644
--- a/src-2.9/GF/API/BatchTranslate.hs
+++ b/src-3.0/GF/API/BatchTranslate.hs
diff --git a/src-2.9/GF/API/GrammarToHaskell.hs b/src-3.0/GF/API/GrammarToHaskell.hs
index c57cfed42..c57cfed42 100644
--- a/src-2.9/GF/API/GrammarToHaskell.hs
+++ b/src-3.0/GF/API/GrammarToHaskell.hs
diff --git a/src-2.9/GF/API/GrammarToTransfer.hs b/src-3.0/GF/API/GrammarToTransfer.hs
index 658c15184..658c15184 100644
--- a/src-2.9/GF/API/GrammarToTransfer.hs
+++ b/src-3.0/GF/API/GrammarToTransfer.hs
diff --git a/src-2.9/GF/API/IOGrammar.hs b/src-3.0/GF/API/IOGrammar.hs
index bd7fc5648..bd7fc5648 100644
--- a/src-2.9/GF/API/IOGrammar.hs
+++ b/src-3.0/GF/API/IOGrammar.hs
diff --git a/src-2.9/GF/API/MyParser.hs b/src-3.0/GF/API/MyParser.hs
index c926fe865..c926fe865 100644
--- a/src-2.9/GF/API/MyParser.hs
+++ b/src-3.0/GF/API/MyParser.hs
diff --git a/src-2.9/GF/CF/CF.hs b/src-3.0/GF/CF/CF.hs
index 9233e905a..9233e905a 100644
--- a/src-2.9/GF/CF/CF.hs
+++ b/src-3.0/GF/CF/CF.hs
diff --git a/src-2.9/GF/CF/CFIdent.hs b/src-3.0/GF/CF/CFIdent.hs
index 02ee482c0..02ee482c0 100644
--- a/src-2.9/GF/CF/CFIdent.hs
+++ b/src-3.0/GF/CF/CFIdent.hs
diff --git a/src-2.9/GF/CF/CFtoGrammar.hs b/src-3.0/GF/CF/CFtoGrammar.hs
index 5e73aec31..5e73aec31 100644
--- a/src-2.9/GF/CF/CFtoGrammar.hs
+++ b/src-3.0/GF/CF/CFtoGrammar.hs
diff --git a/src-2.9/GF/CF/CanonToCF.hs b/src-3.0/GF/CF/CanonToCF.hs
index 80ce2e79d..80ce2e79d 100644
--- a/src-2.9/GF/CF/CanonToCF.hs
+++ b/src-3.0/GF/CF/CanonToCF.hs
diff --git a/src-2.9/GF/CF/ChartParser.hs b/src-3.0/GF/CF/ChartParser.hs
index 740c4d787..740c4d787 100644
--- a/src-2.9/GF/CF/ChartParser.hs
+++ b/src-3.0/GF/CF/ChartParser.hs
diff --git a/src-2.9/GF/CF/EBNF.hs b/src-3.0/GF/CF/EBNF.hs
index f091d19cb..f091d19cb 100644
--- a/src-2.9/GF/CF/EBNF.hs
+++ b/src-3.0/GF/CF/EBNF.hs
diff --git a/src-2.9/GF/CF/PPrCF.hs b/src-3.0/GF/CF/PPrCF.hs
index 1c2203e94..1c2203e94 100644
--- a/src-2.9/GF/CF/PPrCF.hs
+++ b/src-3.0/GF/CF/PPrCF.hs
diff --git a/src-2.9/GF/CF/PrLBNF.hs b/src-3.0/GF/CF/PrLBNF.hs
index 4ba2019bc..4ba2019bc 100644
--- a/src-2.9/GF/CF/PrLBNF.hs
+++ b/src-3.0/GF/CF/PrLBNF.hs
diff --git a/src-2.9/GF/CF/Profile.hs b/src-3.0/GF/CF/Profile.hs
index e573bec78..e573bec78 100644
--- a/src-2.9/GF/CF/Profile.hs
+++ b/src-3.0/GF/CF/Profile.hs
diff --git a/src-2.9/GF/CFGM/AbsCFG.hs b/src-3.0/GF/CFGM/AbsCFG.hs
index 063b96802..063b96802 100644
--- a/src-2.9/GF/CFGM/AbsCFG.hs
+++ b/src-3.0/GF/CFGM/AbsCFG.hs
diff --git a/src-2.9/GF/CFGM/CFG.cf b/src-3.0/GF/CFGM/CFG.cf
index fa722f4a4..fa722f4a4 100644
--- a/src-2.9/GF/CFGM/CFG.cf
+++ b/src-3.0/GF/CFGM/CFG.cf
diff --git a/src-2.9/GF/CFGM/LexCFG.hs b/src-3.0/GF/CFGM/LexCFG.hs
index e58fdff5a..e58fdff5a 100644
--- a/src-2.9/GF/CFGM/LexCFG.hs
+++ b/src-3.0/GF/CFGM/LexCFG.hs
diff --git a/src-2.9/GF/CFGM/LexCFG.x b/src-3.0/GF/CFGM/LexCFG.x
index f3ecb14eb..f3ecb14eb 100644
--- a/src-2.9/GF/CFGM/LexCFG.x
+++ b/src-3.0/GF/CFGM/LexCFG.x
diff --git a/src-2.9/GF/CFGM/ParCFG.hs b/src-3.0/GF/CFGM/ParCFG.hs
index cb70ef30d..cb70ef30d 100644
--- a/src-2.9/GF/CFGM/ParCFG.hs
+++ b/src-3.0/GF/CFGM/ParCFG.hs
diff --git a/src-2.9/GF/CFGM/ParCFG.y b/src-3.0/GF/CFGM/ParCFG.y
index 7b3041b3b..7b3041b3b 100644
--- a/src-2.9/GF/CFGM/ParCFG.y
+++ b/src-3.0/GF/CFGM/ParCFG.y
diff --git a/src-2.9/GF/CFGM/PrintCFG.hs b/src-3.0/GF/CFGM/PrintCFG.hs
index 0fd46239c..0fd46239c 100644
--- a/src-2.9/GF/CFGM/PrintCFG.hs
+++ b/src-3.0/GF/CFGM/PrintCFG.hs
diff --git a/src-2.9/GF/CFGM/PrintCFGrammar.hs b/src-3.0/GF/CFGM/PrintCFGrammar.hs
index a68d2325c..a68d2325c 100644
--- a/src-2.9/GF/CFGM/PrintCFGrammar.hs
+++ b/src-3.0/GF/CFGM/PrintCFGrammar.hs
diff --git a/src-2.9/GF/Canon/AbsGFC.hs b/src-3.0/GF/Canon/AbsGFC.hs
index 8ce719104..8ce719104 100644
--- a/src-2.9/GF/Canon/AbsGFC.hs
+++ b/src-3.0/GF/Canon/AbsGFC.hs
diff --git a/src-2.9/GF/Canon/AbsToBNF.hs b/src-3.0/GF/Canon/AbsToBNF.hs
index e30e836da..e30e836da 100644
--- a/src-2.9/GF/Canon/AbsToBNF.hs
+++ b/src-3.0/GF/Canon/AbsToBNF.hs
diff --git a/src-2.9/GF/Canon/CMacros.hs b/src-3.0/GF/Canon/CMacros.hs
index 572f09763..572f09763 100644
--- a/src-2.9/GF/Canon/CMacros.hs
+++ b/src-3.0/GF/Canon/CMacros.hs
diff --git a/src-2.9/GF/Canon/CanonToGFCC.hs b/src-3.0/GF/Canon/CanonToGFCC.hs
index 044ea3669..044ea3669 100644
--- a/src-2.9/GF/Canon/CanonToGFCC.hs
+++ b/src-3.0/GF/Canon/CanonToGFCC.hs
diff --git a/src-2.9/GF/Canon/CanonToGrammar.hs b/src-3.0/GF/Canon/CanonToGrammar.hs
index 078c3cc03..078c3cc03 100644
--- a/src-2.9/GF/Canon/CanonToGrammar.hs
+++ b/src-3.0/GF/Canon/CanonToGrammar.hs
diff --git a/src-2.9/GF/Canon/GFC.cf b/src-3.0/GF/Canon/GFC.cf
index d9385a49f..d9385a49f 100644
--- a/src-2.9/GF/Canon/GFC.cf
+++ b/src-3.0/GF/Canon/GFC.cf
diff --git a/src-2.9/GF/Canon/GFC.hs b/src-3.0/GF/Canon/GFC.hs
index ae9097c44..ae9097c44 100644
--- a/src-2.9/GF/Canon/GFC.hs
+++ b/src-3.0/GF/Canon/GFC.hs
diff --git a/src-2.9/GF/Canon/GetGFC.hs b/src-3.0/GF/Canon/GetGFC.hs
index 049f75efe..049f75efe 100644
--- a/src-2.9/GF/Canon/GetGFC.hs
+++ b/src-3.0/GF/Canon/GetGFC.hs
diff --git a/src-2.9/GF/Canon/LexGFC.hs b/src-3.0/GF/Canon/LexGFC.hs
index 31a4a9b30..31a4a9b30 100644
--- a/src-2.9/GF/Canon/LexGFC.hs
+++ b/src-3.0/GF/Canon/LexGFC.hs
diff --git a/src-2.9/GF/Canon/LexGFC.x b/src-3.0/GF/Canon/LexGFC.x
index 0a50e49d1..0a50e49d1 100644
--- a/src-2.9/GF/Canon/LexGFC.x
+++ b/src-3.0/GF/Canon/LexGFC.x
diff --git a/src-2.9/GF/Canon/Look.hs b/src-3.0/GF/Canon/Look.hs
index a93d4c834..a93d4c834 100644
--- a/src-2.9/GF/Canon/Look.hs
+++ b/src-3.0/GF/Canon/Look.hs
diff --git a/src-2.9/GF/Canon/MkGFC.hs b/src-3.0/GF/Canon/MkGFC.hs
index 8443354fc..8443354fc 100644
--- a/src-2.9/GF/Canon/MkGFC.hs
+++ b/src-3.0/GF/Canon/MkGFC.hs
diff --git a/src-2.9/GF/Canon/ParGFC.hs b/src-3.0/GF/Canon/ParGFC.hs
index 4332c06e4..4332c06e4 100644
--- a/src-2.9/GF/Canon/ParGFC.hs
+++ b/src-3.0/GF/Canon/ParGFC.hs
diff --git a/src-2.9/GF/Canon/ParGFC.y b/src-3.0/GF/Canon/ParGFC.y
index 6432a8696..6432a8696 100644
--- a/src-2.9/GF/Canon/ParGFC.y
+++ b/src-3.0/GF/Canon/ParGFC.y
diff --git a/src-2.9/GF/Canon/PrExp.hs b/src-3.0/GF/Canon/PrExp.hs
index 6202a760e..6202a760e 100644
--- a/src-2.9/GF/Canon/PrExp.hs
+++ b/src-3.0/GF/Canon/PrExp.hs
diff --git a/src-2.9/GF/Canon/PrintGFC.hs b/src-3.0/GF/Canon/PrintGFC.hs
index 437f3a1e9..437f3a1e9 100644
--- a/src-2.9/GF/Canon/PrintGFC.hs
+++ b/src-3.0/GF/Canon/PrintGFC.hs
diff --git a/src-2.9/GF/Canon/Share.hs b/src-3.0/GF/Canon/Share.hs
index 69725001a..69725001a 100644
--- a/src-2.9/GF/Canon/Share.hs
+++ b/src-3.0/GF/Canon/Share.hs
diff --git a/src-2.9/GF/Canon/SkelGFC.hs b/src-3.0/GF/Canon/SkelGFC.hs
index a1d9331d8..a1d9331d8 100644
--- a/src-2.9/GF/Canon/SkelGFC.hs
+++ b/src-3.0/GF/Canon/SkelGFC.hs
diff --git a/src-2.9/GF/Canon/Subexpressions.hs b/src-3.0/GF/Canon/Subexpressions.hs
index 683f9eecf..683f9eecf 100644
--- a/src-2.9/GF/Canon/Subexpressions.hs
+++ b/src-3.0/GF/Canon/Subexpressions.hs
diff --git a/src-2.9/GF/Canon/TestGFC.hs b/src-3.0/GF/Canon/TestGFC.hs
index 7c89d64e8..7c89d64e8 100644
--- a/src-2.9/GF/Canon/TestGFC.hs
+++ b/src-3.0/GF/Canon/TestGFC.hs
diff --git a/src-2.9/GF/Canon/Unlex.hs b/src-3.0/GF/Canon/Unlex.hs
index dd93390e2..dd93390e2 100644
--- a/src-2.9/GF/Canon/Unlex.hs
+++ b/src-3.0/GF/Canon/Unlex.hs
diff --git a/src-2.9/GF/Canon/Unparametrize.hs b/src-3.0/GF/Canon/Unparametrize.hs
index 0ca6a2d9c..0ca6a2d9c 100644
--- a/src-2.9/GF/Canon/Unparametrize.hs
+++ b/src-3.0/GF/Canon/Unparametrize.hs
diff --git a/src-2.9/GF/Canon/log.txt b/src-3.0/GF/Canon/log.txt
index 44dba3954..44dba3954 100644
--- a/src-2.9/GF/Canon/log.txt
+++ b/src-3.0/GF/Canon/log.txt
diff --git a/src-2.9/GF/Command/AbsGFShell.hs b/src-3.0/GF/Command/AbsGFShell.hs
index c13004cf9..c13004cf9 100644
--- a/src-2.9/GF/Command/AbsGFShell.hs
+++ b/src-3.0/GF/Command/AbsGFShell.hs
diff --git a/src-2.9/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs
index d5b5a8768..d5b5a8768 100644
--- a/src-2.9/GF/Command/Commands.hs
+++ b/src-3.0/GF/Command/Commands.hs
diff --git a/src-2.9/GF/Command/GFShell.cf b/src-3.0/GF/Command/GFShell.cf
index 1f5a9fa6d..1f5a9fa6d 100644
--- a/src-2.9/GF/Command/GFShell.cf
+++ b/src-3.0/GF/Command/GFShell.cf
diff --git a/src-2.9/GF/Command/Importing.hs b/src-3.0/GF/Command/Importing.hs
index a09ba8de6..a09ba8de6 100644
--- a/src-2.9/GF/Command/Importing.hs
+++ b/src-3.0/GF/Command/Importing.hs
diff --git a/src-2.9/GF/Command/Interpreter.hs b/src-3.0/GF/Command/Interpreter.hs
index 10730e7ef..10730e7ef 100644
--- a/src-2.9/GF/Command/Interpreter.hs
+++ b/src-3.0/GF/Command/Interpreter.hs
diff --git a/src-2.9/GF/Command/LexGFShell.hs b/src-3.0/GF/Command/LexGFShell.hs
index 8e0191039..8e0191039 100644
--- a/src-2.9/GF/Command/LexGFShell.hs
+++ b/src-3.0/GF/Command/LexGFShell.hs
diff --git a/src-2.9/GF/Command/PPrTree.hs b/src-3.0/GF/Command/PPrTree.hs
index 7372c722d..7372c722d 100644
--- a/src-2.9/GF/Command/PPrTree.hs
+++ b/src-3.0/GF/Command/PPrTree.hs
diff --git a/src-2.9/GF/Command/ParGFShell.hs b/src-3.0/GF/Command/ParGFShell.hs
index 1fc85b4b7..1fc85b4b7 100644
--- a/src-2.9/GF/Command/ParGFShell.hs
+++ b/src-3.0/GF/Command/ParGFShell.hs
diff --git a/src-2.9/GF/Command/PrintGFShell.hs b/src-3.0/GF/Command/PrintGFShell.hs
index 31a4584b6..31a4584b6 100644
--- a/src-2.9/GF/Command/PrintGFShell.hs
+++ b/src-3.0/GF/Command/PrintGFShell.hs
diff --git a/src-2.9/GF/Compile/API.hs b/src-3.0/GF/Compile/API.hs
index 242a9e87a..242a9e87a 100644
--- a/src-2.9/GF/Compile/API.hs
+++ b/src-3.0/GF/Compile/API.hs
diff --git a/src-2.9/GF/Compile/BackOpt.hs b/src-3.0/GF/Compile/BackOpt.hs
index 8356f2ba2..8356f2ba2 100644
--- a/src-2.9/GF/Compile/BackOpt.hs
+++ b/src-3.0/GF/Compile/BackOpt.hs
diff --git a/src-2.9/GF/Compile/CheckGrammar.hs b/src-3.0/GF/Compile/CheckGrammar.hs
index b33d11017..b33d11017 100644
--- a/src-2.9/GF/Compile/CheckGrammar.hs
+++ b/src-3.0/GF/Compile/CheckGrammar.hs
diff --git a/src-2.9/GF/Compile/Compile.hs b/src-3.0/GF/Compile/Compile.hs
index 422df0fd5..422df0fd5 100644
--- a/src-2.9/GF/Compile/Compile.hs
+++ b/src-3.0/GF/Compile/Compile.hs
diff --git a/src-2.9/GF/Compile/Evaluate.hs b/src-3.0/GF/Compile/Evaluate.hs
index a574fef40..a574fef40 100644
--- a/src-2.9/GF/Compile/Evaluate.hs
+++ b/src-3.0/GF/Compile/Evaluate.hs
diff --git a/src-2.9/GF/Compile/Extend.hs b/src-3.0/GF/Compile/Extend.hs
index ae87b3e71..ae87b3e71 100644
--- a/src-2.9/GF/Compile/Extend.hs
+++ b/src-3.0/GF/Compile/Extend.hs
diff --git a/src-2.9/GF/Compile/Flatten.hs b/src-3.0/GF/Compile/Flatten.hs
index 6b25edebb..6b25edebb 100644
--- a/src-2.9/GF/Compile/Flatten.hs
+++ b/src-3.0/GF/Compile/Flatten.hs
diff --git a/src-2.9/GF/Compile/GetGrammar.hs b/src-3.0/GF/Compile/GetGrammar.hs
index 294edbf9a..294edbf9a 100644
--- a/src-2.9/GF/Compile/GetGrammar.hs
+++ b/src-3.0/GF/Compile/GetGrammar.hs
diff --git a/src-2.9/GF/Compile/GrammarToCanon.hs b/src-3.0/GF/Compile/GrammarToCanon.hs
index 09c0d3d95..09c0d3d95 100644
--- a/src-2.9/GF/Compile/GrammarToCanon.hs
+++ b/src-3.0/GF/Compile/GrammarToCanon.hs
diff --git a/src-2.9/GF/Compile/MkConcrete.hs b/src-3.0/GF/Compile/MkConcrete.hs
index d016a7e47..d016a7e47 100644
--- a/src-2.9/GF/Compile/MkConcrete.hs
+++ b/src-3.0/GF/Compile/MkConcrete.hs
diff --git a/src-2.9/GF/Compile/MkResource.hs b/src-3.0/GF/Compile/MkResource.hs
index 10831b5c6..10831b5c6 100644
--- a/src-2.9/GF/Compile/MkResource.hs
+++ b/src-3.0/GF/Compile/MkResource.hs
diff --git a/src-2.9/GF/Compile/MkUnion.hs b/src-3.0/GF/Compile/MkUnion.hs
index b4b1f40c8..b4b1f40c8 100644
--- a/src-2.9/GF/Compile/MkUnion.hs
+++ b/src-3.0/GF/Compile/MkUnion.hs
diff --git a/src-2.9/GF/Compile/ModDeps.hs b/src-3.0/GF/Compile/ModDeps.hs
index 8331057d1..8331057d1 100644
--- a/src-2.9/GF/Compile/ModDeps.hs
+++ b/src-3.0/GF/Compile/ModDeps.hs
diff --git a/src-2.9/GF/Compile/NewRename.hs b/src-3.0/GF/Compile/NewRename.hs
index cec8ed24f..cec8ed24f 100644
--- a/src-2.9/GF/Compile/NewRename.hs
+++ b/src-3.0/GF/Compile/NewRename.hs
diff --git a/src-2.9/GF/Compile/NoParse.hs b/src-3.0/GF/Compile/NoParse.hs
index c8f828970..c8f828970 100644
--- a/src-2.9/GF/Compile/NoParse.hs
+++ b/src-3.0/GF/Compile/NoParse.hs
diff --git a/src-2.9/GF/Compile/Optimize.hs b/src-3.0/GF/Compile/Optimize.hs
index a540ee715..a540ee715 100644
--- a/src-2.9/GF/Compile/Optimize.hs
+++ b/src-3.0/GF/Compile/Optimize.hs
diff --git a/src-2.9/GF/Compile/PGrammar.hs b/src-3.0/GF/Compile/PGrammar.hs
index 521f616b5..521f616b5 100644
--- a/src-2.9/GF/Compile/PGrammar.hs
+++ b/src-3.0/GF/Compile/PGrammar.hs
diff --git a/src-2.9/GF/Compile/PrOld.hs b/src-3.0/GF/Compile/PrOld.hs
index 29920fab6..29920fab6 100644
--- a/src-2.9/GF/Compile/PrOld.hs
+++ b/src-3.0/GF/Compile/PrOld.hs
diff --git a/src-2.9/GF/Compile/Rebuild.hs b/src-3.0/GF/Compile/Rebuild.hs
index 152983b96..152983b96 100644
--- a/src-2.9/GF/Compile/Rebuild.hs
+++ b/src-3.0/GF/Compile/Rebuild.hs
diff --git a/src-2.9/GF/Compile/RemoveLiT.hs b/src-3.0/GF/Compile/RemoveLiT.hs
index 28aae9b84..28aae9b84 100644
--- a/src-2.9/GF/Compile/RemoveLiT.hs
+++ b/src-3.0/GF/Compile/RemoveLiT.hs
diff --git a/src-2.9/GF/Compile/Rename.hs b/src-3.0/GF/Compile/Rename.hs
index c3fef557b..c3fef557b 100644
--- a/src-2.9/GF/Compile/Rename.hs
+++ b/src-3.0/GF/Compile/Rename.hs
diff --git a/src-2.9/GF/Compile/ShellState.hs b/src-3.0/GF/Compile/ShellState.hs
index 0e24da601..0e24da601 100644
--- a/src-2.9/GF/Compile/ShellState.hs
+++ b/src-3.0/GF/Compile/ShellState.hs
diff --git a/src-2.9/GF/Compile/Update.hs b/src-3.0/GF/Compile/Update.hs
index 82d7a609e..82d7a609e 100644
--- a/src-2.9/GF/Compile/Update.hs
+++ b/src-3.0/GF/Compile/Update.hs
diff --git a/src-2.9/GF/Compile/Wordlist.hs b/src-3.0/GF/Compile/Wordlist.hs
index 3fbc066bd..3fbc066bd 100644
--- a/src-2.9/GF/Compile/Wordlist.hs
+++ b/src-3.0/GF/Compile/Wordlist.hs
diff --git a/src-2.9/GF/Conversion/GFC.hs b/src-3.0/GF/Conversion/GFC.hs
index 354bdea65..354bdea65 100644
--- a/src-2.9/GF/Conversion/GFC.hs
+++ b/src-3.0/GF/Conversion/GFC.hs
diff --git a/src-2.9/GF/Conversion/GFCtoSimple.hs b/src-3.0/GF/Conversion/GFCtoSimple.hs
index b6a34a8ce..b6a34a8ce 100644
--- a/src-2.9/GF/Conversion/GFCtoSimple.hs
+++ b/src-3.0/GF/Conversion/GFCtoSimple.hs
diff --git a/src-2.9/GF/Conversion/Haskell.hs b/src-3.0/GF/Conversion/Haskell.hs
index abe651e1e..abe651e1e 100644
--- a/src-2.9/GF/Conversion/Haskell.hs
+++ b/src-3.0/GF/Conversion/Haskell.hs
diff --git a/src-2.9/GF/Conversion/MCFGtoCFG.hs b/src-3.0/GF/Conversion/MCFGtoCFG.hs
index a58c31d37..a58c31d37 100644
--- a/src-2.9/GF/Conversion/MCFGtoCFG.hs
+++ b/src-3.0/GF/Conversion/MCFGtoCFG.hs
diff --git a/src-2.9/GF/Conversion/MCFGtoFCFG.hs b/src-3.0/GF/Conversion/MCFGtoFCFG.hs
index 70aa4644d..70aa4644d 100644
--- a/src-2.9/GF/Conversion/MCFGtoFCFG.hs
+++ b/src-3.0/GF/Conversion/MCFGtoFCFG.hs
diff --git a/src-2.9/GF/Conversion/Prolog.hs b/src-3.0/GF/Conversion/Prolog.hs
index b930cb476..b930cb476 100644
--- a/src-2.9/GF/Conversion/Prolog.hs
+++ b/src-3.0/GF/Conversion/Prolog.hs
diff --git a/src-2.9/GF/Conversion/RemoveEpsilon.hs b/src-3.0/GF/Conversion/RemoveEpsilon.hs
index 0e5dafb38..0e5dafb38 100644
--- a/src-2.9/GF/Conversion/RemoveEpsilon.hs
+++ b/src-3.0/GF/Conversion/RemoveEpsilon.hs
diff --git a/src-2.9/GF/Conversion/RemoveErasing.hs b/src-3.0/GF/Conversion/RemoveErasing.hs
index 1dc2560fc..1dc2560fc 100644
--- a/src-2.9/GF/Conversion/RemoveErasing.hs
+++ b/src-3.0/GF/Conversion/RemoveErasing.hs
diff --git a/src-2.9/GF/Conversion/RemoveSingletons.hs b/src-3.0/GF/Conversion/RemoveSingletons.hs
index 4b9992a4d..4b9992a4d 100644
--- a/src-2.9/GF/Conversion/RemoveSingletons.hs
+++ b/src-3.0/GF/Conversion/RemoveSingletons.hs
diff --git a/src-2.9/GF/Conversion/SimpleToFCFG.hs b/src-3.0/GF/Conversion/SimpleToFCFG.hs
index 4ff5781f9..4ff5781f9 100644
--- a/src-2.9/GF/Conversion/SimpleToFCFG.hs
+++ b/src-3.0/GF/Conversion/SimpleToFCFG.hs
diff --git a/src-2.9/GF/Conversion/SimpleToFinite.hs b/src-3.0/GF/Conversion/SimpleToFinite.hs
index bbd3ae355..bbd3ae355 100644
--- a/src-2.9/GF/Conversion/SimpleToFinite.hs
+++ b/src-3.0/GF/Conversion/SimpleToFinite.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG.hs b/src-3.0/GF/Conversion/SimpleToMCFG.hs
index 8f23c905d..8f23c905d 100644
--- a/src-2.9/GF/Conversion/SimpleToMCFG.hs
+++ b/src-3.0/GF/Conversion/SimpleToMCFG.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Coercions.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Coercions.hs
index 319b99dcb..319b99dcb 100644
--- a/src-2.9/GF/Conversion/SimpleToMCFG/Coercions.hs
+++ b/src-3.0/GF/Conversion/SimpleToMCFG/Coercions.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Nondet.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Nondet.hs
index d6ff052f5..d6ff052f5 100644
--- a/src-2.9/GF/Conversion/SimpleToMCFG/Nondet.hs
+++ b/src-3.0/GF/Conversion/SimpleToMCFG/Nondet.hs
diff --git a/src-2.9/GF/Conversion/SimpleToMCFG/Strict.hs b/src-3.0/GF/Conversion/SimpleToMCFG/Strict.hs
index a5519fcd8..a5519fcd8 100644
--- a/src-2.9/GF/Conversion/SimpleToMCFG/Strict.hs
+++ b/src-3.0/GF/Conversion/SimpleToMCFG/Strict.hs
diff --git a/src-2.9/GF/Conversion/TypeGraph.hs b/src-3.0/GF/Conversion/TypeGraph.hs
index 62ee9726e..62ee9726e 100644
--- a/src-2.9/GF/Conversion/TypeGraph.hs
+++ b/src-3.0/GF/Conversion/TypeGraph.hs
diff --git a/src-2.9/GF/Conversion/Types.hs b/src-3.0/GF/Conversion/Types.hs
index 97c2ace05..97c2ace05 100644
--- a/src-2.9/GF/Conversion/Types.hs
+++ b/src-3.0/GF/Conversion/Types.hs
diff --git a/src-2.9/GF/Data/Assoc.hs b/src-3.0/GF/Data/Assoc.hs
index f775319ea..f775319ea 100644
--- a/src-2.9/GF/Data/Assoc.hs
+++ b/src-3.0/GF/Data/Assoc.hs
diff --git a/src-2.9/GF/Data/BacktrackM.hs b/src-3.0/GF/Data/BacktrackM.hs
index 790d11a83..790d11a83 100644
--- a/src-2.9/GF/Data/BacktrackM.hs
+++ b/src-3.0/GF/Data/BacktrackM.hs
diff --git a/src-2.9/GF/Data/Compos.hs b/src-3.0/GF/Data/Compos.hs
index 7d46fc5a2..7d46fc5a2 100644
--- a/src-2.9/GF/Data/Compos.hs
+++ b/src-3.0/GF/Data/Compos.hs
diff --git a/src-2.9/GF/Data/ErrM.hs b/src-3.0/GF/Data/ErrM.hs
index e8cea12d4..e8cea12d4 100644
--- a/src-2.9/GF/Data/ErrM.hs
+++ b/src-3.0/GF/Data/ErrM.hs
diff --git a/src-2.9/GF/Data/GeneralDeduction.hs b/src-3.0/GF/Data/GeneralDeduction.hs
index 137212e5c..137212e5c 100644
--- a/src-2.9/GF/Data/GeneralDeduction.hs
+++ b/src-3.0/GF/Data/GeneralDeduction.hs
diff --git a/src-2.9/GF/Data/Glue.hs b/src-3.0/GF/Data/Glue.hs
index 4f276222b..4f276222b 100644
--- a/src-2.9/GF/Data/Glue.hs
+++ b/src-3.0/GF/Data/Glue.hs
diff --git a/src-2.9/GF/Data/IncrementalDeduction.hs b/src-3.0/GF/Data/IncrementalDeduction.hs
index d119610c1..d119610c1 100644
--- a/src-2.9/GF/Data/IncrementalDeduction.hs
+++ b/src-3.0/GF/Data/IncrementalDeduction.hs
diff --git a/src-2.9/GF/Data/Map.hs b/src-3.0/GF/Data/Map.hs
index c86c9ab55..c86c9ab55 100644
--- a/src-2.9/GF/Data/Map.hs
+++ b/src-3.0/GF/Data/Map.hs
diff --git a/src-2.9/GF/Data/Operations.hs b/src-3.0/GF/Data/Operations.hs
index 1b2033d69..1b2033d69 100644
--- a/src-2.9/GF/Data/Operations.hs
+++ b/src-3.0/GF/Data/Operations.hs
diff --git a/src-2.9/GF/Data/OrdMap2.hs b/src-3.0/GF/Data/OrdMap2.hs
index 3590f0584..3590f0584 100644
--- a/src-2.9/GF/Data/OrdMap2.hs
+++ b/src-3.0/GF/Data/OrdMap2.hs
diff --git a/src-2.9/GF/Data/OrdSet.hs b/src-3.0/GF/Data/OrdSet.hs
index 34eb0705d..34eb0705d 100644
--- a/src-2.9/GF/Data/OrdSet.hs
+++ b/src-3.0/GF/Data/OrdSet.hs
diff --git a/src-2.9/GF/Data/Parsers.hs b/src-3.0/GF/Data/Parsers.hs
index f9bf02598..f9bf02598 100644
--- a/src-2.9/GF/Data/Parsers.hs
+++ b/src-3.0/GF/Data/Parsers.hs
diff --git a/src-2.9/GF/Data/RedBlack.hs b/src-3.0/GF/Data/RedBlack.hs
index fd70dba63..fd70dba63 100644
--- a/src-2.9/GF/Data/RedBlack.hs
+++ b/src-3.0/GF/Data/RedBlack.hs
diff --git a/src-2.9/GF/Data/RedBlackSet.hs b/src-3.0/GF/Data/RedBlackSet.hs
index 8a1b8a743..8a1b8a743 100644
--- a/src-2.9/GF/Data/RedBlackSet.hs
+++ b/src-3.0/GF/Data/RedBlackSet.hs
diff --git a/src-2.9/GF/Data/SharedString.hs b/src-3.0/GF/Data/SharedString.hs
index 9d037b512..9d037b512 100644
--- a/src-2.9/GF/Data/SharedString.hs
+++ b/src-3.0/GF/Data/SharedString.hs
diff --git a/src-2.9/GF/Data/SortedList.hs b/src-3.0/GF/Data/SortedList.hs
index d77ff68d4..d77ff68d4 100644
--- a/src-2.9/GF/Data/SortedList.hs
+++ b/src-3.0/GF/Data/SortedList.hs
diff --git a/src-2.9/GF/Data/Str.hs b/src-3.0/GF/Data/Str.hs
index 6f65764c7..6f65764c7 100644
--- a/src-2.9/GF/Data/Str.hs
+++ b/src-3.0/GF/Data/Str.hs
diff --git a/src-2.9/GF/Data/Trie.hs b/src-3.0/GF/Data/Trie.hs
index 9fb5daa27..9fb5daa27 100644
--- a/src-2.9/GF/Data/Trie.hs
+++ b/src-3.0/GF/Data/Trie.hs
diff --git a/src-2.9/GF/Data/Trie2.hs b/src-3.0/GF/Data/Trie2.hs
index 36fcc3221..36fcc3221 100644
--- a/src-2.9/GF/Data/Trie2.hs
+++ b/src-3.0/GF/Data/Trie2.hs
diff --git a/src-2.9/GF/Data/Utilities.hs b/src-3.0/GF/Data/Utilities.hs
index 74d3ef81e..74d3ef81e 100644
--- a/src-2.9/GF/Data/Utilities.hs
+++ b/src-3.0/GF/Data/Utilities.hs
diff --git a/src-2.9/GF/Data/XML.hs b/src-3.0/GF/Data/XML.hs
index a1807adcc..a1807adcc 100644
--- a/src-2.9/GF/Data/XML.hs
+++ b/src-3.0/GF/Data/XML.hs
diff --git a/src-2.9/GF/Data/Zipper.hs b/src-3.0/GF/Data/Zipper.hs
index a4491f76e..a4491f76e 100644
--- a/src-2.9/GF/Data/Zipper.hs
+++ b/src-3.0/GF/Data/Zipper.hs
diff --git a/src-2.9/GF/Devel/AbsCompute.hs b/src-3.0/GF/Devel/AbsCompute.hs
index a55fbc83f..a55fbc83f 100644
--- a/src-2.9/GF/Devel/AbsCompute.hs
+++ b/src-3.0/GF/Devel/AbsCompute.hs
diff --git a/src-2.9/GF/Devel/Arch.hs b/src-3.0/GF/Devel/Arch.hs
index dedb1b4f5..dedb1b4f5 100644
--- a/src-2.9/GF/Devel/Arch.hs
+++ b/src-3.0/GF/Devel/Arch.hs
diff --git a/src-2.9/GF/Devel/CheckGrammar.hs b/src-3.0/GF/Devel/CheckGrammar.hs
index 0910802d1..0910802d1 100644
--- a/src-2.9/GF/Devel/CheckGrammar.hs
+++ b/src-3.0/GF/Devel/CheckGrammar.hs
diff --git a/src-2.9/GF/Devel/CheckM.hs b/src-3.0/GF/Devel/CheckM.hs
index d26dbc07c..d26dbc07c 100644
--- a/src-2.9/GF/Devel/CheckM.hs
+++ b/src-3.0/GF/Devel/CheckM.hs
diff --git a/src-2.9/GF/Devel/Compile.hs b/src-3.0/GF/Devel/Compile.hs
index 0655913e1..0655913e1 100644
--- a/src-2.9/GF/Devel/Compile.hs
+++ b/src-3.0/GF/Devel/Compile.hs
diff --git a/src-2.9/GF/Devel/Compile/AbsGF.hs b/src-3.0/GF/Devel/Compile/AbsGF.hs
index d053a3fa1..d053a3fa1 100644
--- a/src-2.9/GF/Devel/Compile/AbsGF.hs
+++ b/src-3.0/GF/Devel/Compile/AbsGF.hs
diff --git a/src-2.9/GF/Devel/Compile/CheckGrammar.hs b/src-3.0/GF/Devel/Compile/CheckGrammar.hs
index 30ea0a70e..30ea0a70e 100644
--- a/src-2.9/GF/Devel/Compile/CheckGrammar.hs
+++ b/src-3.0/GF/Devel/Compile/CheckGrammar.hs
diff --git a/src-2.9/GF/Devel/Compile/Compile.hs b/src-3.0/GF/Devel/Compile/Compile.hs
index 07e059ed4..07e059ed4 100644
--- a/src-2.9/GF/Devel/Compile/Compile.hs
+++ b/src-3.0/GF/Devel/Compile/Compile.hs
diff --git a/src-2.9/GF/Devel/Compile/ErrM.hs b/src-3.0/GF/Devel/Compile/ErrM.hs
index 9cad4e252..9cad4e252 100644
--- a/src-2.9/GF/Devel/Compile/ErrM.hs
+++ b/src-3.0/GF/Devel/Compile/ErrM.hs
diff --git a/src-2.9/GF/Devel/Compile/Extend.hs b/src-3.0/GF/Devel/Compile/Extend.hs
index 2f1aae65b..2f1aae65b 100644
--- a/src-2.9/GF/Devel/Compile/Extend.hs
+++ b/src-3.0/GF/Devel/Compile/Extend.hs
diff --git a/src-2.9/GF/Devel/Compile/Factorize.hs b/src-3.0/GF/Devel/Compile/Factorize.hs
index 7386f3ed5..7386f3ed5 100644
--- a/src-2.9/GF/Devel/Compile/Factorize.hs
+++ b/src-3.0/GF/Devel/Compile/Factorize.hs
diff --git a/src-2.9/GF/Devel/Compile/GF.cf b/src-3.0/GF/Devel/Compile/GF.cf
index 3edbdf347..3edbdf347 100644
--- a/src-2.9/GF/Devel/Compile/GF.cf
+++ b/src-3.0/GF/Devel/Compile/GF.cf
diff --git a/src-2.9/GF/Devel/Compile/GFC.hs b/src-3.0/GF/Devel/Compile/GFC.hs
index f60ec9380..f60ec9380 100644
--- a/src-2.9/GF/Devel/Compile/GFC.hs
+++ b/src-3.0/GF/Devel/Compile/GFC.hs
diff --git a/src-2.9/GF/Devel/Compile/GFtoGFCC.hs b/src-3.0/GF/Devel/Compile/GFtoGFCC.hs
index 81f33e11a..81f33e11a 100644
--- a/src-2.9/GF/Devel/Compile/GFtoGFCC.hs
+++ b/src-3.0/GF/Devel/Compile/GFtoGFCC.hs
diff --git a/src-2.9/GF/Devel/Compile/GetGrammar.hs b/src-3.0/GF/Devel/Compile/GetGrammar.hs
index b90bd912c..b90bd912c 100644
--- a/src-2.9/GF/Devel/Compile/GetGrammar.hs
+++ b/src-3.0/GF/Devel/Compile/GetGrammar.hs
diff --git a/src-2.9/GF/Devel/Compile/LexGF.hs b/src-3.0/GF/Devel/Compile/LexGF.hs
index ff8386f49..ff8386f49 100644
--- a/src-2.9/GF/Devel/Compile/LexGF.hs
+++ b/src-3.0/GF/Devel/Compile/LexGF.hs
diff --git a/src-2.9/GF/Devel/Compile/Optimize.hs b/src-3.0/GF/Devel/Compile/Optimize.hs
index 746b47b90..746b47b90 100644
--- a/src-2.9/GF/Devel/Compile/Optimize.hs
+++ b/src-3.0/GF/Devel/Compile/Optimize.hs
diff --git a/src-2.9/GF/Devel/Compile/ParGF.hs b/src-3.0/GF/Devel/Compile/ParGF.hs
index ce474e418..ce474e418 100644
--- a/src-2.9/GF/Devel/Compile/ParGF.hs
+++ b/src-3.0/GF/Devel/Compile/ParGF.hs
diff --git a/src-2.9/GF/Devel/Compile/PrintGF.hs b/src-3.0/GF/Devel/Compile/PrintGF.hs
index 7eb63612a..7eb63612a 100644
--- a/src-2.9/GF/Devel/Compile/PrintGF.hs
+++ b/src-3.0/GF/Devel/Compile/PrintGF.hs
diff --git a/src-2.9/GF/Devel/Compile/Refresh.hs b/src-3.0/GF/Devel/Compile/Refresh.hs
index 1708761fc..1708761fc 100644
--- a/src-2.9/GF/Devel/Compile/Refresh.hs
+++ b/src-3.0/GF/Devel/Compile/Refresh.hs
diff --git a/src-2.9/GF/Devel/Compile/Rename.hs b/src-3.0/GF/Devel/Compile/Rename.hs
index 9ba704c19..9ba704c19 100644
--- a/src-2.9/GF/Devel/Compile/Rename.hs
+++ b/src-3.0/GF/Devel/Compile/Rename.hs
diff --git a/src-2.9/GF/Devel/Compile/SourceToGF.hs b/src-3.0/GF/Devel/Compile/SourceToGF.hs
index a62179c18..a62179c18 100644
--- a/src-2.9/GF/Devel/Compile/SourceToGF.hs
+++ b/src-3.0/GF/Devel/Compile/SourceToGF.hs
diff --git a/src-2.9/GF/Devel/Compute.hs b/src-3.0/GF/Devel/Compute.hs
index a9081c28a..a9081c28a 100644
--- a/src-2.9/GF/Devel/Compute.hs
+++ b/src-3.0/GF/Devel/Compute.hs
diff --git a/src-2.9/GF/Devel/GF.hs b/src-3.0/GF/Devel/GF.hs
index 70fddcd67..70fddcd67 100644
--- a/src-2.9/GF/Devel/GF.hs
+++ b/src-3.0/GF/Devel/GF.hs
diff --git a/src-2.9/GF/Devel/GFC.hs b/src-3.0/GF/Devel/GFC.hs
index 27e0e3ae2..27e0e3ae2 100644
--- a/src-2.9/GF/Devel/GFC.hs
+++ b/src-3.0/GF/Devel/GFC.hs
diff --git a/src-2.9/GF/Devel/GFC/Main.hs b/src-3.0/GF/Devel/GFC/Main.hs
index d9ceb8e70..d9ceb8e70 100644
--- a/src-2.9/GF/Devel/GFC/Main.hs
+++ b/src-3.0/GF/Devel/GFC/Main.hs
diff --git a/src-2.9/GF/Devel/GFCCInterpreter.hs b/src-3.0/GF/Devel/GFCCInterpreter.hs
index b2b17dba7..b2b17dba7 100644
--- a/src-2.9/GF/Devel/GFCCInterpreter.hs
+++ b/src-3.0/GF/Devel/GFCCInterpreter.hs
diff --git a/src-2.9/GF/Devel/GFCCtoHaskell.hs b/src-3.0/GF/Devel/GFCCtoHaskell.hs
index aa3eebe58..aa3eebe58 100644
--- a/src-2.9/GF/Devel/GFCCtoHaskell.hs
+++ b/src-3.0/GF/Devel/GFCCtoHaskell.hs
diff --git a/src-2.9/GF/Devel/GFCCtoJS.hs b/src-3.0/GF/Devel/GFCCtoJS.hs
index c61ad08d5..c61ad08d5 100644
--- a/src-2.9/GF/Devel/GFCCtoJS.hs
+++ b/src-3.0/GF/Devel/GFCCtoJS.hs
diff --git a/src-2.9/GF/Devel/GFI.hs b/src-3.0/GF/Devel/GFI.hs
index f59bd15e6..f59bd15e6 100644
--- a/src-2.9/GF/Devel/GFI.hs
+++ b/src-3.0/GF/Devel/GFI.hs
diff --git a/src-2.9/GF/Devel/GetGrammar.hs b/src-3.0/GF/Devel/GetGrammar.hs
index cdd275ace..cdd275ace 100644
--- a/src-2.9/GF/Devel/GetGrammar.hs
+++ b/src-3.0/GF/Devel/GetGrammar.hs
diff --git a/src-2.9/GF/Devel/Grammar/AppPredefined.hs b/src-3.0/GF/Devel/Grammar/AppPredefined.hs
index c8d2988fd..c8d2988fd 100644
--- a/src-2.9/GF/Devel/Grammar/AppPredefined.hs
+++ b/src-3.0/GF/Devel/Grammar/AppPredefined.hs
diff --git a/src-2.9/GF/Devel/Grammar/Compute.hs b/src-3.0/GF/Devel/Grammar/Compute.hs
index 5e465c160..5e465c160 100644
--- a/src-2.9/GF/Devel/Grammar/Compute.hs
+++ b/src-3.0/GF/Devel/Grammar/Compute.hs
diff --git a/src-2.9/GF/Devel/Grammar/Construct.hs b/src-3.0/GF/Devel/Grammar/Construct.hs
index 5b4215843..5b4215843 100644
--- a/src-2.9/GF/Devel/Grammar/Construct.hs
+++ b/src-3.0/GF/Devel/Grammar/Construct.hs
diff --git a/src-2.9/GF/Devel/Grammar/GFtoSource.hs b/src-3.0/GF/Devel/Grammar/GFtoSource.hs
index 292f5b826..292f5b826 100644
--- a/src-2.9/GF/Devel/Grammar/GFtoSource.hs
+++ b/src-3.0/GF/Devel/Grammar/GFtoSource.hs
diff --git a/src-2.9/GF/Devel/Grammar/Grammar.hs b/src-3.0/GF/Devel/Grammar/Grammar.hs
index df5a3907e..df5a3907e 100644
--- a/src-2.9/GF/Devel/Grammar/Grammar.hs
+++ b/src-3.0/GF/Devel/Grammar/Grammar.hs
diff --git a/src-2.9/GF/Devel/Grammar/Lookup.hs b/src-3.0/GF/Devel/Grammar/Lookup.hs
index 689996760..689996760 100644
--- a/src-2.9/GF/Devel/Grammar/Lookup.hs
+++ b/src-3.0/GF/Devel/Grammar/Lookup.hs
diff --git a/src-2.9/GF/Devel/Grammar/Macros.hs b/src-3.0/GF/Devel/Grammar/Macros.hs
index 1a7a3582c..1a7a3582c 100644
--- a/src-2.9/GF/Devel/Grammar/Macros.hs
+++ b/src-3.0/GF/Devel/Grammar/Macros.hs
diff --git a/src-2.9/GF/Devel/Grammar/PatternMatch.hs b/src-3.0/GF/Devel/Grammar/PatternMatch.hs
index ec64d7802..ec64d7802 100644
--- a/src-2.9/GF/Devel/Grammar/PatternMatch.hs
+++ b/src-3.0/GF/Devel/Grammar/PatternMatch.hs
diff --git a/src-2.9/GF/Devel/Grammar/PrGF.hs b/src-3.0/GF/Devel/Grammar/PrGF.hs
index 221a0ac61..221a0ac61 100644
--- a/src-2.9/GF/Devel/Grammar/PrGF.hs
+++ b/src-3.0/GF/Devel/Grammar/PrGF.hs
diff --git a/src-2.9/GF/Devel/GrammarToGFCC.hs b/src-3.0/GF/Devel/GrammarToGFCC.hs
index 2c1bbc169..2c1bbc169 100644
--- a/src-2.9/GF/Devel/GrammarToGFCC.hs
+++ b/src-3.0/GF/Devel/GrammarToGFCC.hs
diff --git a/src-2.9/GF/Devel/Infra/ReadFiles.hs b/src-3.0/GF/Devel/Infra/ReadFiles.hs
index dd8cbe5a9..dd8cbe5a9 100644
--- a/src-2.9/GF/Devel/Infra/ReadFiles.hs
+++ b/src-3.0/GF/Devel/Infra/ReadFiles.hs
diff --git a/src-2.9/GF/Devel/ModDeps.hs b/src-3.0/GF/Devel/ModDeps.hs
index ec5702910..ec5702910 100644
--- a/src-2.9/GF/Devel/ModDeps.hs
+++ b/src-3.0/GF/Devel/ModDeps.hs
diff --git a/src-2.9/GF/Devel/Optimize.hs b/src-3.0/GF/Devel/Optimize.hs
index b44f6a53d..b44f6a53d 100644
--- a/src-2.9/GF/Devel/Optimize.hs
+++ b/src-3.0/GF/Devel/Optimize.hs
diff --git a/src-2.9/GF/Devel/OptimizeGF.hs b/src-3.0/GF/Devel/OptimizeGF.hs
index 99e33941f..99e33941f 100644
--- a/src-2.9/GF/Devel/OptimizeGF.hs
+++ b/src-3.0/GF/Devel/OptimizeGF.hs
diff --git a/src-2.9/GF/Devel/Options.hs b/src-3.0/GF/Devel/Options.hs
index 9a4087096..9a4087096 100644
--- a/src-2.9/GF/Devel/Options.hs
+++ b/src-3.0/GF/Devel/Options.hs
diff --git a/src-2.9/GF/Devel/PrGrammar.hs b/src-3.0/GF/Devel/PrGrammar.hs
index 44d1c3200..44d1c3200 100644
--- a/src-2.9/GF/Devel/PrGrammar.hs
+++ b/src-3.0/GF/Devel/PrGrammar.hs
diff --git a/src-2.9/GF/Devel/PrintGFCC.hs b/src-3.0/GF/Devel/PrintGFCC.hs
index c7e668884..c7e668884 100644
--- a/src-2.9/GF/Devel/PrintGFCC.hs
+++ b/src-3.0/GF/Devel/PrintGFCC.hs
diff --git a/src-2.9/GF/Devel/README-testgf3 b/src-3.0/GF/Devel/README-testgf3
index 0d1b6e80a..0d1b6e80a 100644
--- a/src-2.9/GF/Devel/README-testgf3
+++ b/src-3.0/GF/Devel/README-testgf3
diff --git a/src-2.9/GF/Devel/ReadFiles.hs b/src-3.0/GF/Devel/ReadFiles.hs
index a10ee1991..a10ee1991 100644
--- a/src-2.9/GF/Devel/ReadFiles.hs
+++ b/src-3.0/GF/Devel/ReadFiles.hs
diff --git a/src-2.9/GF/Devel/TC.hs b/src-3.0/GF/Devel/TC.hs
index 5c439f671..5c439f671 100644
--- a/src-2.9/GF/Devel/TC.hs
+++ b/src-3.0/GF/Devel/TC.hs
diff --git a/src-2.9/GF/Devel/TestGF3.hs b/src-3.0/GF/Devel/TestGF3.hs
index da4b5c8f6..da4b5c8f6 100644
--- a/src-2.9/GF/Devel/TestGF3.hs
+++ b/src-3.0/GF/Devel/TestGF3.hs
diff --git a/src-2.9/GF/Devel/TypeCheck.hs b/src-3.0/GF/Devel/TypeCheck.hs
index 818b48a10..818b48a10 100644
--- a/src-2.9/GF/Devel/TypeCheck.hs
+++ b/src-3.0/GF/Devel/TypeCheck.hs
diff --git a/src-2.9/GF/Devel/UseIO.hs b/src-3.0/GF/Devel/UseIO.hs
index afbf00efd..afbf00efd 100644
--- a/src-2.9/GF/Devel/UseIO.hs
+++ b/src-3.0/GF/Devel/UseIO.hs
diff --git a/src-2.9/GF/Devel/gf-code.txt b/src-3.0/GF/Devel/gf-code.txt
index e8954bedf..e8954bedf 100644
--- a/src-2.9/GF/Devel/gf-code.txt
+++ b/src-3.0/GF/Devel/gf-code.txt
diff --git a/src-2.9/GF/Devel/gf3.txt b/src-3.0/GF/Devel/gf3.txt
index 56feeba2a..56feeba2a 100644
--- a/src-2.9/GF/Devel/gf3.txt
+++ b/src-3.0/GF/Devel/gf3.txt
diff --git a/src-2.9/GF/Embed/EmbedAPI.hs b/src-3.0/GF/Embed/EmbedAPI.hs
index 43e4f2546..43e4f2546 100644
--- a/src-2.9/GF/Embed/EmbedAPI.hs
+++ b/src-3.0/GF/Embed/EmbedAPI.hs
diff --git a/src-2.9/GF/Embed/EmbedCustom.hs b/src-3.0/GF/Embed/EmbedCustom.hs
index f315441c5..f315441c5 100644
--- a/src-2.9/GF/Embed/EmbedCustom.hs
+++ b/src-3.0/GF/Embed/EmbedCustom.hs
diff --git a/src-2.9/GF/Embed/EmbedParsing.hs b/src-3.0/GF/Embed/EmbedParsing.hs
index 43909f355..43909f355 100644
--- a/src-2.9/GF/Embed/EmbedParsing.hs
+++ b/src-3.0/GF/Embed/EmbedParsing.hs
diff --git a/src-2.9/GF/Embed/TemplateApp.hs b/src-3.0/GF/Embed/TemplateApp.hs
index f8722691f..f8722691f 100644
--- a/src-2.9/GF/Embed/TemplateApp.hs
+++ b/src-3.0/GF/Embed/TemplateApp.hs
diff --git a/src-2.9/GF/Formalism/CFG.hs b/src-3.0/GF/Formalism/CFG.hs
index c38adb4e2..c38adb4e2 100644
--- a/src-2.9/GF/Formalism/CFG.hs
+++ b/src-3.0/GF/Formalism/CFG.hs
diff --git a/src-2.9/GF/Formalism/FCFG.hs b/src-3.0/GF/Formalism/FCFG.hs
index 5f9656658..5f9656658 100644
--- a/src-2.9/GF/Formalism/FCFG.hs
+++ b/src-3.0/GF/Formalism/FCFG.hs
diff --git a/src-2.9/GF/Formalism/GCFG.hs b/src-3.0/GF/Formalism/GCFG.hs
index 5242081c7..5242081c7 100644
--- a/src-2.9/GF/Formalism/GCFG.hs
+++ b/src-3.0/GF/Formalism/GCFG.hs
diff --git a/src-2.9/GF/Formalism/MCFG.hs b/src-3.0/GF/Formalism/MCFG.hs
index e6aa965e7..e6aa965e7 100644
--- a/src-2.9/GF/Formalism/MCFG.hs
+++ b/src-3.0/GF/Formalism/MCFG.hs
diff --git a/src-2.9/GF/Formalism/SimpleGFC.hs b/src-3.0/GF/Formalism/SimpleGFC.hs
index ea1f9dc12..ea1f9dc12 100644
--- a/src-2.9/GF/Formalism/SimpleGFC.hs
+++ b/src-3.0/GF/Formalism/SimpleGFC.hs
diff --git a/src-2.9/GF/Formalism/Utilities.hs b/src-3.0/GF/Formalism/Utilities.hs
index d1826d095..d1826d095 100644
--- a/src-2.9/GF/Formalism/Utilities.hs
+++ b/src-3.0/GF/Formalism/Utilities.hs
diff --git a/src-2.9/GF/Fudgets/ArchEdit.hs b/src-3.0/GF/Fudgets/ArchEdit.hs
index 5bc0dc84b..5bc0dc84b 100644
--- a/src-2.9/GF/Fudgets/ArchEdit.hs
+++ b/src-3.0/GF/Fudgets/ArchEdit.hs
diff --git a/src-2.9/GF/Fudgets/CommandF.hs b/src-3.0/GF/Fudgets/CommandF.hs
index 15af12215..15af12215 100644
--- a/src-2.9/GF/Fudgets/CommandF.hs
+++ b/src-3.0/GF/Fudgets/CommandF.hs
diff --git a/src-2.9/GF/Fudgets/EventF.hs b/src-3.0/GF/Fudgets/EventF.hs
index 7ea058dfa..7ea058dfa 100644
--- a/src-2.9/GF/Fudgets/EventF.hs
+++ b/src-3.0/GF/Fudgets/EventF.hs
diff --git a/src-2.9/GF/Fudgets/FudgetOps.hs b/src-3.0/GF/Fudgets/FudgetOps.hs
index 4aba5eec5..4aba5eec5 100644
--- a/src-2.9/GF/Fudgets/FudgetOps.hs
+++ b/src-3.0/GF/Fudgets/FudgetOps.hs
diff --git a/src-2.9/GF/Fudgets/UnicodeF.hs b/src-3.0/GF/Fudgets/UnicodeF.hs
index 024205698..024205698 100644
--- a/src-2.9/GF/Fudgets/UnicodeF.hs
+++ b/src-3.0/GF/Fudgets/UnicodeF.hs
diff --git a/src-2.9/GF/GFCC/API.hs b/src-3.0/GF/GFCC/API.hs
index c266a5553..c266a5553 100644
--- a/src-2.9/GF/GFCC/API.hs
+++ b/src-3.0/GF/GFCC/API.hs
diff --git a/src-2.9/GF/GFCC/CId.hs b/src-3.0/GF/GFCC/CId.hs
index e4efa98ba..e4efa98ba 100644
--- a/src-2.9/GF/GFCC/CId.hs
+++ b/src-3.0/GF/GFCC/CId.hs
diff --git a/src-2.9/GF/GFCC/CheckGFCC.hs b/src-3.0/GF/GFCC/CheckGFCC.hs
index d59dba1a9..d59dba1a9 100644
--- a/src-2.9/GF/GFCC/CheckGFCC.hs
+++ b/src-3.0/GF/GFCC/CheckGFCC.hs
diff --git a/src-2.9/GF/GFCC/ComposOp.hs b/src-3.0/GF/GFCC/ComposOp.hs
index de2522bc7..de2522bc7 100644
--- a/src-2.9/GF/GFCC/ComposOp.hs
+++ b/src-3.0/GF/GFCC/ComposOp.hs
diff --git a/src-2.9/GF/GFCC/DataGFCC.hs b/src-3.0/GF/GFCC/DataGFCC.hs
index 077d62b19..077d62b19 100644
--- a/src-2.9/GF/GFCC/DataGFCC.hs
+++ b/src-3.0/GF/GFCC/DataGFCC.hs
diff --git a/src-2.9/GF/GFCC/GFCC.cf b/src-3.0/GF/GFCC/GFCC.cf
index 96d68649b..96d68649b 100644
--- a/src-2.9/GF/GFCC/GFCC.cf
+++ b/src-3.0/GF/GFCC/GFCC.cf
diff --git a/src-2.9/GF/GFCC/Generate.hs b/src-3.0/GF/GFCC/Generate.hs
index 63bdb3b9a..63bdb3b9a 100644
--- a/src-2.9/GF/GFCC/Generate.hs
+++ b/src-3.0/GF/GFCC/Generate.hs
diff --git a/src-2.9/GF/GFCC/LexGFCC.hs b/src-3.0/GF/GFCC/LexGFCC.hs
index c86195e3d..c86195e3d 100644
--- a/src-2.9/GF/GFCC/LexGFCC.hs
+++ b/src-3.0/GF/GFCC/LexGFCC.hs
diff --git a/src-2.9/GF/GFCC/Linearize.hs b/src-3.0/GF/GFCC/Linearize.hs
index c66ff93c1..c66ff93c1 100644
--- a/src-2.9/GF/GFCC/Linearize.hs
+++ b/src-3.0/GF/GFCC/Linearize.hs
diff --git a/src-2.9/GF/GFCC/Macros.hs b/src-3.0/GF/GFCC/Macros.hs
index 4897aa667..4897aa667 100644
--- a/src-2.9/GF/GFCC/Macros.hs
+++ b/src-3.0/GF/GFCC/Macros.hs
diff --git a/src-2.9/GF/GFCC/OptimizeGFCC.hs b/src-3.0/GF/GFCC/OptimizeGFCC.hs
index 394458041..394458041 100644
--- a/src-2.9/GF/GFCC/OptimizeGFCC.hs
+++ b/src-3.0/GF/GFCC/OptimizeGFCC.hs
diff --git a/src-2.9/GF/GFCC/Raw/AbsGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
index ab5f184a8..ab5f184a8 100644
--- a/src-2.9/GF/GFCC/Raw/AbsGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/AbsGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/Raw/ConvertGFCC.hs b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
index 0b010d604..0b010d604 100644
--- a/src-2.9/GF/GFCC/Raw/ConvertGFCC.hs
+++ b/src-3.0/GF/GFCC/Raw/ConvertGFCC.hs
diff --git a/src-2.9/GF/GFCC/Raw/GFCCRaw.cf b/src-3.0/GF/GFCC/Raw/GFCCRaw.cf
index bedaef685..bedaef685 100644
--- a/src-2.9/GF/GFCC/Raw/GFCCRaw.cf
+++ b/src-3.0/GF/GFCC/Raw/GFCCRaw.cf
diff --git a/src-2.9/GF/GFCC/Raw/ParGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
index b71904948..b71904948 100644
--- a/src-2.9/GF/GFCC/Raw/ParGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/ParGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/Raw/PrintGFCCRaw.hs b/src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
index d46d8096f..d46d8096f 100644
--- a/src-2.9/GF/GFCC/Raw/PrintGFCCRaw.hs
+++ b/src-3.0/GF/GFCC/Raw/PrintGFCCRaw.hs
diff --git a/src-2.9/GF/GFCC/ShowLinearize.hs b/src-3.0/GF/GFCC/ShowLinearize.hs
index f627dfd28..f627dfd28 100644
--- a/src-2.9/GF/GFCC/ShowLinearize.hs
+++ b/src-3.0/GF/GFCC/ShowLinearize.hs
diff --git a/src-2.9/GF/GFCC/SkelGFCC.hs b/src-3.0/GF/GFCC/SkelGFCC.hs
index 6972fd3c3..6972fd3c3 100644
--- a/src-2.9/GF/GFCC/SkelGFCC.hs
+++ b/src-3.0/GF/GFCC/SkelGFCC.hs
diff --git a/src-2.9/GF/GFCC/TestGFCC.hs b/src-3.0/GF/GFCC/TestGFCC.hs
index c379a687a..c379a687a 100644
--- a/src-2.9/GF/GFCC/TestGFCC.hs
+++ b/src-3.0/GF/GFCC/TestGFCC.hs
diff --git a/src-2.9/GF/GFCC/doc/Eng.gf b/src-3.0/GF/GFCC/doc/Eng.gf
index c64f46313..c64f46313 100644
--- a/src-2.9/GF/GFCC/doc/Eng.gf
+++ b/src-3.0/GF/GFCC/doc/Eng.gf
diff --git a/src-2.9/GF/GFCC/doc/Ex.gf b/src-3.0/GF/GFCC/doc/Ex.gf
index bd0b03483..bd0b03483 100644
--- a/src-2.9/GF/GFCC/doc/Ex.gf
+++ b/src-3.0/GF/GFCC/doc/Ex.gf
diff --git a/src-2.9/GF/GFCC/doc/Swe.gf b/src-3.0/GF/GFCC/doc/Swe.gf
index 1d6672371..1d6672371 100644
--- a/src-2.9/GF/GFCC/doc/Swe.gf
+++ b/src-3.0/GF/GFCC/doc/Swe.gf
diff --git a/src-2.9/GF/GFCC/doc/Test.gf b/src-3.0/GF/GFCC/doc/Test.gf
index 5cd4c5474..5cd4c5474 100644
--- a/src-2.9/GF/GFCC/doc/Test.gf
+++ b/src-3.0/GF/GFCC/doc/Test.gf
diff --git a/src-2.9/GF/GFCC/doc/gfcc.html b/src-3.0/GF/GFCC/doc/gfcc.html
index 8f8c478c0..8f8c478c0 100644
--- a/src-2.9/GF/GFCC/doc/gfcc.html
+++ b/src-3.0/GF/GFCC/doc/gfcc.html
diff --git a/src-2.9/GF/GFCC/doc/gfcc.txt b/src-3.0/GF/GFCC/doc/gfcc.txt
index 5dcf2fbdc..5dcf2fbdc 100644
--- a/src-2.9/GF/GFCC/doc/gfcc.txt
+++ b/src-3.0/GF/GFCC/doc/gfcc.txt
diff --git a/src-2.9/GF/GFCC/doc/old-GFCC.cf b/src-3.0/GF/GFCC/doc/old-GFCC.cf
index 65657a259..65657a259 100644
--- a/src-2.9/GF/GFCC/doc/old-GFCC.cf
+++ b/src-3.0/GF/GFCC/doc/old-GFCC.cf
diff --git a/src-2.9/GF/GFCC/doc/old-gfcc.txt b/src-3.0/GF/GFCC/doc/old-gfcc.txt
index 6ffd9bd64..6ffd9bd64 100644
--- a/src-2.9/GF/GFCC/doc/old-gfcc.txt
+++ b/src-3.0/GF/GFCC/doc/old-gfcc.txt
diff --git a/src-2.9/GF/GFCC/doc/syntax.txt b/src-3.0/GF/GFCC/doc/syntax.txt
index db8f7c149..db8f7c149 100644
--- a/src-2.9/GF/GFCC/doc/syntax.txt
+++ b/src-3.0/GF/GFCC/doc/syntax.txt
diff --git a/src-2.9/GF/GFModes.hs b/src-3.0/GF/GFModes.hs
index faab3cede..faab3cede 100644
--- a/src-2.9/GF/GFModes.hs
+++ b/src-3.0/GF/GFModes.hs
diff --git a/src-2.9/GF/Grammar/AbsCompute.hs b/src-3.0/GF/Grammar/AbsCompute.hs
index 57e21f1dd..57e21f1dd 100644
--- a/src-2.9/GF/Grammar/AbsCompute.hs
+++ b/src-3.0/GF/Grammar/AbsCompute.hs
diff --git a/src-2.9/GF/Grammar/Abstract.hs b/src-3.0/GF/Grammar/Abstract.hs
index c03783a52..c03783a52 100644
--- a/src-2.9/GF/Grammar/Abstract.hs
+++ b/src-3.0/GF/Grammar/Abstract.hs
diff --git a/src-2.9/GF/Grammar/AppPredefined.hs b/src-3.0/GF/Grammar/AppPredefined.hs
index fa0048c80..fa0048c80 100644
--- a/src-2.9/GF/Grammar/AppPredefined.hs
+++ b/src-3.0/GF/Grammar/AppPredefined.hs
diff --git a/src-2.9/GF/Grammar/Compute.hs b/src-3.0/GF/Grammar/Compute.hs
index c76058cc2..c76058cc2 100644
--- a/src-2.9/GF/Grammar/Compute.hs
+++ b/src-3.0/GF/Grammar/Compute.hs
diff --git a/src-2.9/GF/Grammar/Grammar.hs b/src-3.0/GF/Grammar/Grammar.hs
index 95fdce611..95fdce611 100644
--- a/src-2.9/GF/Grammar/Grammar.hs
+++ b/src-3.0/GF/Grammar/Grammar.hs
diff --git a/src-2.9/GF/Grammar/Lockfield.hs b/src-3.0/GF/Grammar/Lockfield.hs
index 960b12983..960b12983 100644
--- a/src-2.9/GF/Grammar/Lockfield.hs
+++ b/src-3.0/GF/Grammar/Lockfield.hs
diff --git a/src-2.9/GF/Grammar/LookAbs.hs b/src-3.0/GF/Grammar/LookAbs.hs
index 5bd4c1e41..5bd4c1e41 100644
--- a/src-2.9/GF/Grammar/LookAbs.hs
+++ b/src-3.0/GF/Grammar/LookAbs.hs
diff --git a/src-2.9/GF/Grammar/Lookup.hs b/src-3.0/GF/Grammar/Lookup.hs
index 81a62decf..81a62decf 100644
--- a/src-2.9/GF/Grammar/Lookup.hs
+++ b/src-3.0/GF/Grammar/Lookup.hs
diff --git a/src-2.9/GF/Grammar/MMacros.hs b/src-3.0/GF/Grammar/MMacros.hs
index dd7331685..dd7331685 100644
--- a/src-2.9/GF/Grammar/MMacros.hs
+++ b/src-3.0/GF/Grammar/MMacros.hs
diff --git a/src-2.9/GF/Grammar/Macros.hs b/src-3.0/GF/Grammar/Macros.hs
index 7a48e7c3a..7a48e7c3a 100644
--- a/src-2.9/GF/Grammar/Macros.hs
+++ b/src-3.0/GF/Grammar/Macros.hs
diff --git a/src-2.9/GF/Grammar/PatternMatch.hs b/src-3.0/GF/Grammar/PatternMatch.hs
index b96d35b93..b96d35b93 100644
--- a/src-2.9/GF/Grammar/PatternMatch.hs
+++ b/src-3.0/GF/Grammar/PatternMatch.hs
diff --git a/src-2.9/GF/Grammar/PrGrammar.hs b/src-3.0/GF/Grammar/PrGrammar.hs
index c3a21d1d6..c3a21d1d6 100644
--- a/src-2.9/GF/Grammar/PrGrammar.hs
+++ b/src-3.0/GF/Grammar/PrGrammar.hs
diff --git a/src-2.9/GF/Grammar/Refresh.hs b/src-3.0/GF/Grammar/Refresh.hs
index bc77c1837..bc77c1837 100644
--- a/src-2.9/GF/Grammar/Refresh.hs
+++ b/src-3.0/GF/Grammar/Refresh.hs
diff --git a/src-2.9/GF/Grammar/ReservedWords.hs b/src-3.0/GF/Grammar/ReservedWords.hs
index b440141d6..b440141d6 100644
--- a/src-2.9/GF/Grammar/ReservedWords.hs
+++ b/src-3.0/GF/Grammar/ReservedWords.hs
diff --git a/src-2.9/GF/Grammar/SGrammar.hs b/src-3.0/GF/Grammar/SGrammar.hs
index e0c001b6b..e0c001b6b 100644
--- a/src-2.9/GF/Grammar/SGrammar.hs
+++ b/src-3.0/GF/Grammar/SGrammar.hs
diff --git a/src-2.9/GF/Grammar/TC.hs b/src-3.0/GF/Grammar/TC.hs
index be52d1889..be52d1889 100644
--- a/src-2.9/GF/Grammar/TC.hs
+++ b/src-3.0/GF/Grammar/TC.hs
diff --git a/src-2.9/GF/Grammar/TypeCheck.hs b/src-3.0/GF/Grammar/TypeCheck.hs
index 97b7ff243..97b7ff243 100644
--- a/src-2.9/GF/Grammar/TypeCheck.hs
+++ b/src-3.0/GF/Grammar/TypeCheck.hs
diff --git a/src-2.9/GF/Grammar/Unify.hs b/src-3.0/GF/Grammar/Unify.hs
index 588c1b306..588c1b306 100644
--- a/src-2.9/GF/Grammar/Unify.hs
+++ b/src-3.0/GF/Grammar/Unify.hs
diff --git a/src-2.9/GF/Grammar/Values.hs b/src-3.0/GF/Grammar/Values.hs
index 6e029d98b..6e029d98b 100644
--- a/src-2.9/GF/Grammar/Values.hs
+++ b/src-3.0/GF/Grammar/Values.hs
diff --git a/src-2.9/GF/IDE/IDECommands.hs b/src-3.0/GF/IDE/IDECommands.hs
index 56d392a71..56d392a71 100644
--- a/src-2.9/GF/IDE/IDECommands.hs
+++ b/src-3.0/GF/IDE/IDECommands.hs
diff --git a/src-2.9/GF/Infra/CheckM.hs b/src-3.0/GF/Infra/CheckM.hs
index 251ed2b8b..251ed2b8b 100644
--- a/src-2.9/GF/Infra/CheckM.hs
+++ b/src-3.0/GF/Infra/CheckM.hs
diff --git a/src-2.9/GF/Infra/Comments.hs b/src-3.0/GF/Infra/Comments.hs
index 0126db468..0126db468 100644
--- a/src-2.9/GF/Infra/Comments.hs
+++ b/src-3.0/GF/Infra/Comments.hs
diff --git a/src-2.9/GF/Infra/CompactPrint.hs b/src-3.0/GF/Infra/CompactPrint.hs
index 486c9e183..486c9e183 100644
--- a/src-2.9/GF/Infra/CompactPrint.hs
+++ b/src-3.0/GF/Infra/CompactPrint.hs
diff --git a/src-2.9/GF/Infra/Ident.hs b/src-3.0/GF/Infra/Ident.hs
index 5ed860990..5ed860990 100644
--- a/src-2.9/GF/Infra/Ident.hs
+++ b/src-3.0/GF/Infra/Ident.hs
diff --git a/src-2.9/GF/Infra/Modules.hs b/src-3.0/GF/Infra/Modules.hs
index 4d50608c6..4d50608c6 100644
--- a/src-2.9/GF/Infra/Modules.hs
+++ b/src-3.0/GF/Infra/Modules.hs
diff --git a/src-2.9/GF/Infra/Option.hs b/src-3.0/GF/Infra/Option.hs
index a44cd9db8..a44cd9db8 100644
--- a/src-2.9/GF/Infra/Option.hs
+++ b/src-3.0/GF/Infra/Option.hs
diff --git a/src-2.9/GF/Infra/Print.hs b/src-3.0/GF/Infra/Print.hs
index 17f2c2188..17f2c2188 100644
--- a/src-2.9/GF/Infra/Print.hs
+++ b/src-3.0/GF/Infra/Print.hs
diff --git a/src-2.9/GF/Infra/PrintClass.hs b/src-3.0/GF/Infra/PrintClass.hs
index 5e94984a6..5e94984a6 100644
--- a/src-2.9/GF/Infra/PrintClass.hs
+++ b/src-3.0/GF/Infra/PrintClass.hs
diff --git a/src-2.9/GF/Infra/ReadFiles.hs b/src-3.0/GF/Infra/ReadFiles.hs
index ce33ec23f..ce33ec23f 100644
--- a/src-2.9/GF/Infra/ReadFiles.hs
+++ b/src-3.0/GF/Infra/ReadFiles.hs
diff --git a/src-2.9/GF/Infra/UseIO.hs b/src-3.0/GF/Infra/UseIO.hs
index 4125a0417..4125a0417 100644
--- a/src-2.9/GF/Infra/UseIO.hs
+++ b/src-3.0/GF/Infra/UseIO.hs
diff --git a/src-2.9/GF/JavaScript/AbsJS.hs b/src-3.0/GF/JavaScript/AbsJS.hs
index 2632ade48..2632ade48 100644
--- a/src-2.9/GF/JavaScript/AbsJS.hs
+++ b/src-3.0/GF/JavaScript/AbsJS.hs
diff --git a/src-2.9/GF/JavaScript/JS.cf b/src-3.0/GF/JavaScript/JS.cf
index fe31a2074..fe31a2074 100644
--- a/src-2.9/GF/JavaScript/JS.cf
+++ b/src-3.0/GF/JavaScript/JS.cf
diff --git a/src-2.9/GF/JavaScript/LexJS.hs b/src-3.0/GF/JavaScript/LexJS.hs
index 242831195..242831195 100644
--- a/src-2.9/GF/JavaScript/LexJS.hs
+++ b/src-3.0/GF/JavaScript/LexJS.hs
diff --git a/src-2.9/GF/JavaScript/LexJS.x b/src-3.0/GF/JavaScript/LexJS.x
index 10ba66d69..10ba66d69 100644
--- a/src-2.9/GF/JavaScript/LexJS.x
+++ b/src-3.0/GF/JavaScript/LexJS.x
diff --git a/src-2.9/GF/JavaScript/Makefile b/src-3.0/GF/JavaScript/Makefile
index 10f867b06..10f867b06 100644
--- a/src-2.9/GF/JavaScript/Makefile
+++ b/src-3.0/GF/JavaScript/Makefile
diff --git a/src-2.9/GF/JavaScript/ParJS.hs b/src-3.0/GF/JavaScript/ParJS.hs
index f57c44a22..f57c44a22 100644
--- a/src-2.9/GF/JavaScript/ParJS.hs
+++ b/src-3.0/GF/JavaScript/ParJS.hs
diff --git a/src-2.9/GF/JavaScript/ParJS.y b/src-3.0/GF/JavaScript/ParJS.y
index bf0614757..bf0614757 100644
--- a/src-2.9/GF/JavaScript/ParJS.y
+++ b/src-3.0/GF/JavaScript/ParJS.y
diff --git a/src-2.9/GF/JavaScript/PrintJS.hs b/src-3.0/GF/JavaScript/PrintJS.hs
index 66e78346e..66e78346e 100644
--- a/src-2.9/GF/JavaScript/PrintJS.hs
+++ b/src-3.0/GF/JavaScript/PrintJS.hs
diff --git a/src-2.9/GF/JavaScript/SkelJS.hs b/src-3.0/GF/JavaScript/SkelJS.hs
index f8cd588a7..f8cd588a7 100644
--- a/src-2.9/GF/JavaScript/SkelJS.hs
+++ b/src-3.0/GF/JavaScript/SkelJS.hs
diff --git a/src-2.9/GF/JavaScript/TestJS.hs b/src-3.0/GF/JavaScript/TestJS.hs
index 3ddb52074..3ddb52074 100644
--- a/src-2.9/GF/JavaScript/TestJS.hs
+++ b/src-3.0/GF/JavaScript/TestJS.hs
diff --git a/src-2.9/GF/OldParsing/CFGrammar.hs b/src-3.0/GF/OldParsing/CFGrammar.hs
index 5a71fe0ab..5a71fe0ab 100644
--- a/src-2.9/GF/OldParsing/CFGrammar.hs
+++ b/src-3.0/GF/OldParsing/CFGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ConvertFiniteGFC.hs b/src-3.0/GF/OldParsing/ConvertFiniteGFC.hs
index 25ed3fdb3..25ed3fdb3 100644
--- a/src-2.9/GF/OldParsing/ConvertFiniteGFC.hs
+++ b/src-3.0/GF/OldParsing/ConvertFiniteGFC.hs
diff --git a/src-2.9/GF/OldParsing/ConvertFiniteSimple.hs b/src-3.0/GF/OldParsing/ConvertFiniteSimple.hs
index a05092550..a05092550 100644
--- a/src-2.9/GF/OldParsing/ConvertFiniteSimple.hs
+++ b/src-3.0/GF/OldParsing/ConvertFiniteSimple.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG.hs
index c32812eb2..c32812eb2 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
index 3ed6a3f48..3ed6a3f48 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Coercions.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
index 7727aa15f..7727aa15f 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Nondet.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Old.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
index 8b9b4a9ec..8b9b4a9ec 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Old.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
index d088bdebc..d088bdebc 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoMCFG/Strict.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGFCtoSimple.hs b/src-3.0/GF/OldParsing/ConvertGFCtoSimple.hs
index 69a8b13c3..69a8b13c3 100644
--- a/src-2.9/GF/OldParsing/ConvertGFCtoSimple.hs
+++ b/src-3.0/GF/OldParsing/ConvertGFCtoSimple.hs
diff --git a/src-2.9/GF/OldParsing/ConvertGrammar.hs b/src-3.0/GF/OldParsing/ConvertGrammar.hs
index 0dcd90770..0dcd90770 100644
--- a/src-2.9/GF/OldParsing/ConvertGrammar.hs
+++ b/src-3.0/GF/OldParsing/ConvertGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ConvertMCFGtoCFG.hs b/src-3.0/GF/OldParsing/ConvertMCFGtoCFG.hs
index 58d141166..58d141166 100644
--- a/src-2.9/GF/OldParsing/ConvertMCFGtoCFG.hs
+++ b/src-3.0/GF/OldParsing/ConvertMCFGtoCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG.hs
index e111444f9..e111444f9 100644
--- a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG.hs
+++ b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
index adc42115a..adc42115a 100644
--- a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
+++ b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Coercions.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
index 6627c5f2e..6627c5f2e 100644
--- a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
+++ b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Nondet.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Old.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
index dd2ff0713..dd2ff0713 100644
--- a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
+++ b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Old.hs
diff --git a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
index aa741518a..aa741518a 100644
--- a/src-2.9/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
+++ b/src-3.0/GF/OldParsing/ConvertSimpleToMCFG/Strict.hs
diff --git a/src-2.9/GF/OldParsing/GCFG.hs b/src-3.0/GF/OldParsing/GCFG.hs
index 33a710e5d..33a710e5d 100644
--- a/src-2.9/GF/OldParsing/GCFG.hs
+++ b/src-3.0/GF/OldParsing/GCFG.hs
diff --git a/src-2.9/GF/OldParsing/GeneralChart.hs b/src-3.0/GF/OldParsing/GeneralChart.hs
index 1d51da025..1d51da025 100644
--- a/src-2.9/GF/OldParsing/GeneralChart.hs
+++ b/src-3.0/GF/OldParsing/GeneralChart.hs
diff --git a/src-2.9/GF/OldParsing/GrammarTypes.hs b/src-3.0/GF/OldParsing/GrammarTypes.hs
index fc514fc75..fc514fc75 100644
--- a/src-2.9/GF/OldParsing/GrammarTypes.hs
+++ b/src-3.0/GF/OldParsing/GrammarTypes.hs
diff --git a/src-2.9/GF/OldParsing/IncrementalChart.hs b/src-3.0/GF/OldParsing/IncrementalChart.hs
index 132ed4dc4..132ed4dc4 100644
--- a/src-2.9/GF/OldParsing/IncrementalChart.hs
+++ b/src-3.0/GF/OldParsing/IncrementalChart.hs
diff --git a/src-2.9/GF/OldParsing/MCFGrammar.hs b/src-3.0/GF/OldParsing/MCFGrammar.hs
index ff9d7de1b..ff9d7de1b 100644
--- a/src-2.9/GF/OldParsing/MCFGrammar.hs
+++ b/src-3.0/GF/OldParsing/MCFGrammar.hs
diff --git a/src-2.9/GF/OldParsing/ParseCF.hs b/src-3.0/GF/OldParsing/ParseCF.hs
index e1ef32aee..e1ef32aee 100644
--- a/src-2.9/GF/OldParsing/ParseCF.hs
+++ b/src-3.0/GF/OldParsing/ParseCF.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG.hs b/src-3.0/GF/OldParsing/ParseCFG.hs
index 03c1d7dcc..03c1d7dcc 100644
--- a/src-2.9/GF/OldParsing/ParseCFG.hs
+++ b/src-3.0/GF/OldParsing/ParseCFG.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG/General.hs b/src-3.0/GF/OldParsing/ParseCFG/General.hs
index 438c89f1a..438c89f1a 100644
--- a/src-2.9/GF/OldParsing/ParseCFG/General.hs
+++ b/src-3.0/GF/OldParsing/ParseCFG/General.hs
diff --git a/src-2.9/GF/OldParsing/ParseCFG/Incremental.hs b/src-3.0/GF/OldParsing/ParseCFG/Incremental.hs
index f1bcde404..f1bcde404 100644
--- a/src-2.9/GF/OldParsing/ParseCFG/Incremental.hs
+++ b/src-3.0/GF/OldParsing/ParseCFG/Incremental.hs
diff --git a/src-2.9/GF/OldParsing/ParseGFC.hs b/src-3.0/GF/OldParsing/ParseGFC.hs
index fbc6cff5a..fbc6cff5a 100644
--- a/src-2.9/GF/OldParsing/ParseGFC.hs
+++ b/src-3.0/GF/OldParsing/ParseGFC.hs
diff --git a/src-2.9/GF/OldParsing/ParseMCFG.hs b/src-3.0/GF/OldParsing/ParseMCFG.hs
index c845a76b3..c845a76b3 100644
--- a/src-2.9/GF/OldParsing/ParseMCFG.hs
+++ b/src-3.0/GF/OldParsing/ParseMCFG.hs
diff --git a/src-2.9/GF/OldParsing/ParseMCFG/Basic.hs b/src-3.0/GF/OldParsing/ParseMCFG/Basic.hs
index baf7e4b2a..baf7e4b2a 100644
--- a/src-2.9/GF/OldParsing/ParseMCFG/Basic.hs
+++ b/src-3.0/GF/OldParsing/ParseMCFG/Basic.hs
diff --git a/src-2.9/GF/OldParsing/SimpleGFC.hs b/src-3.0/GF/OldParsing/SimpleGFC.hs
index 59f379bb4..59f379bb4 100644
--- a/src-2.9/GF/OldParsing/SimpleGFC.hs
+++ b/src-3.0/GF/OldParsing/SimpleGFC.hs
diff --git a/src-2.9/GF/OldParsing/Utilities.hs b/src-3.0/GF/OldParsing/Utilities.hs
index 6bacfe1fe..6bacfe1fe 100644
--- a/src-2.9/GF/OldParsing/Utilities.hs
+++ b/src-3.0/GF/OldParsing/Utilities.hs
diff --git a/src-2.9/GF/Parsing/CF.hs b/src-3.0/GF/Parsing/CF.hs
index 1a65f6caf..1a65f6caf 100644
--- a/src-2.9/GF/Parsing/CF.hs
+++ b/src-3.0/GF/Parsing/CF.hs
diff --git a/src-2.9/GF/Parsing/CFG.hs b/src-3.0/GF/Parsing/CFG.hs
index f64ce55f1..f64ce55f1 100644
--- a/src-2.9/GF/Parsing/CFG.hs
+++ b/src-3.0/GF/Parsing/CFG.hs
diff --git a/src-2.9/GF/Parsing/CFG/General.hs b/src-3.0/GF/Parsing/CFG/General.hs
index 4f5959a85..4f5959a85 100644
--- a/src-2.9/GF/Parsing/CFG/General.hs
+++ b/src-3.0/GF/Parsing/CFG/General.hs
diff --git a/src-2.9/GF/Parsing/CFG/Incremental.hs b/src-3.0/GF/Parsing/CFG/Incremental.hs
index adab2b73c..adab2b73c 100644
--- a/src-2.9/GF/Parsing/CFG/Incremental.hs
+++ b/src-3.0/GF/Parsing/CFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/CFG/PInfo.hs b/src-3.0/GF/Parsing/CFG/PInfo.hs
index f877b225e..f877b225e 100644
--- a/src-2.9/GF/Parsing/CFG/PInfo.hs
+++ b/src-3.0/GF/Parsing/CFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/FCFG.hs b/src-3.0/GF/Parsing/FCFG.hs
index 30a7801c8..30a7801c8 100644
--- a/src-2.9/GF/Parsing/FCFG.hs
+++ b/src-3.0/GF/Parsing/FCFG.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Active.hs b/src-3.0/GF/Parsing/FCFG/Active.hs
index df55793f8..df55793f8 100644
--- a/src-2.9/GF/Parsing/FCFG/Active.hs
+++ b/src-3.0/GF/Parsing/FCFG/Active.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Incremental.hs b/src-3.0/GF/Parsing/FCFG/Incremental.hs
index 5ee77a061..5ee77a061 100644
--- a/src-2.9/GF/Parsing/FCFG/Incremental.hs
+++ b/src-3.0/GF/Parsing/FCFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/FCFG/PInfo.hs b/src-3.0/GF/Parsing/FCFG/PInfo.hs
index 8b288f2f1..8b288f2f1 100644
--- a/src-2.9/GF/Parsing/FCFG/PInfo.hs
+++ b/src-3.0/GF/Parsing/FCFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/FCFG/Range.hs b/src-3.0/GF/Parsing/FCFG/Range.hs
index 24674f58b..24674f58b 100644
--- a/src-2.9/GF/Parsing/FCFG/Range.hs
+++ b/src-3.0/GF/Parsing/FCFG/Range.hs
diff --git a/src-2.9/GF/Parsing/GFC.hs b/src-3.0/GF/Parsing/GFC.hs
index 9f1328a50..9f1328a50 100644
--- a/src-2.9/GF/Parsing/GFC.hs
+++ b/src-3.0/GF/Parsing/GFC.hs
diff --git a/src-2.9/GF/Parsing/MCFG.hs b/src-3.0/GF/Parsing/MCFG.hs
index bda3af675..bda3af675 100644
--- a/src-2.9/GF/Parsing/MCFG.hs
+++ b/src-3.0/GF/Parsing/MCFG.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Active.hs b/src-3.0/GF/Parsing/MCFG/Active.hs
index c6e9c6b06..c6e9c6b06 100644
--- a/src-2.9/GF/Parsing/MCFG/Active.hs
+++ b/src-3.0/GF/Parsing/MCFG/Active.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Active2.hs b/src-3.0/GF/Parsing/MCFG/Active2.hs
index 7ad8627bc..7ad8627bc 100644
--- a/src-2.9/GF/Parsing/MCFG/Active2.hs
+++ b/src-3.0/GF/Parsing/MCFG/Active2.hs
diff --git a/src-2.9/GF/Parsing/MCFG/FastActive.hs b/src-3.0/GF/Parsing/MCFG/FastActive.hs
index 0a8e24b55..0a8e24b55 100644
--- a/src-2.9/GF/Parsing/MCFG/FastActive.hs
+++ b/src-3.0/GF/Parsing/MCFG/FastActive.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Incremental.hs b/src-3.0/GF/Parsing/MCFG/Incremental.hs
index bd5b4114d..bd5b4114d 100644
--- a/src-2.9/GF/Parsing/MCFG/Incremental.hs
+++ b/src-3.0/GF/Parsing/MCFG/Incremental.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Incremental2.hs b/src-3.0/GF/Parsing/MCFG/Incremental2.hs
index db6c3084e..db6c3084e 100644
--- a/src-2.9/GF/Parsing/MCFG/Incremental2.hs
+++ b/src-3.0/GF/Parsing/MCFG/Incremental2.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Naive.hs b/src-3.0/GF/Parsing/MCFG/Naive.hs
index 7d1fa0a8a..7d1fa0a8a 100644
--- a/src-2.9/GF/Parsing/MCFG/Naive.hs
+++ b/src-3.0/GF/Parsing/MCFG/Naive.hs
diff --git a/src-2.9/GF/Parsing/MCFG/PInfo.hs b/src-3.0/GF/Parsing/MCFG/PInfo.hs
index 56119dcec..56119dcec 100644
--- a/src-2.9/GF/Parsing/MCFG/PInfo.hs
+++ b/src-3.0/GF/Parsing/MCFG/PInfo.hs
diff --git a/src-2.9/GF/Parsing/MCFG/Range.hs b/src-3.0/GF/Parsing/MCFG/Range.hs
index 91671fa00..91671fa00 100644
--- a/src-2.9/GF/Parsing/MCFG/Range.hs
+++ b/src-3.0/GF/Parsing/MCFG/Range.hs
diff --git a/src-2.9/GF/Parsing/MCFG/ViaCFG.hs b/src-3.0/GF/Parsing/MCFG/ViaCFG.hs
index 9204ea9f1..9204ea9f1 100644
--- a/src-2.9/GF/Parsing/MCFG/ViaCFG.hs
+++ b/src-3.0/GF/Parsing/MCFG/ViaCFG.hs
diff --git a/src-2.9/GF/Printing/PrintParser.hs b/src-3.0/GF/Printing/PrintParser.hs
index d9041ecaa..d9041ecaa 100644
--- a/src-2.9/GF/Printing/PrintParser.hs
+++ b/src-3.0/GF/Printing/PrintParser.hs
diff --git a/src-2.9/GF/Printing/PrintSimplifiedTerm.hs b/src-3.0/GF/Printing/PrintSimplifiedTerm.hs
index ccd107558..ccd107558 100644
--- a/src-2.9/GF/Printing/PrintSimplifiedTerm.hs
+++ b/src-3.0/GF/Printing/PrintSimplifiedTerm.hs
diff --git a/src-2.9/GF/Probabilistic/Probabilistic.hs b/src-3.0/GF/Probabilistic/Probabilistic.hs
index 25258db52..25258db52 100644
--- a/src-2.9/GF/Probabilistic/Probabilistic.hs
+++ b/src-3.0/GF/Probabilistic/Probabilistic.hs
diff --git a/src-2.9/GF/Shell.hs b/src-3.0/GF/Shell.hs
index 1d723bc62..1d723bc62 100644
--- a/src-2.9/GF/Shell.hs
+++ b/src-3.0/GF/Shell.hs
diff --git a/src-2.9/GF/Shell/CommandL.hs b/src-3.0/GF/Shell/CommandL.hs
index efb6460b4..efb6460b4 100644
--- a/src-2.9/GF/Shell/CommandL.hs
+++ b/src-3.0/GF/Shell/CommandL.hs
diff --git a/src-2.9/GF/Shell/Commands.hs b/src-3.0/GF/Shell/Commands.hs
index 8699c2fe7..8699c2fe7 100644
--- a/src-2.9/GF/Shell/Commands.hs
+++ b/src-3.0/GF/Shell/Commands.hs
diff --git a/src-2.9/GF/Shell/HelpFile.hs b/src-3.0/GF/Shell/HelpFile.hs
index 43fae7c42..43fae7c42 100644
--- a/src-2.9/GF/Shell/HelpFile.hs
+++ b/src-3.0/GF/Shell/HelpFile.hs
diff --git a/src-2.9/GF/Shell/JGF.hs b/src-3.0/GF/Shell/JGF.hs
index 0ff678809..0ff678809 100644
--- a/src-2.9/GF/Shell/JGF.hs
+++ b/src-3.0/GF/Shell/JGF.hs
diff --git a/src-2.9/GF/Shell/PShell.hs b/src-3.0/GF/Shell/PShell.hs
index 68cb4d629..68cb4d629 100644
--- a/src-2.9/GF/Shell/PShell.hs
+++ b/src-3.0/GF/Shell/PShell.hs
diff --git a/src-2.9/GF/Shell/ShellCommands.hs b/src-3.0/GF/Shell/ShellCommands.hs
index 70238817b..70238817b 100644
--- a/src-2.9/GF/Shell/ShellCommands.hs
+++ b/src-3.0/GF/Shell/ShellCommands.hs
diff --git a/src-2.9/GF/Shell/SubShell.hs b/src-3.0/GF/Shell/SubShell.hs
index 5ef0459e5..5ef0459e5 100644
--- a/src-2.9/GF/Shell/SubShell.hs
+++ b/src-3.0/GF/Shell/SubShell.hs
diff --git a/src-2.9/GF/Shell/TeachYourself.hs b/src-3.0/GF/Shell/TeachYourself.hs
index 7e5a8afe2..7e5a8afe2 100644
--- a/src-2.9/GF/Shell/TeachYourself.hs
+++ b/src-3.0/GF/Shell/TeachYourself.hs
diff --git a/src-2.9/GF/Source/AbsGF.hs b/src-3.0/GF/Source/AbsGF.hs
index 63cc43006..63cc43006 100644
--- a/src-2.9/GF/Source/AbsGF.hs
+++ b/src-3.0/GF/Source/AbsGF.hs
diff --git a/src-2.9/GF/Source/ErrM.hs b/src-3.0/GF/Source/ErrM.hs
index 63840758e..63840758e 100644
--- a/src-2.9/GF/Source/ErrM.hs
+++ b/src-3.0/GF/Source/ErrM.hs
diff --git a/src-2.9/GF/Source/GF.cf b/src-3.0/GF/Source/GF.cf
index 364550e6f..364550e6f 100644
--- a/src-2.9/GF/Source/GF.cf
+++ b/src-3.0/GF/Source/GF.cf
diff --git a/src-2.9/GF/Source/GrammarToSource.hs b/src-3.0/GF/Source/GrammarToSource.hs
index 6d48e4ced..6d48e4ced 100644
--- a/src-2.9/GF/Source/GrammarToSource.hs
+++ b/src-3.0/GF/Source/GrammarToSource.hs
diff --git a/src-2.9/GF/Source/LexGF.hs b/src-3.0/GF/Source/LexGF.hs
index 89067b6b6..89067b6b6 100644
--- a/src-2.9/GF/Source/LexGF.hs
+++ b/src-3.0/GF/Source/LexGF.hs
diff --git a/src-2.9/GF/Source/LexGF.x b/src-3.0/GF/Source/LexGF.x
index 7ea768e75..7ea768e75 100644
--- a/src-2.9/GF/Source/LexGF.x
+++ b/src-3.0/GF/Source/LexGF.x
diff --git a/src-2.9/GF/Source/ParGF.hs b/src-3.0/GF/Source/ParGF.hs
index 30f83eef6..30f83eef6 100644
--- a/src-2.9/GF/Source/ParGF.hs
+++ b/src-3.0/GF/Source/ParGF.hs
diff --git a/src-2.9/GF/Source/ParGF.y b/src-3.0/GF/Source/ParGF.y
index 2109434e5..2109434e5 100644
--- a/src-2.9/GF/Source/ParGF.y
+++ b/src-3.0/GF/Source/ParGF.y
diff --git a/src-2.9/GF/Source/PrintGF.hs b/src-3.0/GF/Source/PrintGF.hs
index 0a260f5bf..0a260f5bf 100644
--- a/src-2.9/GF/Source/PrintGF.hs
+++ b/src-3.0/GF/Source/PrintGF.hs
diff --git a/src-2.9/GF/Source/SkelGF.hs b/src-3.0/GF/Source/SkelGF.hs
index 3bd192f9d..3bd192f9d 100644
--- a/src-2.9/GF/Source/SkelGF.hs
+++ b/src-3.0/GF/Source/SkelGF.hs
diff --git a/src-2.9/GF/Source/SourceToGrammar.hs b/src-3.0/GF/Source/SourceToGrammar.hs
index 132bd4704..132bd4704 100644
--- a/src-2.9/GF/Source/SourceToGrammar.hs
+++ b/src-3.0/GF/Source/SourceToGrammar.hs
diff --git a/src-2.9/GF/Source/TestGF.hs b/src-3.0/GF/Source/TestGF.hs
index e4c072467..e4c072467 100644
--- a/src-2.9/GF/Source/TestGF.hs
+++ b/src-3.0/GF/Source/TestGF.hs
diff --git a/src-2.9/GF/Speech/CFGToFiniteState.hs b/src-3.0/GF/Speech/CFGToFiniteState.hs
index 7e6f80ba1..7e6f80ba1 100644
--- a/src-2.9/GF/Speech/CFGToFiniteState.hs
+++ b/src-3.0/GF/Speech/CFGToFiniteState.hs
diff --git a/src-2.9/GF/Speech/FiniteState.hs b/src-3.0/GF/Speech/FiniteState.hs
index 35274e3c4..35274e3c4 100644
--- a/src-2.9/GF/Speech/FiniteState.hs
+++ b/src-3.0/GF/Speech/FiniteState.hs
diff --git a/src-2.9/GF/Speech/GrammarToVoiceXML.hs b/src-3.0/GF/Speech/GrammarToVoiceXML.hs
index ad7f25d1c..ad7f25d1c 100644
--- a/src-2.9/GF/Speech/GrammarToVoiceXML.hs
+++ b/src-3.0/GF/Speech/GrammarToVoiceXML.hs
diff --git a/src-2.9/GF/Speech/Graph.hs b/src-3.0/GF/Speech/Graph.hs
index 1a0ebe0c0..1a0ebe0c0 100644
--- a/src-2.9/GF/Speech/Graph.hs
+++ b/src-3.0/GF/Speech/Graph.hs
diff --git a/src-2.9/GF/Speech/PrFA.hs b/src-3.0/GF/Speech/PrFA.hs
index 2856039ec..2856039ec 100644
--- a/src-2.9/GF/Speech/PrFA.hs
+++ b/src-3.0/GF/Speech/PrFA.hs
diff --git a/src-2.9/GF/Speech/PrGSL.hs b/src-3.0/GF/Speech/PrGSL.hs
index 248991380..248991380 100644
--- a/src-2.9/GF/Speech/PrGSL.hs
+++ b/src-3.0/GF/Speech/PrGSL.hs
diff --git a/src-2.9/GF/Speech/PrJSGF.hs b/src-3.0/GF/Speech/PrJSGF.hs
index 037a4f4e2..037a4f4e2 100644
--- a/src-2.9/GF/Speech/PrJSGF.hs
+++ b/src-3.0/GF/Speech/PrJSGF.hs
diff --git a/src-2.9/GF/Speech/PrRegExp.hs b/src-3.0/GF/Speech/PrRegExp.hs
index 55a25d69b..55a25d69b 100644
--- a/src-2.9/GF/Speech/PrRegExp.hs
+++ b/src-3.0/GF/Speech/PrRegExp.hs
diff --git a/src-2.9/GF/Speech/PrSLF.hs b/src-3.0/GF/Speech/PrSLF.hs
index 9bc025558..9bc025558 100644
--- a/src-2.9/GF/Speech/PrSLF.hs
+++ b/src-3.0/GF/Speech/PrSLF.hs
diff --git a/src-2.9/GF/Speech/PrSRGS.hs b/src-3.0/GF/Speech/PrSRGS.hs
index d8ae07867..d8ae07867 100644
--- a/src-2.9/GF/Speech/PrSRGS.hs
+++ b/src-3.0/GF/Speech/PrSRGS.hs
diff --git a/src-2.9/GF/Speech/PrSRGS_ABNF.hs b/src-3.0/GF/Speech/PrSRGS_ABNF.hs
index abb84c5dc..abb84c5dc 100644
--- a/src-2.9/GF/Speech/PrSRGS_ABNF.hs
+++ b/src-3.0/GF/Speech/PrSRGS_ABNF.hs
diff --git a/src-2.9/GF/Speech/RegExp.hs b/src-3.0/GF/Speech/RegExp.hs
index 5ee40828e..5ee40828e 100644
--- a/src-2.9/GF/Speech/RegExp.hs
+++ b/src-3.0/GF/Speech/RegExp.hs
diff --git a/src-2.9/GF/Speech/Relation.hs b/src-3.0/GF/Speech/Relation.hs
index 641d671a9..641d671a9 100644
--- a/src-2.9/GF/Speech/Relation.hs
+++ b/src-3.0/GF/Speech/Relation.hs
diff --git a/src-2.9/GF/Speech/RelationQC.hs b/src-3.0/GF/Speech/RelationQC.hs
index 47f783986..47f783986 100644
--- a/src-2.9/GF/Speech/RelationQC.hs
+++ b/src-3.0/GF/Speech/RelationQC.hs
diff --git a/src-2.9/GF/Speech/SISR.hs b/src-3.0/GF/Speech/SISR.hs
index 3e68a2e55..3e68a2e55 100644
--- a/src-2.9/GF/Speech/SISR.hs
+++ b/src-3.0/GF/Speech/SISR.hs
diff --git a/src-2.9/GF/Speech/SRG.hs b/src-3.0/GF/Speech/SRG.hs
index 19b6c1c1b..19b6c1c1b 100644
--- a/src-2.9/GF/Speech/SRG.hs
+++ b/src-3.0/GF/Speech/SRG.hs
diff --git a/src-2.9/GF/Speech/TransformCFG.hs b/src-3.0/GF/Speech/TransformCFG.hs
index 3d7ebd809..3d7ebd809 100644
--- a/src-2.9/GF/Speech/TransformCFG.hs
+++ b/src-3.0/GF/Speech/TransformCFG.hs
diff --git a/src-2.9/GF/System/ATKSpeechInput.hs b/src-3.0/GF/System/ATKSpeechInput.hs
index 4b50293af..4b50293af 100644
--- a/src-2.9/GF/System/ATKSpeechInput.hs
+++ b/src-3.0/GF/System/ATKSpeechInput.hs
diff --git a/src-2.9/GF/System/Arch.hs b/src-3.0/GF/System/Arch.hs
index c0dac3644..c0dac3644 100644
--- a/src-2.9/GF/System/Arch.hs
+++ b/src-3.0/GF/System/Arch.hs
diff --git a/src-2.9/GF/System/ArchEdit.hs b/src-3.0/GF/System/ArchEdit.hs
index 39b558cef..39b558cef 100644
--- a/src-2.9/GF/System/ArchEdit.hs
+++ b/src-3.0/GF/System/ArchEdit.hs
diff --git a/src-2.9/GF/System/NoReadline.hs b/src-3.0/GF/System/NoReadline.hs
index 138ba4e28..138ba4e28 100644
--- a/src-2.9/GF/System/NoReadline.hs
+++ b/src-3.0/GF/System/NoReadline.hs
diff --git a/src-2.9/GF/System/NoSignal.hs b/src-3.0/GF/System/NoSignal.hs
index 5d82a431e..5d82a431e 100644
--- a/src-2.9/GF/System/NoSignal.hs
+++ b/src-3.0/GF/System/NoSignal.hs
diff --git a/src-2.9/GF/System/NoSpeechInput.hs b/src-3.0/GF/System/NoSpeechInput.hs
index 04197ce92..04197ce92 100644
--- a/src-2.9/GF/System/NoSpeechInput.hs
+++ b/src-3.0/GF/System/NoSpeechInput.hs
diff --git a/src-2.9/GF/System/Readline.hs b/src-3.0/GF/System/Readline.hs
index c12493f98..c12493f98 100644
--- a/src-2.9/GF/System/Readline.hs
+++ b/src-3.0/GF/System/Readline.hs
diff --git a/src-2.9/GF/System/Signal.hs b/src-3.0/GF/System/Signal.hs
index fe8a12483..fe8a12483 100644
--- a/src-2.9/GF/System/Signal.hs
+++ b/src-3.0/GF/System/Signal.hs
diff --git a/src-2.9/GF/System/SpeechInput.hs b/src-3.0/GF/System/SpeechInput.hs
index 6c2374473..6c2374473 100644
--- a/src-2.9/GF/System/SpeechInput.hs
+++ b/src-3.0/GF/System/SpeechInput.hs
diff --git a/src-2.9/GF/System/Tracing.hs b/src-3.0/GF/System/Tracing.hs
index 71bacfb75..71bacfb75 100644
--- a/src-2.9/GF/System/Tracing.hs
+++ b/src-3.0/GF/System/Tracing.hs
diff --git a/src-2.9/GF/System/UseReadline.hs b/src-3.0/GF/System/UseReadline.hs
index c84b9d7f4..c84b9d7f4 100644
--- a/src-2.9/GF/System/UseReadline.hs
+++ b/src-3.0/GF/System/UseReadline.hs
diff --git a/src-2.9/GF/System/UseSignal.hs b/src-3.0/GF/System/UseSignal.hs
index 5e6d81237..5e6d81237 100644
--- a/src-2.9/GF/System/UseSignal.hs
+++ b/src-3.0/GF/System/UseSignal.hs
diff --git a/src-2.9/GF/Text/Arabic.hs b/src-3.0/GF/Text/Arabic.hs
index c482b1172..c482b1172 100644
--- a/src-2.9/GF/Text/Arabic.hs
+++ b/src-3.0/GF/Text/Arabic.hs
diff --git a/src-2.9/GF/Text/Devanagari.hs b/src-3.0/GF/Text/Devanagari.hs
index bf4343cd0..bf4343cd0 100644
--- a/src-2.9/GF/Text/Devanagari.hs
+++ b/src-3.0/GF/Text/Devanagari.hs
diff --git a/src-2.9/GF/Text/Ethiopic.hs b/src-3.0/GF/Text/Ethiopic.hs
index 81abbf719..81abbf719 100644
--- a/src-2.9/GF/Text/Ethiopic.hs
+++ b/src-3.0/GF/Text/Ethiopic.hs
diff --git a/src-2.9/GF/Text/ExtendedArabic.hs b/src-3.0/GF/Text/ExtendedArabic.hs
index d2c5faac5..d2c5faac5 100644
--- a/src-2.9/GF/Text/ExtendedArabic.hs
+++ b/src-3.0/GF/Text/ExtendedArabic.hs
diff --git a/src-2.9/GF/Text/ExtraDiacritics.hs b/src-3.0/GF/Text/ExtraDiacritics.hs
index f3d811c2c..f3d811c2c 100644
--- a/src-2.9/GF/Text/ExtraDiacritics.hs
+++ b/src-3.0/GF/Text/ExtraDiacritics.hs
diff --git a/src-2.9/GF/Text/Greek.hs b/src-3.0/GF/Text/Greek.hs
index 6b9361a29..6b9361a29 100644
--- a/src-2.9/GF/Text/Greek.hs
+++ b/src-3.0/GF/Text/Greek.hs
diff --git a/src-2.9/GF/Text/Hebrew.hs b/src-3.0/GF/Text/Hebrew.hs
index c7026d8da..c7026d8da 100644
--- a/src-2.9/GF/Text/Hebrew.hs
+++ b/src-3.0/GF/Text/Hebrew.hs
diff --git a/src-2.9/GF/Text/Hiragana.hs b/src-3.0/GF/Text/Hiragana.hs
index ba74fc83c..ba74fc83c 100644
--- a/src-2.9/GF/Text/Hiragana.hs
+++ b/src-3.0/GF/Text/Hiragana.hs
diff --git a/src-2.9/GF/Text/LatinASupplement.hs b/src-3.0/GF/Text/LatinASupplement.hs
index f42423c91..f42423c91 100644
--- a/src-2.9/GF/Text/LatinASupplement.hs
+++ b/src-3.0/GF/Text/LatinASupplement.hs
diff --git a/src-2.9/GF/Text/OCSCyrillic.hs b/src-3.0/GF/Text/OCSCyrillic.hs
index 0d4696944..0d4696944 100644
--- a/src-2.9/GF/Text/OCSCyrillic.hs
+++ b/src-3.0/GF/Text/OCSCyrillic.hs
diff --git a/src-2.9/GF/Text/Russian.hs b/src-3.0/GF/Text/Russian.hs
index c4f1bfd89..c4f1bfd89 100644
--- a/src-2.9/GF/Text/Russian.hs
+++ b/src-3.0/GF/Text/Russian.hs
diff --git a/src-2.9/GF/Text/Tamil.hs b/src-3.0/GF/Text/Tamil.hs
index 8ee171acf..8ee171acf 100644
--- a/src-2.9/GF/Text/Tamil.hs
+++ b/src-3.0/GF/Text/Tamil.hs
diff --git a/src-2.9/GF/Text/Text.hs b/src-3.0/GF/Text/Text.hs
index b55355c20..b55355c20 100644
--- a/src-2.9/GF/Text/Text.hs
+++ b/src-3.0/GF/Text/Text.hs
diff --git a/src-2.9/GF/Text/Thai.hs b/src-3.0/GF/Text/Thai.hs
index 1b186cb3a..1b186cb3a 100644
--- a/src-2.9/GF/Text/Thai.hs
+++ b/src-3.0/GF/Text/Thai.hs
diff --git a/src-2.9/GF/Text/UTF8.hs b/src-3.0/GF/Text/UTF8.hs
index 5e9687684..5e9687684 100644
--- a/src-2.9/GF/Text/UTF8.hs
+++ b/src-3.0/GF/Text/UTF8.hs
diff --git a/src-2.9/GF/Text/Unicode.hs b/src-3.0/GF/Text/Unicode.hs
index 9d0b9d1a8..9d0b9d1a8 100644
--- a/src-2.9/GF/Text/Unicode.hs
+++ b/src-3.0/GF/Text/Unicode.hs
diff --git a/src-2.9/GF/Translate/GFT.hs b/src-3.0/GF/Translate/GFT.hs
index e4a9d8193..e4a9d8193 100644
--- a/src-2.9/GF/Translate/GFT.hs
+++ b/src-3.0/GF/Translate/GFT.hs
diff --git a/src-2.9/GF/UseGrammar/Custom.hs b/src-3.0/GF/UseGrammar/Custom.hs
index 983b7f683..983b7f683 100644
--- a/src-2.9/GF/UseGrammar/Custom.hs
+++ b/src-3.0/GF/UseGrammar/Custom.hs
diff --git a/src-2.9/GF/UseGrammar/Editing.hs b/src-3.0/GF/UseGrammar/Editing.hs
index 762562eb0..762562eb0 100644
--- a/src-2.9/GF/UseGrammar/Editing.hs
+++ b/src-3.0/GF/UseGrammar/Editing.hs
diff --git a/src-2.9/GF/UseGrammar/Generate.hs b/src-3.0/GF/UseGrammar/Generate.hs
index 5f07e0b85..5f07e0b85 100644
--- a/src-2.9/GF/UseGrammar/Generate.hs
+++ b/src-3.0/GF/UseGrammar/Generate.hs
diff --git a/src-2.9/GF/UseGrammar/GetTree.hs b/src-3.0/GF/UseGrammar/GetTree.hs
index e980a3d95..e980a3d95 100644
--- a/src-2.9/GF/UseGrammar/GetTree.hs
+++ b/src-3.0/GF/UseGrammar/GetTree.hs
diff --git a/src-2.9/GF/UseGrammar/Information.hs b/src-3.0/GF/UseGrammar/Information.hs
index 4526980d6..4526980d6 100644
--- a/src-2.9/GF/UseGrammar/Information.hs
+++ b/src-3.0/GF/UseGrammar/Information.hs
diff --git a/src-2.9/GF/UseGrammar/Linear.hs b/src-3.0/GF/UseGrammar/Linear.hs
index c9b94ccb0..c9b94ccb0 100644
--- a/src-2.9/GF/UseGrammar/Linear.hs
+++ b/src-3.0/GF/UseGrammar/Linear.hs
diff --git a/src-2.9/GF/UseGrammar/MatchTerm.hs b/src-3.0/GF/UseGrammar/MatchTerm.hs
index 9acffd44c..9acffd44c 100644
--- a/src-2.9/GF/UseGrammar/MatchTerm.hs
+++ b/src-3.0/GF/UseGrammar/MatchTerm.hs
diff --git a/src-2.9/GF/UseGrammar/Morphology.hs b/src-3.0/GF/UseGrammar/Morphology.hs
index 3aeb08dc7..3aeb08dc7 100644
--- a/src-2.9/GF/UseGrammar/Morphology.hs
+++ b/src-3.0/GF/UseGrammar/Morphology.hs
diff --git a/src-2.9/GF/UseGrammar/Paraphrases.hs b/src-3.0/GF/UseGrammar/Paraphrases.hs
index d04f22aa6..d04f22aa6 100644
--- a/src-2.9/GF/UseGrammar/Paraphrases.hs
+++ b/src-3.0/GF/UseGrammar/Paraphrases.hs
diff --git a/src-2.9/GF/UseGrammar/Parsing.hs b/src-3.0/GF/UseGrammar/Parsing.hs
index 2ca057410..2ca057410 100644
--- a/src-2.9/GF/UseGrammar/Parsing.hs
+++ b/src-3.0/GF/UseGrammar/Parsing.hs
diff --git a/src-2.9/GF/UseGrammar/Randomized.hs b/src-3.0/GF/UseGrammar/Randomized.hs
index c1c77edb2..c1c77edb2 100644
--- a/src-2.9/GF/UseGrammar/Randomized.hs
+++ b/src-3.0/GF/UseGrammar/Randomized.hs
diff --git a/src-2.9/GF/UseGrammar/Session.hs b/src-3.0/GF/UseGrammar/Session.hs
index e54d0e3fb..e54d0e3fb 100644
--- a/src-2.9/GF/UseGrammar/Session.hs
+++ b/src-3.0/GF/UseGrammar/Session.hs
diff --git a/src-2.9/GF/UseGrammar/Statistics.hs b/src-3.0/GF/UseGrammar/Statistics.hs
index 46e4fcc3b..46e4fcc3b 100644
--- a/src-2.9/GF/UseGrammar/Statistics.hs
+++ b/src-3.0/GF/UseGrammar/Statistics.hs
diff --git a/src-2.9/GF/UseGrammar/Tokenize.hs b/src-3.0/GF/UseGrammar/Tokenize.hs
index 9f1ab5449..9f1ab5449 100644
--- a/src-2.9/GF/UseGrammar/Tokenize.hs
+++ b/src-3.0/GF/UseGrammar/Tokenize.hs
diff --git a/src-2.9/GF/UseGrammar/Transfer.hs b/src-3.0/GF/UseGrammar/Transfer.hs
index 5d62f4385..5d62f4385 100644
--- a/src-2.9/GF/UseGrammar/Transfer.hs
+++ b/src-3.0/GF/UseGrammar/Transfer.hs
diff --git a/src-2.9/GF/UseGrammar/TreeSelections.hs b/src-3.0/GF/UseGrammar/TreeSelections.hs
index 9bf2711be..9bf2711be 100644
--- a/src-2.9/GF/UseGrammar/TreeSelections.hs
+++ b/src-3.0/GF/UseGrammar/TreeSelections.hs
diff --git a/src-2.9/GF/UseGrammar/Treebank.hs b/src-3.0/GF/UseGrammar/Treebank.hs
index 841a9c6dc..841a9c6dc 100644
--- a/src-2.9/GF/UseGrammar/Treebank.hs
+++ b/src-3.0/GF/UseGrammar/Treebank.hs
diff --git a/src-2.9/GF/Visualization/Graphviz.hs b/src-3.0/GF/Visualization/Graphviz.hs
index b59e3ecd2..b59e3ecd2 100644
--- a/src-2.9/GF/Visualization/Graphviz.hs
+++ b/src-3.0/GF/Visualization/Graphviz.hs
diff --git a/src-2.9/GF/Visualization/VisualizeGrammar.hs b/src-3.0/GF/Visualization/VisualizeGrammar.hs
index b5446aec8..b5446aec8 100644
--- a/src-2.9/GF/Visualization/VisualizeGrammar.hs
+++ b/src-3.0/GF/Visualization/VisualizeGrammar.hs
diff --git a/src-2.9/GF/Visualization/VisualizeTree.hs b/src-3.0/GF/Visualization/VisualizeTree.hs
index 5fe740c12..5fe740c12 100644
--- a/src-2.9/GF/Visualization/VisualizeTree.hs
+++ b/src-3.0/GF/Visualization/VisualizeTree.hs
diff --git a/src-2.9/HelpFile b/src-3.0/HelpFile
index c6b38b313..c6b38b313 100644
--- a/src-2.9/HelpFile
+++ b/src-3.0/HelpFile
diff --git a/src-2.9/INSTALL b/src-3.0/INSTALL
index ef7949b07..ef7949b07 100644
--- a/src-2.9/INSTALL
+++ b/src-3.0/INSTALL
diff --git a/src-2.9/INSTALL.binary b/src-3.0/INSTALL.binary
index ef62b24af..ef62b24af 100644
--- a/src-2.9/INSTALL.binary
+++ b/src-3.0/INSTALL.binary
diff --git a/src-2.9/JavaGUI/DynamicTree.java b/src-3.0/JavaGUI/DynamicTree.java
index 6acc6ff64..6acc6ff64 100644
--- a/src-2.9/JavaGUI/DynamicTree.java
+++ b/src-3.0/JavaGUI/DynamicTree.java
diff --git a/src-2.9/JavaGUI/DynamicTree2.java b/src-3.0/JavaGUI/DynamicTree2.java
index 9d325772d..9d325772d 100644
--- a/src-2.9/JavaGUI/DynamicTree2.java
+++ b/src-3.0/JavaGUI/DynamicTree2.java
diff --git a/src-2.9/JavaGUI/GFEditor.java b/src-3.0/JavaGUI/GFEditor.java
index 0ebf91e7e..0ebf91e7e 100644
--- a/src-2.9/JavaGUI/GFEditor.java
+++ b/src-3.0/JavaGUI/GFEditor.java
diff --git a/src-2.9/JavaGUI/GFEditor2.java b/src-3.0/JavaGUI/GFEditor2.java
index f71210d7c..f71210d7c 100644
--- a/src-2.9/JavaGUI/GFEditor2.java
+++ b/src-3.0/JavaGUI/GFEditor2.java
diff --git a/src-2.9/JavaGUI/GrammarFilter.java b/src-3.0/JavaGUI/GrammarFilter.java
index 5180a9f6e..5180a9f6e 100644
--- a/src-2.9/JavaGUI/GrammarFilter.java
+++ b/src-3.0/JavaGUI/GrammarFilter.java
diff --git a/src-2.9/JavaGUI/LinPosition.java b/src-3.0/JavaGUI/LinPosition.java
index 2419de1df..2419de1df 100644
--- a/src-2.9/JavaGUI/LinPosition.java
+++ b/src-3.0/JavaGUI/LinPosition.java
diff --git a/src-2.9/JavaGUI/MarkedArea.java b/src-3.0/JavaGUI/MarkedArea.java
index 3299db9aa..3299db9aa 100644
--- a/src-2.9/JavaGUI/MarkedArea.java
+++ b/src-3.0/JavaGUI/MarkedArea.java
diff --git a/src-2.9/JavaGUI/Numerals.java b/src-3.0/JavaGUI/Numerals.java
index 752cf232c..752cf232c 100644
--- a/src-2.9/JavaGUI/Numerals.java
+++ b/src-3.0/JavaGUI/Numerals.java
diff --git a/src-2.9/JavaGUI/Utils.java b/src-3.0/JavaGUI/Utils.java
index b10f54712..b10f54712 100644
--- a/src-2.9/JavaGUI/Utils.java
+++ b/src-3.0/JavaGUI/Utils.java
diff --git a/src-2.9/JavaGUI/manifest.txt b/src-3.0/JavaGUI/manifest.txt
index 006d8adfd..006d8adfd 100644
--- a/src-2.9/JavaGUI/manifest.txt
+++ b/src-3.0/JavaGUI/manifest.txt
diff --git a/src-2.9/JavaGUI/runNumerals b/src-3.0/JavaGUI/runNumerals
index 3445220cc..3445220cc 100644
--- a/src-2.9/JavaGUI/runNumerals
+++ b/src-3.0/JavaGUI/runNumerals
diff --git a/src-2.9/JavaGUI2/LICENCE_jargs b/src-3.0/JavaGUI2/LICENCE_jargs
index 509c1b7cb..509c1b7cb 100644
--- a/src-2.9/JavaGUI2/LICENCE_jargs
+++ b/src-3.0/JavaGUI2/LICENCE_jargs
diff --git a/src-2.9/JavaGUI2/ManifestMain.txt b/src-3.0/JavaGUI2/ManifestMain.txt
index b398ff78d..b398ff78d 100644
--- a/src-2.9/JavaGUI2/ManifestMain.txt
+++ b/src-3.0/JavaGUI2/ManifestMain.txt
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
index 0439ec6a4..0439ec6a4 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
index 9a4c48911..9a4c48911 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
index c0f6f0c0d..c0f6f0c0d 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
index 3a9432960..3a9432960 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
index 9ca39fc49..9ca39fc49 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
index 5c88955d3..5c88955d3 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
index 076a9778f..076a9778f 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
index 6e420a62b..6e420a62b 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
index cdda74168..cdda74168 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
index 8912d0778..8912d0778 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
index c1d012a02..c1d012a02 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
index ccc75ff26..ccc75ff26 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
index e8bd59c66..e8bd59c66 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
index 0a640f787..0a640f787 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
index d047b943b..d047b943b 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
index 39e3e6fb1..39e3e6fb1 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
index cf2963210..cf2963210 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
index 5ff78202b..5ff78202b 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
index fb12c79b7..fb12c79b7 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
index 0f4422978..0f4422978 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
index f2c712a75..f2c712a75 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
index 44880a00a..44880a00a 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
index f241acb69..f241acb69 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
index 68feb6dd9..68feb6dd9 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
index 2cf5e9daa..2cf5e9daa 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
index 685dcf000..685dcf000 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
index 3a0ea34f4..3a0ea34f4 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
index 8d9b4f3f8..8d9b4f3f8 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
index bfd526593..bfd526593 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
index 46e4a2443..46e4a2443 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
index 4d7df9dac..4d7df9dac 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
index ba1263db8..ba1263db8 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
index 60ee86c64..60ee86c64 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
index 664a9d918..664a9d918 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
index 67f4326e1..67f4326e1 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
index 9ff3c4f92..9ff3c4f92 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
index b05aeeb87..b05aeeb87 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
index 5edf2a16b..5edf2a16b 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
index 1bcae3421..1bcae3421 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
index 5cf5c4bd5..5cf5c4bd5 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
index 0c12fc0fb..0c12fc0fb 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
diff --git a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
index 076cc2308..076cc2308 100644
--- a/src-2.9/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
+++ b/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
diff --git a/src-2.9/JavaGUI2/gf-icon.gif b/src-3.0/JavaGUI2/gf-icon.gif
index 5e8863d76..5e8863d76 100644
--- a/src-2.9/JavaGUI2/gf-icon.gif
+++ b/src-3.0/JavaGUI2/gf-icon.gif
diff --git a/src-2.9/JavaGUI2/jargs-1.0.jar b/src-3.0/JavaGUI2/jargs-1.0.jar
index cdbc80bb3..cdbc80bb3 100644
--- a/src-2.9/JavaGUI2/jargs-1.0.jar
+++ b/src-3.0/JavaGUI2/jargs-1.0.jar
diff --git a/src-2.9/Makefile b/src-3.0/Makefile
index 421409280..421409280 100644
--- a/src-2.9/Makefile
+++ b/src-3.0/Makefile
diff --git a/src-2.9/Makefile.binary b/src-3.0/Makefile.binary
index ab52185fd..ab52185fd 100644
--- a/src-2.9/Makefile.binary
+++ b/src-3.0/Makefile.binary
diff --git a/src-2.9/ReleaseProcedure b/src-3.0/ReleaseProcedure
index c04f2a065..c04f2a065 100644
--- a/src-2.9/ReleaseProcedure
+++ b/src-3.0/ReleaseProcedure
diff --git a/src-2.9/Setup.lhs b/src-3.0/Setup.lhs
index e2c31e7ca..e2c31e7ca 100644
--- a/src-2.9/Setup.lhs
+++ b/src-3.0/Setup.lhs
diff --git a/src-2.9/Transfer/CompilerAPI.hs b/src-3.0/Transfer/CompilerAPI.hs
index 38cb58dd0..38cb58dd0 100644
--- a/src-2.9/Transfer/CompilerAPI.hs
+++ b/src-3.0/Transfer/CompilerAPI.hs
diff --git a/src-2.9/Transfer/Core/Abs.hs b/src-3.0/Transfer/Core/Abs.hs
index 8306d5b46..8306d5b46 100644
--- a/src-2.9/Transfer/Core/Abs.hs
+++ b/src-3.0/Transfer/Core/Abs.hs
diff --git a/src-2.9/Transfer/Core/Core.cf b/src-3.0/Transfer/Core/Core.cf
index cd4c20569..cd4c20569 100644
--- a/src-2.9/Transfer/Core/Core.cf
+++ b/src-3.0/Transfer/Core/Core.cf
diff --git a/src-2.9/Transfer/Core/Doc.tex b/src-3.0/Transfer/Core/Doc.tex
index 4ba6f93ed..4ba6f93ed 100644
--- a/src-2.9/Transfer/Core/Doc.tex
+++ b/src-3.0/Transfer/Core/Doc.tex
diff --git a/src-2.9/Transfer/Core/Lex.hs b/src-3.0/Transfer/Core/Lex.hs
index be1198508..be1198508 100644
--- a/src-2.9/Transfer/Core/Lex.hs
+++ b/src-3.0/Transfer/Core/Lex.hs
diff --git a/src-2.9/Transfer/Core/Lex.x b/src-3.0/Transfer/Core/Lex.x
index 480f366ae..480f366ae 100644
--- a/src-2.9/Transfer/Core/Lex.x
+++ b/src-3.0/Transfer/Core/Lex.x
diff --git a/src-2.9/Transfer/Core/Par.hs b/src-3.0/Transfer/Core/Par.hs
index fec63662a..fec63662a 100644
--- a/src-2.9/Transfer/Core/Par.hs
+++ b/src-3.0/Transfer/Core/Par.hs
diff --git a/src-2.9/Transfer/Core/Par.y b/src-3.0/Transfer/Core/Par.y
index ceeaa313f..ceeaa313f 100644
--- a/src-2.9/Transfer/Core/Par.y
+++ b/src-3.0/Transfer/Core/Par.y
diff --git a/src-2.9/Transfer/Core/Print.hs b/src-3.0/Transfer/Core/Print.hs
index 50929716a..50929716a 100644
--- a/src-2.9/Transfer/Core/Print.hs
+++ b/src-3.0/Transfer/Core/Print.hs
diff --git a/src-2.9/Transfer/Core/Skel.hs b/src-3.0/Transfer/Core/Skel.hs
index 005ae92b1..005ae92b1 100644
--- a/src-2.9/Transfer/Core/Skel.hs
+++ b/src-3.0/Transfer/Core/Skel.hs
diff --git a/src-2.9/Transfer/Core/Test.hs b/src-3.0/Transfer/Core/Test.hs
index 570beed51..570beed51 100644
--- a/src-2.9/Transfer/Core/Test.hs
+++ b/src-3.0/Transfer/Core/Test.hs
diff --git a/src-2.9/Transfer/ErrM.hs b/src-3.0/Transfer/ErrM.hs
index 1f3c566fd..1f3c566fd 100644
--- a/src-2.9/Transfer/ErrM.hs
+++ b/src-3.0/Transfer/ErrM.hs
diff --git a/src-2.9/Transfer/Interpreter.hs b/src-3.0/Transfer/Interpreter.hs
index 926b7bd3a..926b7bd3a 100644
--- a/src-2.9/Transfer/Interpreter.hs
+++ b/src-3.0/Transfer/Interpreter.hs
diff --git a/src-2.9/Transfer/InterpreterAPI.hs b/src-3.0/Transfer/InterpreterAPI.hs
index 2fe04e8f3..2fe04e8f3 100644
--- a/src-2.9/Transfer/InterpreterAPI.hs
+++ b/src-3.0/Transfer/InterpreterAPI.hs
diff --git a/src-2.9/Transfer/PathUtil.hs b/src-3.0/Transfer/PathUtil.hs
index b344563c6..b344563c6 100644
--- a/src-2.9/Transfer/PathUtil.hs
+++ b/src-3.0/Transfer/PathUtil.hs
diff --git a/src-2.9/Transfer/Syntax/Abs.hs b/src-3.0/Transfer/Syntax/Abs.hs
index 0ccf9ab12..0ccf9ab12 100644
--- a/src-2.9/Transfer/Syntax/Abs.hs
+++ b/src-3.0/Transfer/Syntax/Abs.hs
diff --git a/src-2.9/Transfer/Syntax/Doc.tex b/src-3.0/Transfer/Syntax/Doc.tex
index 603940459..603940459 100644
--- a/src-2.9/Transfer/Syntax/Doc.tex
+++ b/src-3.0/Transfer/Syntax/Doc.tex
diff --git a/src-2.9/Transfer/Syntax/Layout.hs b/src-3.0/Transfer/Syntax/Layout.hs
index de5c99870..de5c99870 100644
--- a/src-2.9/Transfer/Syntax/Layout.hs
+++ b/src-3.0/Transfer/Syntax/Layout.hs
diff --git a/src-2.9/Transfer/Syntax/Lex.hs b/src-3.0/Transfer/Syntax/Lex.hs
index 83c9e1a12..83c9e1a12 100644
--- a/src-2.9/Transfer/Syntax/Lex.hs
+++ b/src-3.0/Transfer/Syntax/Lex.hs
diff --git a/src-2.9/Transfer/Syntax/Lex.x b/src-3.0/Transfer/Syntax/Lex.x
index 107b67345..107b67345 100644
--- a/src-2.9/Transfer/Syntax/Lex.x
+++ b/src-3.0/Transfer/Syntax/Lex.x
diff --git a/src-2.9/Transfer/Syntax/Par.hs b/src-3.0/Transfer/Syntax/Par.hs
index bd83f0a87..bd83f0a87 100644
--- a/src-2.9/Transfer/Syntax/Par.hs
+++ b/src-3.0/Transfer/Syntax/Par.hs
diff --git a/src-2.9/Transfer/Syntax/Par.y b/src-3.0/Transfer/Syntax/Par.y
index 13c7800a8..13c7800a8 100644
--- a/src-2.9/Transfer/Syntax/Par.y
+++ b/src-3.0/Transfer/Syntax/Par.y
diff --git a/src-2.9/Transfer/Syntax/Print.hs b/src-3.0/Transfer/Syntax/Print.hs
index 50164477d..50164477d 100644
--- a/src-2.9/Transfer/Syntax/Print.hs
+++ b/src-3.0/Transfer/Syntax/Print.hs
diff --git a/src-2.9/Transfer/Syntax/ResolveLayout.hs b/src-3.0/Transfer/Syntax/ResolveLayout.hs
index 9d7ab607a..9d7ab607a 100644
--- a/src-2.9/Transfer/Syntax/ResolveLayout.hs
+++ b/src-3.0/Transfer/Syntax/ResolveLayout.hs
diff --git a/src-2.9/Transfer/Syntax/Skel.hs b/src-3.0/Transfer/Syntax/Skel.hs
index b2376478b..b2376478b 100644
--- a/src-2.9/Transfer/Syntax/Skel.hs
+++ b/src-3.0/Transfer/Syntax/Skel.hs
diff --git a/src-2.9/Transfer/Syntax/Syntax.cf b/src-3.0/Transfer/Syntax/Syntax.cf
index 7429e34f9..7429e34f9 100644
--- a/src-2.9/Transfer/Syntax/Syntax.cf
+++ b/src-3.0/Transfer/Syntax/Syntax.cf
diff --git a/src-2.9/Transfer/Syntax/Test.hs b/src-3.0/Transfer/Syntax/Test.hs
index 3f5fab7ad..3f5fab7ad 100644
--- a/src-2.9/Transfer/Syntax/Test.hs
+++ b/src-3.0/Transfer/Syntax/Test.hs
diff --git a/src-2.9/Transfer/SyntaxToCore.hs b/src-3.0/Transfer/SyntaxToCore.hs
index 32796eb50..32796eb50 100644
--- a/src-2.9/Transfer/SyntaxToCore.hs
+++ b/src-3.0/Transfer/SyntaxToCore.hs
diff --git a/src-2.9/config.guess b/src-3.0/config.guess
index c085f4f51..c085f4f51 100644
--- a/src-2.9/config.guess
+++ b/src-3.0/config.guess
diff --git a/src-2.9/config.mk.in b/src-3.0/config.mk.in
index e8a8ab567..e8a8ab567 100644
--- a/src-2.9/config.mk.in
+++ b/src-3.0/config.mk.in
diff --git a/src-2.9/config.sub b/src-3.0/config.sub
index 4d936e239..4d936e239 100644
--- a/src-2.9/config.sub
+++ b/src-3.0/config.sub
diff --git a/src-2.9/configure.ac b/src-3.0/configure.ac
index de153c796..de153c796 100644
--- a/src-2.9/configure.ac
+++ b/src-3.0/configure.ac
diff --git a/src-2.9/exper/Evaluate.hs b/src-3.0/exper/Evaluate.hs
index 7c5fb4b6a..7c5fb4b6a 100644
--- a/src-2.9/exper/Evaluate.hs
+++ b/src-3.0/exper/Evaluate.hs
diff --git a/src-2.9/exper/Optimize.hs b/src-3.0/exper/Optimize.hs
index ff4614700..ff4614700 100644
--- a/src-2.9/exper/Optimize.hs
+++ b/src-3.0/exper/Optimize.hs
diff --git a/src-2.9/gf.spec b/src-3.0/gf.spec
index b46b9be62..b46b9be62 100644
--- a/src-2.9/gf.spec
+++ b/src-3.0/gf.spec
diff --git a/src-2.9/gf.wxs.in b/src-3.0/gf.wxs.in
index e2b21f12b..e2b21f12b 100644
--- a/src-2.9/gf.wxs.in
+++ b/src-3.0/gf.wxs.in
diff --git a/src-2.9/gf_atk.cfg b/src-3.0/gf_atk.cfg
index 37bb2c4f5..37bb2c4f5 100644
--- a/src-2.9/gf_atk.cfg
+++ b/src-3.0/gf_atk.cfg
diff --git a/src-2.9/gfc.in b/src-3.0/gfc.in
index 05addb2cb..05addb2cb 100644
--- a/src-2.9/gfc.in
+++ b/src-3.0/gfc.in
diff --git a/src-2.9/gfeditor.in b/src-3.0/gfeditor.in
index 129cd5e1f..129cd5e1f 100644
--- a/src-2.9/gfeditor.in
+++ b/src-3.0/gfeditor.in
diff --git a/src-2.9/haddock/haddock-check.perl b/src-3.0/haddock/haddock-check.perl
index 93647bac7..93647bac7 100644
--- a/src-2.9/haddock/haddock-check.perl
+++ b/src-3.0/haddock/haddock-check.perl
diff --git a/src-2.9/haddock/haddock-script.csh b/src-3.0/haddock/haddock-script.csh
index 77b3761f8..77b3761f8 100644
--- a/src-2.9/haddock/haddock-script.csh
+++ b/src-3.0/haddock/haddock-script.csh
diff --git a/src-2.9/haddock/resources/blank.html b/src-3.0/haddock/resources/blank.html
index 63ab0b172..63ab0b172 100644
--- a/src-2.9/haddock/resources/blank.html
+++ b/src-3.0/haddock/resources/blank.html
diff --git a/src-2.9/haddock/resources/index.html b/src-3.0/haddock/resources/index.html
index 5d8822dc5..5d8822dc5 100644
--- a/src-2.9/haddock/resources/index.html
+++ b/src-3.0/haddock/resources/index.html
diff --git a/src-2.9/install-sh b/src-3.0/install-sh
index e9de23842..e9de23842 100644
--- a/src-2.9/install-sh
+++ b/src-3.0/install-sh
diff --git a/src-2.9/jgf.bat b/src-3.0/jgf.bat
index d56a638d5..d56a638d5 100644
--- a/src-2.9/jgf.bat
+++ b/src-3.0/jgf.bat
diff --git a/src-2.9/jgf.in b/src-3.0/jgf.in
index 3df121a64..3df121a64 100644
--- a/src-2.9/jgf.in
+++ b/src-3.0/jgf.in
diff --git a/src-2.9/module-structure.txt b/src-3.0/module-structure.txt
index d3b596d9f..d3b596d9f 100644
--- a/src-2.9/module-structure.txt
+++ b/src-3.0/module-structure.txt
diff --git a/src-2.9/tools/AlphaConvGF.hs b/src-3.0/tools/AlphaConvGF.hs
index 0e87bdb7a..0e87bdb7a 100644
--- a/src-2.9/tools/AlphaConvGF.hs
+++ b/src-3.0/tools/AlphaConvGF.hs
diff --git a/src-2.9/tools/GFDoc.hs b/src-3.0/tools/GFDoc.hs
index 91410864a..91410864a 100644
--- a/src-2.9/tools/GFDoc.hs
+++ b/src-3.0/tools/GFDoc.hs
diff --git a/src-2.9/tools/Htmls.hs b/src-3.0/tools/Htmls.hs
index ce0b3bb28..ce0b3bb28 100644
--- a/src-2.9/tools/Htmls.hs
+++ b/src-3.0/tools/Htmls.hs
diff --git a/src-2.9/tools/MkHelpFile.hs b/src-3.0/tools/MkHelpFile.hs
index a0fafa918..a0fafa918 100644
--- a/src-2.9/tools/MkHelpFile.hs
+++ b/src-3.0/tools/MkHelpFile.hs
diff --git a/src-2.9/tools/WriteF.hs b/src-3.0/tools/WriteF.hs
index 2e5b299dc..2e5b299dc 100644
--- a/src-2.9/tools/WriteF.hs
+++ b/src-3.0/tools/WriteF.hs
diff --git a/src-2.9/tools/c++/README b/src-3.0/tools/c++/README
index 696e39469..696e39469 100644
--- a/src-2.9/tools/c++/README
+++ b/src-3.0/tools/c++/README
diff --git a/src-2.9/tools/c++/exgf.gft b/src-3.0/tools/c++/exgf.gft
index 644fecdb9..644fecdb9 100644
--- a/src-2.9/tools/c++/exgf.gft
+++ b/src-3.0/tools/c++/exgf.gft
diff --git a/src-2.9/tools/c++/gfex.cpp b/src-3.0/tools/c++/gfex.cpp
index 65d65fffb..65d65fffb 100644
--- a/src-2.9/tools/c++/gfex.cpp
+++ b/src-3.0/tools/c++/gfex.cpp
diff --git a/src-2.9/tools/c++/peace.gft b/src-3.0/tools/c++/peace.gft
index 1e9adf1e5..1e9adf1e5 100644
--- a/src-2.9/tools/c++/peace.gft
+++ b/src-3.0/tools/c++/peace.gft
diff --git a/src-2.9/tools/c/GFCC/Abs.hs b/src-3.0/tools/c/GFCC/Abs.hs
index f42447ebb..f42447ebb 100644
--- a/src-2.9/tools/c/GFCC/Abs.hs
+++ b/src-3.0/tools/c/GFCC/Abs.hs
diff --git a/src-2.9/tools/c/GFCC/ComposOp.hs b/src-3.0/tools/c/GFCC/ComposOp.hs
index 401c1d778..401c1d778 100644
--- a/src-2.9/tools/c/GFCC/ComposOp.hs
+++ b/src-3.0/tools/c/GFCC/ComposOp.hs
diff --git a/src-2.9/tools/c/GFCC/ErrM.hs b/src-3.0/tools/c/GFCC/ErrM.hs
index 820473ccd..820473ccd 100644
--- a/src-2.9/tools/c/GFCC/ErrM.hs
+++ b/src-3.0/tools/c/GFCC/ErrM.hs
diff --git a/src-2.9/tools/c/GFCC/Lex.hs b/src-3.0/tools/c/GFCC/Lex.hs
index f12c824cd..f12c824cd 100644
--- a/src-2.9/tools/c/GFCC/Lex.hs
+++ b/src-3.0/tools/c/GFCC/Lex.hs
diff --git a/src-2.9/tools/c/GFCC/Lex.x b/src-3.0/tools/c/GFCC/Lex.x
index f5fda82b6..f5fda82b6 100644
--- a/src-2.9/tools/c/GFCC/Lex.x
+++ b/src-3.0/tools/c/GFCC/Lex.x
diff --git a/src-2.9/tools/c/GFCC/Par.hs b/src-3.0/tools/c/GFCC/Par.hs
index 1f5479e64..1f5479e64 100644
--- a/src-2.9/tools/c/GFCC/Par.hs
+++ b/src-3.0/tools/c/GFCC/Par.hs
diff --git a/src-2.9/tools/c/GFCC/Par.y b/src-3.0/tools/c/GFCC/Par.y
index fa30981cb..fa30981cb 100644
--- a/src-2.9/tools/c/GFCC/Par.y
+++ b/src-3.0/tools/c/GFCC/Par.y
diff --git a/src-2.9/tools/c/GFCC/Print.hs b/src-3.0/tools/c/GFCC/Print.hs
index 3697d8b0f..3697d8b0f 100644
--- a/src-2.9/tools/c/GFCC/Print.hs
+++ b/src-3.0/tools/c/GFCC/Print.hs
diff --git a/src-2.9/tools/c/GFCC/Test.hs b/src-3.0/tools/c/GFCC/Test.hs
index e3c3bcc40..e3c3bcc40 100644
--- a/src-2.9/tools/c/GFCC/Test.hs
+++ b/src-3.0/tools/c/GFCC/Test.hs
diff --git a/src-2.9/tools/c/Makefile b/src-3.0/tools/c/Makefile
index 189b224e2..189b224e2 100644
--- a/src-2.9/tools/c/Makefile
+++ b/src-3.0/tools/c/Makefile
diff --git a/src-2.9/tools/c/examples/bronzeage/Makefile b/src-3.0/tools/c/examples/bronzeage/Makefile
index 67367920a..67367920a 100644
--- a/src-2.9/tools/c/examples/bronzeage/Makefile
+++ b/src-3.0/tools/c/examples/bronzeage/Makefile
diff --git a/src-2.9/tools/c/examples/bronzeage/bronzeage-test.c b/src-3.0/tools/c/examples/bronzeage/bronzeage-test.c
index c0bee93a2..c0bee93a2 100644
--- a/src-2.9/tools/c/examples/bronzeage/bronzeage-test.c
+++ b/src-3.0/tools/c/examples/bronzeage/bronzeage-test.c
diff --git a/src-2.9/tools/c/gfcc2c.hs b/src-3.0/tools/c/gfcc2c.hs
index 75eb10fb8..75eb10fb8 100644
--- a/src-2.9/tools/c/gfcc2c.hs
+++ b/src-3.0/tools/c/gfcc2c.hs
diff --git a/src-2.9/tools/mkHelpFile.perl b/src-3.0/tools/mkHelpFile.perl
index 91f434705..91f434705 100644
--- a/src-2.9/tools/mkHelpFile.perl
+++ b/src-3.0/tools/mkHelpFile.perl