packages feed

uulib 0.9.13 → 0.9.14

raw patch · 12 files changed

+161/−783 lines, 12 filesdep −haskell98dep ~basedep ~ghc-primsetup-changed

Dependencies removed: haskell98

Dependency ranges changed: base, ghc-prim

Files

@@ -1,62 +1,23 @@-The UUST package is (c) copyright 2005-to the original authors and other contributors listed here.  If you add-or modify code, please add your name here.--Original authors:-	Doaitse Swierstra-	Arthur Baars-Contributors:-	Alexey Rodriguez-------The UUST package is licensed under the terms of the GNU Lesser General Public-Licence (LGPL), which can be found in the file called LICENCE-LGPL, with-the following special exception:--    As a relaxation of clause 6 of the LGPL, the copyright holders of this-    library give permission to use, copy, link, modify, and distribute,-    binary-only object-code versions of an executable linked with the-    original unmodified Library, without requiring the supply of any-    mechanism to modify or replace the Library and relink (clauses 6a,-    6b, 6c, 6d, 6e), provided that all the other terms of clause 6 are-    complied with.--This software is distributed in the hope that it will be useful, but-WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU-License for more details.-------This software depends on library code by Daan Leijen, which-is distributed under the following license:--                       The Modified BSD License+All rights reserved.  Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions -are met:--  * Redistributions of source code must retain the above copyright-    notice, this list of conditions and the following disclaimer.--  * Redistributions in binary form must reproduce the above-    copyright notice, this list of conditions and the following-    disclaimer in the documentation and/or other materials provided-    with the distribution.--  * Neither the names of the copyright holders, nor the names of its-    contributors may be used to endorse or promote products derived -    from this software without specific prior written permission.--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+modification, are permitted provided that the following conditions are met:+    * Redistributions of source code must retain the above copyright+      notice, this list of conditions and the following disclaimer.+    * Redistributions in binary form must reproduce the above copyright+      notice, this list of conditions and the following disclaimer in the+      documentation and/or other materials provided with the distribution.+    * Neither the name of the Universiteit Utrecht nor the+      names of its contributors may be used to endorse or promote products+      derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+DISCLAIMED. IN NO EVENT SHALL UNIVERSITEIT UTRECHT BE LIABLE FOR ANY+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
− LICENSE-LGPL
@@ -1,507 +0,0 @@-                  GNU LESSER GENERAL PUBLIC LICENSE-                       Version 2.1, February 1999-- Copyright (C) 1991, 1999 Free Software Foundation, Inc.-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA- Everyone is permitted to copy and distribute verbatim copies- of this license document, but changing it is not allowed.--[This is the first released version of the Lesser GPL.  It also counts- as the successor of the GNU Library Public License, version 2, hence- the version number 2.1.]--                            Preamble--  The licenses for most software are designed to take away your-freedom to share and change it.  By contrast, the GNU General Public-Licenses are intended to guarantee your freedom to share and change-free software--to make sure the software is free for all its users.--  This license, the Lesser General Public License, applies to some-specially designated software packages--typically libraries--of the-Free Software Foundation and other authors who decide to use it.  You-can use it too, but we suggest you first think carefully about whether-this license or the ordinary General Public License is the better-strategy to use in any particular case, based on the explanations-below.--  When we speak of free software, we are referring to freedom of use,-not price.  Our General Public Licenses are designed to make sure that-you have the freedom to distribute copies of free software (and charge-for this service if you wish); that you receive source code or can get-it if you want it; that you can change the software and use pieces of-it in new free programs; and that you are informed that you can do-these things.--  To protect your rights, we need to make restrictions that forbid-distributors to deny you these rights or to ask you to surrender these-rights.  These restrictions translate to certain responsibilities for-you if you distribute copies of the library or if you modify it.--  For example, if you distribute copies of the library, whether gratis-or for a fee, you must give the recipients all the rights that we gave-you.  You must make sure that they, too, receive or can get the source-code.  If you link other code with the library, you must provide-complete object files to the recipients, so that they can relink them-with the library after making changes to the library and recompiling-it.  And you must show them these terms so they know their rights.--  We protect your rights with a two-step method: (1) we copyright the-library, and (2) we offer you this license, which gives you legal-permission to copy, distribute and/or modify the library.--  To protect each distributor, we want to make it very clear that-there is no warranty for the free library.  Also, if the library is-modified by someone else and passed on, the recipients should know-that what they have is not the original version, so that the original-author's reputation will not be affected by problems that might be-introduced by others.--  Finally, software patents pose a constant threat to the existence of-any free program.  We wish to make sure that a company cannot-effectively restrict the users of a free program by obtaining a-restrictive license from a patent holder.  Therefore, we insist that-any patent license obtained for a version of the library must be-consistent with the full freedom of use specified in this license.--  Most GNU software, including some libraries, is covered by the-ordinary GNU General Public License.  This license, the GNU Lesser-General Public License, applies to certain designated libraries, and-is quite different from the ordinary General Public License.  We use-this license for certain libraries in order to permit linking those-libraries into non-free programs.--  When a program is linked with a library, whether statically or using-a shared library, the combination of the two is legally speaking a-combined work, a derivative of the original library.  The ordinary-General Public License therefore permits such linking only if the-entire combination fits its criteria of freedom.  The Lesser General-Public License permits more lax criteria for linking other code with-the library.--  We call this license the "Lesser" General Public License because it-does Less to protect the user's freedom than the ordinary General-Public License.  It also provides other free software developers Less-of an advantage over competing non-free programs.  These disadvantages-are the reason we use the ordinary General Public License for many-libraries.  However, the Lesser license provides advantages in certain-special circumstances.--  For example, on rare occasions, there may be a special need to-encourage the widest possible use of a certain library, so that it-becomes a de-facto standard.  To achieve this, non-free programs must-be allowed to use the library.  A more frequent case is that a free-library does the same job as widely used non-free libraries.  In this-case, there is little to gain by limiting the free library to free-software only, so we use the Lesser General Public License.--  In other cases, permission to use a particular library in non-free-programs enables a greater number of people to use a large body of-free software.  For example, permission to use the GNU C Library in-non-free programs enables many more people to use the whole GNU-operating system, as well as its variant, the GNU/Linux operating-system.--  Although the Lesser General Public License is Less protective of the-users' freedom, it does ensure that the user of a program that is-linked with the Library has the freedom and the wherewithal to run-that program using a modified version of the Library.--  The precise terms and conditions for copying, distribution and-modification follow.  Pay close attention to the difference between a-"work based on the library" and a "work that uses the library".  The-former contains code derived from the library, whereas the latter must-be combined with the library in order to run.---                  GNU LESSER GENERAL PUBLIC LICENSE-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION--  0. This License Agreement applies to any software library or other-program which contains a notice placed by the copyright holder or-other authorized party saying it may be distributed under the terms of-this Lesser General Public License (also called "this License").-Each licensee is addressed as "you".--  A "library" means a collection of software functions and/or data-prepared so as to be conveniently linked with application programs-(which use some of those functions and data) to form executables.--  The "Library", below, refers to any such software library or work-which has been distributed under these terms.  A "work based on the-Library" means either the Library or any derivative work under-copyright law: that is to say, a work containing the Library or a-portion of it, either verbatim or with modifications and/or translated-straightforwardly into another language.  (Hereinafter, translation is-included without limitation in the term "modification".)--  "Source code" for a work means the preferred form of the work for-making modifications to it.  For a library, complete source code means-all the source code for all modules it contains, plus any associated-interface definition files, plus the scripts used to control-compilation and installation of the library.--  Activities other than copying, distribution and modification are not-covered by this License; they are outside its scope.  The act of-running a program using the Library is not restricted, and output from-such a program is covered only if its contents constitute a work based-on the Library (independent of the use of the Library in a tool for-writing it).  Whether that is true depends on what the Library does-and what the program that uses the Library does.--  1. You may copy and distribute verbatim copies of the Library's-complete source code as you receive it, in any medium, provided that-you conspicuously and appropriately publish on each copy an-appropriate copyright notice and disclaimer of warranty; keep intact-all the notices that refer to this License and to the absence of any-warranty; and distribute a copy of this License along with the-Library.--  You may charge a fee for the physical act of transferring a copy,-and you may at your option offer warranty protection in exchange for a-fee.--  2. You may modify your copy or copies of the Library or any portion-of it, thus forming a work based on the Library, and copy and-distribute such modifications or work under the terms of Section 1-above, provided that you also meet all of these conditions:--    a) The modified work must itself be a software library.--    b) You must cause the files modified to carry prominent notices-    stating that you changed the files and the date of any change.--    c) You must cause the whole of the work to be licensed at no-    charge to all third parties under the terms of this License.--    d) If a facility in the modified Library refers to a function or a-    table of data to be supplied by an application program that uses-    the facility, other than as an argument passed when the facility-    is invoked, then you must make a good faith effort to ensure that,-    in the event an application does not supply such function or-    table, the facility still operates, and performs whatever part of-    its purpose remains meaningful.--    (For example, a function in a library to compute square roots has-    a purpose that is entirely well-defined independent of the-    application.  Therefore, Subsection 2d requires that any-    application-supplied function or table used by this function must-    be optional: if the application does not supply it, the square-    root function must still compute square roots.)--These requirements apply to the modified work as a whole.  If-identifiable sections of that work are not derived from the Library,-and can be reasonably considered independent and separate works in-themselves, then this License, and its terms, do not apply to those-sections when you distribute them as separate works.  But when you-distribute the same sections as part of a whole which is a work based-on the Library, the distribution of the whole must be on the terms of-this License, whose permissions for other licensees extend to the-entire whole, and thus to each and every part regardless of who wrote-it.--Thus, it is not the intent of this section to claim rights or contest-your rights to work written entirely by you; rather, the intent is to-exercise the right to control the distribution of derivative or-collective works based on the Library.--In addition, mere aggregation of another work not based on the Library-with the Library (or with a work based on the Library) on a volume of-a storage or distribution medium does not bring the other work under-the scope of this License.--  3. You may opt to apply the terms of the ordinary GNU General Public-License instead of this License to a given copy of the Library.  To do-this, you must alter all the notices that refer to this License, so-that they refer to the ordinary GNU General Public License, version 2,-instead of to this License.  (If a newer version than version 2 of the-ordinary GNU General Public License has appeared, then you can specify-that version instead if you wish.)  Do not make any other change in-these notices.--  Once this change is made in a given copy, it is irreversible for-that copy, so the ordinary GNU General Public License applies to all-subsequent copies and derivative works made from that copy.--  This option is useful when you wish to copy part of the code of-the Library into a program that is not a library.--  4. You may copy and distribute the Library (or a portion or-derivative of it, under Section 2) in object code or executable form-under the terms of Sections 1 and 2 above provided that you accompany-it with the complete corresponding machine-readable source code, which-must be distributed under the terms of Sections 1 and 2 above on a-medium customarily used for software interchange.--  If distribution of object code is made by offering access to copy-from a designated place, then offering equivalent access to copy the-source code from the same place satisfies the requirement to-distribute the source code, even though third parties are not-compelled to copy the source along with the object code.--  5. A program that contains no derivative of any portion of the-Library, but is designed to work with the Library by being compiled or-linked with it, is called a "work that uses the Library".  Such a-work, in isolation, is not a derivative work of the Library, and-therefore falls outside the scope of this License.--  However, linking a "work that uses the Library" with the Library-creates an executable that is a derivative of the Library (because it-contains portions of the Library), rather than a "work that uses the-library".  The executable is therefore covered by this License.-Section 6 states terms for distribution of such executables.--  When a "work that uses the Library" uses material from a header file-that is part of the Library, the object code for the work may be a-derivative work of the Library even though the source code is not.-Whether this is true is especially significant if the work can be-linked without the Library, or if the work is itself a library.  The-threshold for this to be true is not precisely defined by law.--  If such an object file uses only numerical parameters, data-structure layouts and accessors, and small macros and small inline-functions (ten lines or less in length), then the use of the object-file is unrestricted, regardless of whether it is legally a derivative-work.  (Executables containing this object code plus portions of the-Library will still fall under Section 6.)--  Otherwise, if the work is a derivative of the Library, you may-distribute the object code for the work under the terms of Section 6.-Any executables containing that work also fall under Section 6,-whether or not they are linked directly with the Library itself.--  6. As an exception to the Sections above, you may also combine or-link a "work that uses the Library" with the Library to produce a-work containing portions of the Library, and distribute that work-under terms of your choice, provided that the terms permit-modification of the work for the customer's own use and reverse-engineering for debugging such modifications.--  You must give prominent notice with each copy of the work that the-Library is used in it and that the Library and its use are covered by-this License.  You must supply a copy of this License.  If the work-during execution displays copyright notices, you must include the-copyright notice for the Library among them, as well as a reference-directing the user to the copy of this License.  Also, you must do one-of these things:--    a) Accompany the work with the complete corresponding-    machine-readable source code for the Library including whatever-    changes were used in the work (which must be distributed under-    Sections 1 and 2 above); and, if the work is an executable linked-    with the Library, with the complete machine-readable "work that-    uses the Library", as object code and/or source code, so that the-    user can modify the Library and then relink to produce a modified-    executable containing the modified Library.  (It is understood-    that the user who changes the contents of definitions files in the-    Library will not necessarily be able to recompile the application-    to use the modified definitions.)--    b) Use a suitable shared library mechanism for linking with the-    Library.  A suitable mechanism is one that (1) uses at run time a-    copy of the library already present on the user's computer system,-    rather than copying library functions into the executable, and (2)-    will operate properly with a modified version of the library, if-    the user installs one, as long as the modified version is-    interface-compatible with the version that the work was made with.--    c) Accompany the work with a written offer, valid for at least-    three years, to give the same user the materials specified in-    Subsection 6a, above, for a charge no more than the cost of-    performing this distribution.--    d) If distribution of the work is made by offering access to copy-    from a designated place, offer equivalent access to copy the above-    specified materials from the same place.--    e) Verify that the user has already received a copy of these-    materials or that you have already sent this user a copy.--  For an executable, the required form of the "work that uses the-Library" must include any data and utility programs needed for-reproducing the executable from it.  However, as a special exception,-the materials to be distributed need not include anything that is-normally distributed (in either source or binary form) with the major-components (compiler, kernel, and so on) of the operating system on-which the executable runs, unless that component itself accompanies-the executable.--  It may happen that this requirement contradicts the license-restrictions of other proprietary libraries that do not normally-accompany the operating system.  Such a contradiction means you cannot-use both them and the Library together in an executable that you-distribute.--  7. You may place library facilities that are a work based on the-Library side-by-side in a single library together with other library-facilities not covered by this License, and distribute such a combined-library, provided that the separate distribution of the work based on-the Library and of the other library facilities is otherwise-permitted, and provided that you do these two things:--    a) Accompany the combined library with a copy of the same work-    based on the Library, uncombined with any other library-    facilities.  This must be distributed under the terms of the-    Sections above.--    b) Give prominent notice with the combined library of the fact-    that part of it is a work based on the Library, and explaining-    where to find the accompanying uncombined form of the same work.--  8. You may not copy, modify, sublicense, link with, or distribute-the Library except as expressly provided under this License.  Any-attempt otherwise to copy, modify, sublicense, link with, or-distribute the Library is void, and will automatically terminate your-rights under this License.  However, parties who have received copies,-or rights, from you under this License will not have their licenses-terminated so long as such parties remain in full compliance.--  9. You are not required to accept this License, since you have not-signed it.  However, nothing else grants you permission to modify or-distribute the Library or its derivative works.  These actions are-prohibited by law if you do not accept this License.  Therefore, by-modifying or distributing the Library (or any work based on the-Library), you indicate your acceptance of this License to do so, and-all its terms and conditions for copying, distributing or modifying-the Library or works based on it.--  10. Each time you redistribute the Library (or any work based on the-Library), the recipient automatically receives a license from the-original licensor to copy, distribute, link with or modify the Library-subject to these terms and conditions.  You may not impose any further-restrictions on the recipients' exercise of the rights granted herein.-You are not responsible for enforcing compliance by third parties with-this License.--  11. If, as a consequence of a court judgment or allegation of patent-infringement or for any other reason (not limited to patent issues),-conditions are imposed on you (whether by court order, agreement or-otherwise) that contradict the conditions of this License, they do not-excuse you from the conditions of this License.  If you cannot-distribute so as to satisfy simultaneously your obligations under this-License and any other pertinent obligations, then as a consequence you-may not distribute the Library at all.  For example, if a patent-license would not permit royalty-free redistribution of the Library by-all those who receive copies directly or indirectly through you, then-the only way you could satisfy both it and this License would be to-refrain entirely from distribution of the Library.--If any portion of this section is held invalid or unenforceable under-any particular circumstance, the balance of the section is intended to-apply, and the section as a whole is intended to apply in other-circumstances.--It is not the purpose of this section to induce you to infringe any-patents or other property right claims or to contest validity of any-such claims; this section has the sole purpose of protecting the-integrity of the free software distribution system which is-implemented by public license practices.  Many people have made-generous contributions to the wide range of software distributed-through that system in reliance on consistent application of that-system; it is up to the author/donor to decide if he or she is willing-to distribute software through any other system and a licensee cannot-impose that choice.--This section is intended to make thoroughly clear what is believed to-be a consequence of the rest of this License.--  12. If the distribution and/or use of the Library is restricted in-certain countries either by patents or by copyrighted interfaces, the-original copyright holder who places the Library under this License-may add an explicit geographical distribution limitation excluding those-countries, so that distribution is permitted only in or among-countries not thus excluded.  In such case, this License incorporates-the limitation as if written in the body of this License.--  13. The Free Software Foundation may publish revised and/or new-versions of the Lesser General Public License from time to time.-Such new versions will be similar in spirit to the present version,-but may differ in detail to address new problems or concerns.--Each version is given a distinguishing version number.  If the Library-specifies a version number of this License which applies to it and-"any later version", you have the option of following the terms and-conditions either of that version or of any later version published by-the Free Software Foundation.  If the Library does not specify a-license version number, you may choose any version ever published by-the Free Software Foundation.--  14. If you wish to incorporate parts of the Library into other free-programs whose distribution conditions are incompatible with these,-write to the author to ask for permission.  For software which is-copyrighted by the Free Software Foundation, write to the Free-Software Foundation; we sometimes make exceptions for this.  Our-decision will be guided by the two goals of preserving the free status-of all derivatives of our free software and of promoting the sharing-and reuse of software generally.--                            NO WARRANTY--  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.--  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH-DAMAGES.--                     END OF TERMS AND CONDITIONS---           How to Apply These Terms to Your New Libraries--  If you develop a new library, and you want it to be of the greatest-possible use to the public, we recommend making it free software that-everyone can redistribute and change.  You can do so by permitting-redistribution under these terms (or, alternatively, under the terms of the-ordinary General Public License).--  To apply these terms, attach the following notices to the library.  It is-safest to attach them to the start of each source file to most effectively-convey the exclusion of warranty; and each file should have at least the-"copyright" line and a pointer to where the full notice is found.--    <one line to give the library's name and a brief idea of what it does.>-    Copyright (C) <year>  <name of author>--    This library is free software; you can redistribute it and/or-    modify it under the terms of the GNU Lesser General Public-    License as published by the Free Software Foundation; either-    version 2.1 of the License, or (at your option) any later version.--    This library is distributed in the hope that it will be useful,-    but WITHOUT ANY WARRANTY; without even the implied warranty of-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU-    Lesser General Public License for more details.--    You should have received a copy of the GNU Lesser General Public-    License along with this library; if not, write to the Free Software-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA--Also add information on how to contact you by electronic and paper mail.--You should also get your employer (if you work as a programmer) or your-school, if any, to sign a "copyright disclaimer" for the library, if-necessary.  Here is a sample; alter the names:--  Yoyodyne, Inc., hereby disclaims all copyright interest in the-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.--  <signature of Ty Coon>, 1 April 1990-  Ty Coon, President of Vice--That's all there is to it!-
README view
@@ -1,81 +1,2 @@-Please check the right section in this file for instructions depending on how you obtained the source files.---Installing uulib from a source distribution----------------------------------------------  The source distribution can be unpacked from the-  .tar.gz files distributed in the following page:--    http://www.cs.uu.nl/wiki/HUT/Download--  System wide installation (assumming GHC is the-  Haskell compiler) can be done like this:--    ghc --make Setup.hs -o setup -package Cabal-    ./setup configure-    ./setup build-    ./setup install---Installing uulib to a non-standard location----------------------------------------------  This is useful if you don't want (or can't)-  modify system wide settings.--    ghc --make Setup.hs -o setup -package Cabal-    ./setup configure --prefix=/foo-    ./setup build-    ./setup install --user--  The last command registers the package only for-  the user.---Installing uulib from the subversion repository--------------------------------------------------  Which can be obtained running the following subversion command:--    svn co https://svn.cs.uu.nl:12443/repos/uust-repo/uulib/trunk/--  Now install following the instructions below:--    autoconf-    ./configure-  -  NOTE: the above instructions are REQUIRED when you install from the-  subversion repository. They are not needed when you download a-  source distribution.--  This generates uulib.cabal which is needed for the cabal commands:--    ghc --make Setup.hs -o setup -package Cabal-    ./setup configure-    ./setup build-    ./setup install--  If you want to install to a non-standard location-  you don't need to pass a path to configure, just follow-  the steps outlined above.--Source tarball (uploadable to hackage)-----------------------------------------  Use the "sdist" cabal command:--    ghc --make Setup.hs -o setup -package Cabal-    ./setup configure-    ./setup sdist--  You will find the tarball in the dist directory.--Optionally generating Haddock Documentation----------------------------------------------  Requires cpphs 0.9-  Output generated in dist/doc/html--    ./setup haddock-+This is a conventional cabal package and can be+installed accordingly.
Setup.hs view
@@ -1,3 +1,3 @@-+module Main where import Distribution.Simple main = defaultMain
examples/bibtex/Bibtex.hs view
@@ -6,7 +6,7 @@                Department of Computer Science                Utrecht University                P.O. Box 80.089-               3508 TB UTRECHT  +               3508 TB UTRECHT                the Netherlands                swierstra@cs.uu.nl -}@@ -18,7 +18,7 @@ -} module Bibtex where import UU.Parsing-import Char+import Data.Char  newtype IS s = IS (Int,Int,[s]) @@ -32,18 +32,18 @@ instance Symbol Char where  symBefore = pred  symAfter  = succ-  + parsebib filename -- e.g. parsebib "btxdoc.bib"-  = let  showMessage (Msg expecting position action)  +  = let  showMessage (Msg expecting position action)           =  let pos = case position of                            Nothing -> "at end of file"-                           Just s  -> case action of +                           Just s  -> case action of                                 Insert _ -> "before " ++ show s-                                Delete t -> "at " ++ show t  +                                Delete t -> "at " ++ show t              in "\n?? Error      : " ++ pos ++                 "\n?? Expecting  : " ++ show expecting ++-                "\n?? Repaired by: " ++ show action ++ "\n" +                "\n?? Repaired by: " ++ show action ++ "\n"     in do input <- readFile filename           res   <- parseIOMessage showMessage  pBibData (IS (1,1,input))           putStr ("\nResult:" ++ show (length res) ++ " bib items were parsed\n")@@ -60,7 +60,7 @@  type Field    = (String, [ValItem]) -data ValItem  = StringVal String          +data ValItem  = StringVal String 	      | IntVal    Int 	      | NameUse   String 	      deriving Show@@ -72,20 +72,20 @@ pBibData    = pChainr ((\ entry  _ right -> entry:right) <$> pBibEntry)                       ( [] <$ pList (allChars `pExcept` "@")) -pBibEntry   +pBibEntry  =  (   Entry     <$ pAt <*> pName           <*> pOpenClose (   pKeyName       <*  pSpec ','-		                                                          <+> pListSep_ng pComma pField +		                                                          <+> pListSep_ng pComma pField                                                             <* (pComma `opt` ' '))     <|> Comment   <$ pAt <*  pKey "comment"  <*> (  pCurly (pList (allChars `pExcept` "}")) 	                                               <|> pParen (pList (allChars `pExcept` ")"))                                                  )-    <|> Preamble  <$ pAt <*  pKey "preamble" <*> pOpenClose pValItems +    <|> Preamble  <$ pAt <*  pKey "preamble" <*> pOpenClose pValItems     <|> StringDef <$ pAt <*  pKey "string"   <*> pOpenClose pField-    ) +    )  pField     =  pName <* pSpec '=' <+> pValItems -pValItems  =  pList1Sep (pSpec '#') (   StringVal   <$> pString +pValItems  =  pList1Sep (pSpec '#') (   StringVal   <$> pString 	                                   <|> int_or_name <$> pName                                     )               where int_or_name s = if all isDigit s@@ -101,7 +101,7 @@  pParen      p = pPacked (pSpec '(') (pSpec ')') p pCurly      p = pPacked (pSpec '{') (pSpec '}') p-pOpenClose  p = pParen p <|> pCurly p +pOpenClose  p = pParen p <|> pCurly p pComma        = pCostSym  4 ',' ',' <* pLAYOUT pAt           = pSpec '@' @@ -114,13 +114,13 @@ pKey (s:ss)  = (:)  <$> (pSym s <|> pSym (toUpper s)) <*> pKey ss pKey []      = usererror "Scanner: You cannot have empty reserved words!" -pString +pString  = let  curlyStrings  = stringcons <$> pSym '{' <*> pConc pStringWord <*> pSym '}'         pStringWordDQ = lift       <$> pStringCharDQ <|> curlyStrings         pStringWord   = lift       <$> pStringChar   <|> curlyStrings         pStringCharDQ = allChars `pExcept` "\"{}"         pStringChar   = pStringCharDQ <|> pSym '\"'-        pConc         = pFoldr ((++),[]) +        pConc         = pFoldr ((++),[])         stringcons c1 ss c2 = [c1] ++ ss ++ [c2]    in (   pSym '"' *> pConc pStringWordDQ <* pSym '"' 	     <|> pSym '{' *> pConc pStringWord   <* pSym '}'
src/UU/PPrint.hs view
@@ -1,4 +1,4 @@--------------------------------------------------------------------------------- +-------------------------------------------------------------------------------- {-| Module      :  PPrint     Copyright   :  (c) Daan Leijen 2000, <http://www.cs.uu.nl/~daan>     Version      : $version: $@@ -9,52 +9,52 @@      Pretty print library based on Philip Wadlers "prettier printer"          "A prettier printer"-         Draft paper, April 1997, revised March 1998. +         Draft paper, April 1997, revised March 1998.          <http://cm.bell-labs.com/cm/cs/who/wadler/papers/prettier/prettier.ps>-   +     Haskell98 compatible -}---------------------------------------------------------------------------------- -module UU.PPrint +---------------------------------------------------------------------------------+module UU.PPrint         ( Doc         , Pretty, pretty-        +         , show, putDoc, hPutDoc-        +         , (<>)         , (<+>)         , (</>), (<//>)         , (<$>), (<$$>)-        +         , sep, fillSep, hsep, vsep         , cat, fillCat, hcat, vcat         , punctuate-        +         , align, hang, indent         , fill, fillBreak-        +         , list, tupled, semiBraces, encloseSep         , angles, langle, rangle         , parens, lparen, rparen         , braces, lbrace, rbrace         , brackets, lbracket, rbracket         , dquotes, dquote, squotes, squote-        +         , comma, space, dot, backslash         , semi, colon, equals-        +         , string, bool, int, integer, float, double, rational-        +         , softline, softbreak-        , empty, char, text, line, linebreak, nest, group        -        , column, nesting, width        -        +        , empty, char, text, line, linebreak, nest, group+        , column, nesting, width+         , SimpleDoc(..)         , renderPretty, renderCompact-        , displayS, displayIO                +        , displayS, displayIO         ) where -import IO      (Handle,hPutStr,hPutChar,stdout)+import System.IO      (Handle,hPutStr,hPutChar,stdout)  infixr 5 </>,<//>,<$>,<$$> infixr 6 <>,<+>@@ -72,7 +72,7 @@     = case ds of         []  -> left <> right         [d] -> left <> d <> right-        _   -> align (cat (zipWith (<>) (left : repeat sep) ds) <> right) +        _   -> align (cat (zipWith (<>) (left : repeat sep) ds) <> right)   -----------------------------------------------------------@@ -82,19 +82,19 @@ punctuate p [d]     = [d] punctuate p (d:ds)  = (d <> p) : punctuate p ds -                   + ----------------------------------------------------------- -- high-level combinators ----------------------------------------------------------- sep             = group . vsep fillSep         = fold (</>) hsep            = fold (<+>)-vsep            = fold (<$>) +vsep            = fold (<$>)  cat             = group . vcat fillCat         = fold (<//>) hcat            = fold (<>)-vcat            = fold (<$$>) +vcat            = fold (<$$>)  fold f []       = empty fold f ds       = foldr1 f ds@@ -102,7 +102,7 @@ x <> y          = x `beside` y x <+> y         = x <> space <> y x </> y         = x <> softline <> y-x <//> y        = x <> softbreak <> y   +x <//> y        = x <> softbreak <> y x <$> y         = x <> line <> y x <$$> y        = x <> linebreak <> y @@ -146,11 +146,11 @@ string ('\n':s) = line <> string s string s        = case (span (/='\n') s) of                     (xs,ys) -> text xs <> string ys-                  + bool :: Bool -> Doc bool b          = text (show b) -int :: Int -> Doc                  +int :: Int -> Doc int i           = text (show i)  integer :: Integer -> Doc@@ -164,35 +164,35 @@  rational :: Rational -> Doc rational r      = text (show r)-                  -                                                     ++ ----------------------------------------------------------- -- overloading "pretty" ----------------------------------------------------------- class Pretty a where-  pretty        :: a -> Doc +  pretty        :: a -> Doc   prettyList    :: [a] -> Doc   prettyList    = list . map pretty  instance Pretty a => Pretty [a] where   pretty        = prettyList-  + instance Pretty Doc where-  pretty        = id  -  +  pretty        = id+ instance Pretty () where   pretty ()     = text "()"  instance Pretty Bool where   pretty b      = bool b-  + instance Pretty Char where   pretty c      = char c   prettyList s  = string s-    + instance Pretty Int where   pretty i      = int i-  + instance Pretty Integer where   pretty i      = integer i @@ -201,10 +201,10 @@  instance Pretty Double where   pretty d      = double d-   + --instance Pretty Rational where---  pretty r      = rational r  +--  pretty r      = rational r  instance (Pretty a,Pretty b) => Pretty (a,b) where   pretty (x,y)  = tupled [pretty x, pretty y]@@ -215,23 +215,23 @@ instance Pretty a => Pretty (Maybe a) where   pretty Nothing        = empty   pretty (Just x)       = pretty x-    + -------------------------------------------------------------- semi primitive: fill and fillBreak +-- semi primitive: fill and fillBreak ----------------------------------------------------------- fillBreak f x   = width x (\w ->-                  if (w > f) then nest f linebreak +                  if (w > f) then nest f linebreak                              else text (spaces (f - w)))-    + fill f d        = width d (\w ->                   if (w >= f) then empty                               else text (spaces (f - w)))-        -width d f       = column (\k1 -> d <> column (\k2 -> f (k2 - k1)))        -         +width d f       = column (\k1 -> d <> column (\k2 -> f (k2 - k1)))++ ----------------------------------------------------------- -- semi primitive: Alignment and indentation -----------------------------------------------------------@@ -250,19 +250,19 @@ data Doc        = Empty                 | Char Char             -- invariant: char is not '\n'                 | Text !Int String      -- invariant: text doesn't contain '\n'-                | Line !Bool            -- True <=> when undone by group, do not insert a space +                | Line !Bool            -- True <=> when undone by group, do not insert a space                 | Cat Doc Doc                 | Nest !Int Doc                 | Union Doc Doc         -- invariant: first lines of first doc longer than the first lines of the second doc                 | Column  (Int -> Doc)                 | Nesting (Int -> Doc)-                + data SimpleDoc  = SEmpty                 | SChar Char SimpleDoc                 | SText !Int String SimpleDoc                 | SLine !Int SimpleDoc-                -                ++ empty           = Empty  char '\n'       = line@@ -277,7 +277,7 @@ beside x y      = Cat x y nest i x        = Nest i x column f        = Column f-nesting f       = Nesting f     +nesting f       = Nesting f group x         = Union (flatten x) x  flatten :: Doc -> Doc@@ -288,9 +288,9 @@ flatten (Column f)      = Column (flatten . f) flatten (Nesting f)     = Nesting (flatten . f) flatten other           = other                     --Empty,Char,Text-  -   ++ ----------------------------------------------------------- -- Renderers -----------------------------------------------------------@@ -304,43 +304,43 @@             | Cons !Int Doc Docs  renderPretty :: Float -> Int -> Doc -> SimpleDoc-renderPretty rfrac w x      -    = best 0 0 (Cons 0 x Nil)                +renderPretty rfrac w x+    = best 0 0 (Cons 0 x Nil)     where       -- r :: the ribbon width in characters       r  = max 0 (min w (round (fromIntegral w * rfrac)))-      +       -- best :: n = indentation of current line-      --         k = current column  +      --         k = current column       --        (ie. (k >= n) && (k - n == count of inserted characters)       best n k Nil      = SEmpty-      best n k (Cons i d ds)  +      best n k (Cons i d ds)         = case d of-            Empty       -> best n k ds                +            Empty       -> best n k ds             Char c      -> let k' = k+1 in seq k' (SChar c (best n k' ds))             Text l s    -> let k' = k+l in seq k' (SText l s (best n k' ds))-            Line _      -> SLine i (best i i ds)                 -            Cat x y     -> best n k (Cons i x (Cons i y ds))                +            Line _      -> SLine i (best i i ds)+            Cat x y     -> best n k (Cons i x (Cons i y ds))             Nest j x    -> let i' = i+j in seq i' (best n k (Cons i' x ds))-            Union x y   -> nicest n k (best n k (Cons i x ds))                -                                      (best n k (Cons i y ds))                +            Union x y   -> nicest n k (best n k (Cons i x ds))+                                      (best n k (Cons i y ds))              Column f    -> best n k (Cons i (f k) ds)-            Nesting f   -> best n k (Cons i (f i) ds)                            +            Nesting f   -> best n k (Cons i (f i) ds) -      --nicest :: r = ribbon width, w = page width, +      --nicest :: r = ribbon width, w = page width,       --          n = indentation of current line, k = current column       --          x and y, the (simple) documents to chose from.-      --          precondition: first lines of x are longer than the first lines of y.                                      +      --          precondition: first lines of x are longer than the first lines of y.       nicest n k x y    | fits width x  = x                         | otherwise     = y                         where                           width = min (w - k) (r - k + n)-  -                                                                                      ++ fits w x        | w < 0         = False fits w SEmpty                   = True-fits w (SChar c x)              = fits (w - 1) x                  +fits w (SChar c x)              = fits (w - 1) x fits w (SText l s x)            = fits (w - l) x fits w (SLine i x)              = True @@ -350,7 +350,7 @@ --  fast and fewer characters output, good for machines ----------------------------------------------------------- renderCompact :: Doc -> SimpleDoc-renderCompact x   +renderCompact x     = scan 0 [x]     where       scan k []     = SEmpty@@ -358,7 +358,7 @@                         Empty       -> scan k ds                         Char c      -> let k' = k+1 in seq k' (SChar c (scan k' ds))                         Text l s    -> let k' = k+l in seq k' (SText l s (scan k' ds))-                        Line _      -> SLine 0 (scan 0 ds)    +                        Line _      -> SLine 0 (scan 0 ds)                         Cat x y     -> scan k (x:y:ds)                         Nest j x    -> scan k (x:ds)                         Union x y   -> scan k (y:ds)@@ -381,7 +381,7 @@     = display simpleDoc     where       display SEmpty        = return ()-      display (SChar c x)   = do{ hPutChar handle c; display x}  +      display (SChar c x)   = do{ hPutChar handle c; display x}       display (SText l s x) = do{ hPutStr handle s; display x}       display (SLine i x)   = do{ hPutStr handle ('\n':indentation i); display x} @@ -403,7 +403,7 @@ ----------------------------------------------------------- -- insert spaces -- "indentation" used to insert tabs but tabs seem to cause--- more trouble than they solve :-) +-- more trouble than they solve :-) ----------------------------------------------------------- spaces n        | n <= 0    = ""                 | otherwise = replicate n ' '
src/UU/Parsing/Machine.hs view
@@ -66,6 +66,7 @@                                                                      (Insert sym)                                                            in StRepair c msg (k (insertSymbol sym (reportError msg state))))                               )+{- {-# INLINE libSeq  #-} {-# INLINE libSeqL #-} {-# INLINE libSeqR #-}@@ -73,6 +74,7 @@ {-# INLINE libDollarL #-} {-# INLINE libDollarR #-} {-# INLINE libSucceed #-}+-}  libSucceed v                                 =mkPR( P (\ acc -> let accv = val (acc v) in {-# SCC "machine" #-} \ k state -> accv (k state))                                                   , R id@@ -111,7 +113,10 @@ starting (Best l _  _ )    = starting l starting _                 = systemerror "UU.Parsing.Machine" "starting" +{- {-# INLINE hasSuccess #-}+-}+ hasSuccess :: Steps a s p -> Bool hasSuccess (StRepair _ _ _ ) = False hasSuccess (Best     _ _ _ ) = False @@ -247,8 +252,9 @@                                     }                      }          newOneDescr   =  maybeswap orOneOneDescr ol or False +{- {-# INLINE anaSeq #-}-+-} anaSeq libdollar libseq comb (AnaParser  pl ll zl ol)  ~rd@(AnaParser pr lr zr or)  = case zl of    Just (b, zp ) -> let newZeroDescr = seqZeroZero zl zr   libdollar libseq comb
src/UU/Parsing/MachineInterface.hs view
@@ -28,17 +28,20 @@  -- It should normally not be deleted from the state.  deleteSymbol :: s                -> state -> state  deleteSymbol _ = id- {-# INLINE splitStateE #-}+ {-+{-# INLINE splitStateE #-}  {-# INLINE splitState  #-}  {-# INLINE insertSymbol  #-}  {-# INLINE deleteSymbol  #-}+-}  class OutputState r  where   acceptR      ::                     v                   -> rest        -> r v rest   nextR        ::  (a -> rest  -> rest') -> (b -> a)      -> (r b rest)  -> rest'-  {-# INLINE acceptR #-}+{-+{-# INLINE acceptR #-}   {-# INLINE nextR   #-}-+-} class Symbol s where  deleteCost :: s -> Int#  symBefore  :: s -> s
src/UU/Parsing/Perms.hs view
@@ -3,7 +3,7 @@ module UU.Parsing.Perms(Perms(), pPerms, pPermsSep, succeedPerms, (~*~), (~$~)) where  import UU.Parsing-import Maybe+import Data.Maybe  -- ======================================================================================= -- ===== PERMUTATIONS ================================================================@@ -16,7 +16,7 @@   fmap f (Perms (mb, bs)) = Perms (fmap (f<$>) mb, map (fmap f) bs)  instance IsParser p s => Functor (Br p) where-  fmap f (Br perm p) = Br (fmap (f.) perm) p +  fmap f (Br perm p) = Br (fmap (f.) perm) p  (~*~) :: IsParser p s => Perms p (a -> b) -> p a -> Perms p b perms ~*~ p = perms `add` (getzerop p, getonep p)@@ -25,7 +25,7 @@ f     ~$~ p = succeedPerms f ~*~ p  succeedPerms :: IsParser p s => a -> Perms p a-succeedPerms x = Perms (Just (pLow x), []) +succeedPerms x = Perms (Just (pLow x), [])  add :: IsParser p s => Perms p (a -> b) -> (Maybe (p a),Maybe (p a)) -> Perms p b add b2a@(Perms (eb2a, nb2a)) bp@(eb, nb)@@ -42,7 +42,7 @@         )[ Br ((flip `changing` c) `add`  bp) d |  Br c d <- nb2a]       ) -pPerms :: IsParser p s => Perms p a -> p a +pPerms :: IsParser p s => Perms p a -> p a pPerms (Perms (empty,nonempty))  = foldl (<|>) (fromMaybe pFail empty) [ (flip ($)) <$> p <*> pPerms pp                                        | Br pp  p <- nonempty@@ -51,8 +51,8 @@ pPermsSep :: IsParser p s => p x -> Perms p a -> p a pPermsSep (sep :: p z) perm = p2p (pSucceed ()) perm  where  p2p ::  p () -> Perms p a -> p a-        p2p fsep (Perms (mbempty, nonempties)) = +        p2p fsep (Perms (mbempty, nonempties)) =                 let empty          = fromMaybe  pFail mbempty                     pars (Br t p)  = flip ($) <$ fsep <*> p <*> p2p_sep t-                in foldr (<|>) empty (map pars nonempties)              -        p2p_sep =  p2p (()<$ sep)                                    +                in foldr (<|>) empty (map pars nonempties)+        p2p_sep =  p2p (()<$ sep)
src/UU/Scanner/Scanner.hs view
@@ -1,8 +1,8 @@ module UU.Scanner.Scanner where -import Char(isLower, isUpper, isSpace, isAlphaNum, isDigit, chr, ord)-import List(sort)-import Maybe(isJust)+import Data.Char(isLower, isUpper, isSpace, isAlphaNum, isDigit, chr, ord)+import Data.List(sort)+import Data.Maybe(isJust) import UU.Util.BinaryTrees(tab2tree,btLocateIn) import UU.Scanner.Token(Token, EnumValToken(..), valueToken, reserved, errToken) import UU.Scanner.Position(Pos, initPos, advc, adv)@@ -41,9 +41,9 @@  -}  scanFile :: [String] -> [String] -> String -> String -> FilePath -> IO [Token]-scanFile keywordstxt keywordsops specchars opchars fn = +scanFile keywordstxt keywordsops specchars opchars fn =         do txt <- readFile fn-           return (scan keywordstxt keywordsops specchars opchars (initPos fn) txt) +           return (scan keywordstxt keywordsops specchars opchars (initPos fn) txt)  scan :: [String] -> [String] -> String -> String -> Pos -> String -> [Token] scan keywordstxt keywordsops specchars opchars pos input@@ -96,14 +96,14 @@                                    let (name,p1,rest) = scanIdent (advc 2 p) s                                        ident = c:name                                        tokens | null rest ||-                                                head rest /= '`' = errToken "Unterminated infix identifier" p +                                                head rest /= '`' = errToken "Unterminated infix identifier" p                                                                  : doScan p1 rest-                                              | iskw ident       = errToken ("Keyword used as infix identifier: " ++ ident) p +                                              | iskw ident       = errToken ("Keyword used as infix identifier: " ++ ident) p                                                                  : doScan (advc 1 p1) (tail rest)-                                              | otherwise        = valueToken TkOp ident p +                                              | otherwise        = valueToken TkOp ident p                                                                  : doScan (advc 1 p1) (tail rest)                                    in tokens-                          | otherwise = errToken ("Unexpected character in infix identifier: " ++ show c) p +                          | otherwise = errToken ("Unexpected character in infix identifier: " ++ show c) p                                       : doScan (adv p c) s                   in res    -}@@ -152,9 +152,9 @@ err lc fn 2    = error ("in scanner not a valid name in file inclusion" ++ maybeshow (lc)) -}-lexNest :: (Pos -> String -> [Token]) -        -> Pos -        -> String +lexNest :: (Pos -> String -> [Token])+        -> Pos+        -> String         -> [Token] lexNest cont pos inp = lexNest' cont pos inp  where lexNest' c p ('-':'}':s) = c (advc 2 p) s
src/UU/Util/PermTree.hs view
@@ -1,20 +1,20 @@-module UU.Util.PermTree where +module UU.Util.PermTree where -import Monad(ap,liftM2)+import Control.Monad(ap,liftM2)  ------------------------------------------------------------------------------------ -- data type for permutation trees ------------------------------------------------------------------------------------  data Perms p a  = Choice (Maybe a) [Branch p a]-data Branch p a = forall x . Br  (p x) (Perms p  (x->a))   +data Branch p a = forall x . Br  (p x) (Perms p  (x->a))  ------------------------------------------------------------------------------------ -- definition of fmap on permutation trees ------------------------------------------------------------------------------------  instance Functor (Perms p) where-  fmap f (Choice e bs) = Choice (fmap f e) (map (fmap f) bs) +  fmap f (Choice e bs) = Choice (fmap f e) (map (fmap f) bs)  instance Functor (Branch p) where   fmap f (Br p ps) = Br p (fmap (f.) ps)@@ -32,26 +32,26 @@ add :: Maybe a -> p a -> Perms p (a->b) -> Perms p b add da pa tab@(Choice dab bsab) = let empty = dab `ap` da                                       insert (Br px txab) = Br px (add da pa (fmap flip txab))-                                  in Choice empty (Br pa tab:map insert bsab)   -                            -                      +                                  in Choice empty (Br pa tab:map insert bsab)++ ------------------------------------------------------------------------------------ -- permutation construction combinators ------------------------------------------------------------------------------------ empty         :: a -> Perms p a-empty x       =  Choice (Just x) [] +empty x       =  Choice (Just x) []   (<$$>)        :: (a->b) -> p a -> Perms p b-f <$$> p      =  empty f <||> p     +f <$$> p      =  empty f <||> p  (<$?>)        :: (a->b) -> (a, p a) -> Perms p b-f <$?> (e,p)  =  empty f <|?> (e,p) +f <$?> (e,p)  =  empty f <|?> (e,p)  (<||>)        :: Perms p (a->b) -> p a -> Perms p b ps <||> p     =  add Nothing p ps  (<|?>)        :: Perms p (a->b) -> (a, p a) -> Perms p b-ps <|?> (e,p) =  add (Just e) p ps +ps <|?> (e,p) =  add (Just e) p ps  
uulib.cabal view
@@ -1,31 +1,25 @@-cabal-version: >=1.1+cabal-version: >= 1.6 build-type: Simple name: uulib-version: 0.9.13-license: LGPL+version: 0.9.14+license: BSD3 license-file: COPYRIGHT-maintainer: Arie Middelkoop <ariem@cs.uu.nl>+maintainer: S. Doaitse Swierstra homepage: http://www.cs.uu.nl/wiki/HUT/WebHome description: Fast Parser Combinators and Pretty Printing Combinators synopsis: Haskell Utrecht Tools Library category: Parsing stability: Stable copyright: Universiteit Utrecht-cabal-version: >= 1.2-extra-source-files: README, LICENSE-LGPL,+extra-source-files: README,                     examples/bibtex/Bibtex.hs,                     examples/parser/Example.hs,                     examples/parser/Makefile,                     examples/parser/README,                     examples/parser/Scanner.x-flag have_ghc_prim-  description: ghc-prim as separate module+ library-  if flag(have_ghc_prim)-    build-depends: base>=4 && <10, ghc-prim-  else-    build-depends: base<4-  build-depends: haskell98+  build-depends: base>=4 && <5, ghc-prim >= 0.2.0.0   exposed-modules: UU.Parsing.CharParser UU.Parsing.Derived                    UU.Parsing.Interface UU.Parsing.MachineInterface                    UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms@@ -36,7 +30,7 @@                    UU.Scanner.Position UU.Scanner.Scanner                    UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow                    UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils-                   UU.Pretty.Basic UU.Parsing.Machine    +                   UU.Pretty.Basic UU.Parsing.Machine   extensions:  RankNTypes FunctionalDependencies TypeSynonymInstances UndecidableInstances FlexibleInstances MultiParamTypeClasses FlexibleContexts CPP ExistentialQuantification+  ghc-options: -O0   hs-source-dirs: src-