From b3046101737a7bcc72415625e9dcffc9e83e66c4 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Thu, 9 Aug 2012 10:45:46 -0400 Subject: [PATCH 1/1] An initial checkin of a parser and some ANF stuff --- LICENSE | 661 ++++++++++++++++++++++++++++ README | 12 + dyna.cabal | 56 +++ src/Dyna/NormalizeParse.hs | 204 +++++++++ src/Dyna/ParserHS/Parser.hs | 192 ++++++++ src/Dyna/ParserHS/ParserSelftest.hs | 244 ++++++++++ src/Dyna/Test/Trifecta.hs | 34 ++ src/Dyna/XXX/README | 2 + src/Dyna/XXX/Trifecta.hs | 26 ++ 9 files changed, 1431 insertions(+) create mode 100644 LICENSE create mode 100644 README create mode 100644 dyna.cabal create mode 100644 src/Dyna/NormalizeParse.hs create mode 100644 src/Dyna/ParserHS/Parser.hs create mode 100644 src/Dyna/ParserHS/ParserSelftest.hs create mode 100644 src/Dyna/Test/Trifecta.hs create mode 100644 src/Dyna/XXX/README create mode 100644 src/Dyna/XXX/Trifecta.hs diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, 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 +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/README b/README new file mode 100644 index 0000000..79a226e --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +An overview of the source tree +------------------------------ + +src/Dyna/ParserHS -- the Haskell front-end parser and selftests + +src/Dyna/Term -- Different representations of terms and + utilities + +src/Dyna/Test -- code used by self-tests throughout the codebase + +src/Dyna/XXX -- code that should probably go upstream; + modules here are named by the upstream package. diff --git a/dyna.cabal b/dyna.cabal new file mode 100644 index 0000000..077492c --- /dev/null +++ b/dyna.cabal @@ -0,0 +1,56 @@ +---------------------------------------------------------------- + +Name: dyna +Version: 0.3.5 +Cabal-Version: >= 1.14 +Build-Type: Simple +Stability: alpha +Copyright: Copyright (c) 2007--2012, + Nathaniel W. Filardo, wren ng thornton +License: OtherLicense +License-File: LICENSE +Author: Nathaniel W. Filardo, wren ng thornton +Maintainer: haskell@dyna.org +Homepage: http://www.dyna.org/ +Category: Compilers/Interpreters +Synopsis: Interpreter for the Dyna language +Description: A weighted logic programming language for dynamic + programming and natural language processing. Features + include memoization, both forward- and backward-chaining, + and namespace modularity. + +Library + Default-Language: Haskell2010 + Hs-Source-Dirs: src + + Exposed-Modules: Dyna.ParserHS.Parser + + Build-Depends: base >=4, + bytestring >= 0.9, + semigroups >=0.8, + trifecta >=0.53, + unification-fd, + unordered-containers>=0.2, + utf8-string >=0.3 + +Test-suite dyna-selftest-parser + type: exitcode-stdio-1.0 + Default-Language: Haskell2010 + Hs-Source-Dirs: src + + Build-Depends: base >= 4, + bytestring >=0.9, + containers >=0.4, + HUnit >=1.2, + semigroups >=0.8, + test-framework >=0.6, + test-framework-hunit >= 0.2, + test-framework-th >= 0.2, + trifecta >=0.53, + unordered-containers>=0.2, + utf8-string >=0.3 + + Main-Is: Dyna/ParserHS/ParserSelftest.hs + +---------------------------------------------------------------- +----------------------------------------------------------- fin. diff --git a/src/Dyna/NormalizeParse.hs b/src/Dyna/NormalizeParse.hs new file mode 100644 index 0000000..7cb3377 --- /dev/null +++ b/src/Dyna/NormalizeParse.hs @@ -0,0 +1,204 @@ +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE NoMonomorphismRestriction #-} +{-# LANGUAGE OverloadedStrings #-} + +module Dyna.NormalizeParse where + +-- import Control.Arrow +import Control.Monad.Reader +import Control.Monad.State +import qualified Data.ByteString.UTF8 as BU +import qualified Data.ByteString as B +import qualified Data.Map as M +import qualified Data.Set as S +import qualified Text.Trifecta as T + +import qualified Dyna.ParserHS.Parser as P +import Dyna.Test.Trifecta -- XXX + +data Term = TFunctor !B.ByteString ![Term] + | TVar !B.ByteString + deriving (Eq,Ord,Show) + -- The Ord instance is only there for the use of M.Map and S.Set + -- and should not be relied upon to be meaningful in any sense. + +data Rule = Rule !Term !B.ByteString ![Term] !Term + deriving (Eq,Ord,Show) + +-- | A map from (functor,arity) to a list of bits indicating whether to +-- (True) or not to (False) evaluate that positional argument. +-- +-- XXX This isn't going to work when we get more complicated terms. +-- +-- XXX Stronger type desired: we'd like static assurance that the +-- length of the list matches the arity in the key! +-- +-- XXX What do we do about certain atoms that don't evaluate? I don't +-- think I have handled it correctly here. Maybe we should revisit the +-- "primitives don't evaluate" thing, but that doesn't help for things +-- like "pair/2" which we (presumably) want to be (preferentially) +-- structure-building. +-- +data ANFDict = AD + { ad_arg_dispos :: M.Map (B.ByteString,Int) [Bool] + , ad_self_dispos :: S.Set (B.ByteString,Int) + } + + +{- This stage of ANF does not actually link evaluations to + - their semantic interpretation. That is, we have not yet + - resolved foreign function calls. + -} +data ANFState = AS + { as_next :: Int + , as_evals :: S.Set (B.ByteString,Term) + } + deriving (Show) + +-- data Rule = Rule Term String Term (S.Set (String,Term)) +-- deriving (Show) + +newEval :: (MonadState ANFState m) => String -> Term -> m Term +newEval pfx t = do + evs <- gets as_evals + vn <- gets as_next + let n = BU.fromString $ pfx ++ show vn + put $ AS (vn + 1) (S.insert (n,t) evs) + return $ TVar n + + -- | Convert a syntactic term into ANF. +normalizeTerm_ :: (MonadState ANFState m, MonadReader ANFDict m) + => Bool -- ^ In an evaluation context? + -> [T.Span] -- ^ List of spans traversed + -> P.Term -- ^ Term being digested + -> m Term + + -- Variables don't evaluate and don't need to be moved +normalizeTerm_ _ _ (P.TVar v) = return $ TVar v + + + -- Quote simply disappears having converted the context to + -- a non-evaluation context. +normalizeTerm_ _ ss (P.TFunctor "&" [t T.:~ st]) = do + normalizeTerm_ False (st:ss) t + + -- Star forces evaluation even when the argument would prefer + -- to not be evaluated, thus the sort of odd "normalize in + -- nonevaluation context then eval" here. +normalizeTerm_ _ ss (P.TFunctor "*" [t T.:~ st]) = do + normalizeTerm_ False (st:ss) t >>= newEval "_normTS_" + + -- Functors have both top-down and bottom-up dispositions on + -- their handling. +normalizeTerm_ c ss (P.TFunctor f as) = do + argdispos <- asks $ maybe (repeat True) (id) . M.lookup (f,length as) . ad_arg_dispos + normas <- mapM (\(a T.:~ s,d) -> normalizeTerm_ d (s:ss) a) (zip as argdispos) + selfdispos <- getSelfDispos + (if c && selfdispos then newEval "_normTF_" else return) $ TFunctor f normas + where + getSelfDispos = do + set <- asks $ not . S.member (f,length as) . ad_self_dispos + -- XXX numerics + return set + + +normalizeTerm :: (MonadState ANFState m, MonadReader ANFDict m) + => Bool -- ^ In an evaluation context? + -> T.Spanned P.Term -- ^ Term to digest + -> m Term +normalizeTerm c (t T.:~ s) = normalizeTerm_ c [s] t + + -- XXX +dynaFunctorArgDispositions :: M.Map (B.ByteString,Int) [Bool] +dynaFunctorArgDispositions = M.fromList [ + (("is",2),[False,True]) + ] + + -- XXX + -- + -- Functors which prefer not to be evaluated +dynaFunctorSelfDispositions :: S.Set (B.ByteString,Int) +dynaFunctorSelfDispositions = S.fromList + [ ("true",0) + , ("false",0) + , ("pair",2) + ] + + -- XXX +run = flip runStateT (AS 0 S.empty) . + flip runReaderT (AD dynaFunctorArgDispositions dynaFunctorSelfDispositions) + + -- XXX +testNormTerm = run . normalizeTerm False . unsafeParse P.dterm + +normalizeRule (P.Fact t T.:~ _) = do + nt <- normalizeTerm False t + return $ Rule nt ":-" [] (TFunctor "true" []) +normalizeRule (P.Rule h a es r T.:~ _) = do + nh <- normalizeTerm False h + nr <- normalizeTerm True r + nes <- mapM (normalizeTerm True) es + return $ Rule nh a nes nr + +testNormRule = run . normalizeRule . unsafeParse P.drule + +{- +neis e = newEval "_normE_" $ \v -> EIs v e +neiis i e = newEval "_normEI_" $ \v -> EIndir v i e + +normalizeExpr :: Maybe String -> Bool -> P.Expr -> State NormState Term +normalizeExpr Nothing c (P.ETerm t) = normalizeTerm neis c t +normalizeExpr (Just i) c (P.ETerm t) = normalizeTerm (neiis i) c t + +normalizeExpr mi True (P.ENew e) = do + e' <- normalizeExpr mi True e + case e' of + TVar ne' -> newEval "_normEN_" $ \v -> ENew v ne' + _ -> error "New construct did not reduce to variable (help?)" + +normalizeExpr mi c (P.EExpr e1 o e2) = do + e1' <- normalizeExpr mi True e1 + e2' <- normalizeExpr mi True e2 + (if c then maybe neis neiis mi else return) $ TFunctor o [e1', e2'] + +normalizeExpr mi True (P.EIndir td ti) = do + td' <- normalizeTerm eh True td + case td' of + TVar ntd' -> normalizeExpr (Just ntd') True ti + _ -> error "Indirection LHS did not reduce to variable (help?)" + where eh = maybe neis neiis mi + +normalizeExpr _ False (P.ENew _) = error "New in nonevaluation context (help?)" +normalizeExpr _ False (P.EIndir _ _) = error "Indirection in nonevaluation context (help?)" + +testNormExpr c s = let x = P.dynaExpr $ L.alexScanTokens s in + (x, runState (normalizeExpr Nothing c x) (NS 0 [])) + + +nvis t = newEval "_normV_" $ \v -> EIs v t + +normalizeEval :: P.Eval -> State NormState Eval +normalizeEval (P.EIs s e) = liftM (EIs s) $ normalizeExpr Nothing True e +normalizeEval (P.EEq t1 t2) = do + t1' <- normalizeTerm nvis False t1 + t2' <- normalizeTerm nvis False t2 + return $ EEq t1' t2' + + +nris t = newEval "_normR_" $ \v -> EIs v t + +normalizeRule_ :: P.Rule -> State NormState Rule +normalizeRule_ (P.Rule h (P.Aggr a) r es) = do + h' <- normalizeTerm nris False h + r' <- normalizeExpr Nothing True r + es' <- mapM normalizeEval es + return $ Rule h' a r' es' + +normalizeRule :: P.Rule -> Rule +normalizeRule r = + let (Rule h a v es, NS _ es') = runState (normalizeRule_ r) (NS 0 []) + in Rule h a v (es++es') + +testNormRule :: String -> Rule +testNormRule s = let r = P.dynaRule $ L.alexScanTokens s in normalizeRule r +-} diff --git a/src/Dyna/ParserHS/Parser.hs b/src/Dyna/ParserHS/Parser.hs new file mode 100644 index 0000000..3802dbc --- /dev/null +++ b/src/Dyna/ParserHS/Parser.hs @@ -0,0 +1,192 @@ +{-# LANGUAGE NoMonomorphismRestriction #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE Rank2Types #-} + +-- Based in part on +-- https://github.com/ekmett/trifecta/blob/master/examples/RFC2616.hs +-- as well as the trifecta code itself +-- +-- TODO: +-- We might want to use T.T.Literate, too, in the end. +-- Doesn't understand dynabase literals ("{ ... }") +-- Doesn't handle parenthesized aggregators +-- Doesn't handle shared subgoals ("whenever ... { ... }") +-- Doesn't understand "foo." style rules. + +module Dyna.ParserHS.Parser ( + Term(..), dterm, dtexpr, + Rule(..), drule, Line(..), dline, dlines +) where + +import Control.Applicative +import qualified Data.ByteString.UTF8 as BU +import qualified Data.ByteString as B +import Data.Char (isSpace) +import qualified Data.HashSet as H +import Data.Semigroup ((<>)) +import Data.Monoid (mempty) +import Text.Trifecta +import Text.Trifecta.Highlight.Prim +import Text.Trifecta.Parser.Expr +import Text.Trifecta.Parser.Token.Style + +import Dyna.XXX.Trifecta (identNL, pureSpanned) + +data Term = TFunctor {-# UNPACK #-} !B.ByteString ![Spanned Term] + | TVar {-# UNPACK #-} !B.ByteString + -- | TDBLit XXX + deriving (Eq,Ord,Show) + +dynaDotOperStyle :: MonadParser m => IdentifierStyle m +dynaDotOperStyle = IdentifierStyle + { styleName = "Dot Operator" + , styleStart = () <$ char '.' + , styleLetter = () <$ oneOf "!#$%&*+/<=>?@\\^|-~:." + , styleReserved = mempty + , styleHighlight = Operator + , styleReservedHighlight = ReservedOperator + } + +dynaOperStyle :: MonadParser m => IdentifierStyle m +dynaOperStyle = IdentifierStyle + { styleName = "Operator" + , styleStart = () <$ oneOf "!#$%&*+/<=>?@\\^|-~:" + , styleLetter = () <$ oneOf "!#$%&*+/<=>?@\\^|-~:." + , styleReserved = mempty + , styleHighlight = Operator + , styleReservedHighlight = ReservedOperator + } + +dynaAtomStyle :: MonadParser m => IdentifierStyle m +dynaAtomStyle = IdentifierStyle + { styleName = "Atom" + , styleStart = () <$ (lower <|> digit <|> char '_') + , styleLetter = () <$ (alphaNum <|> oneOf "_'") + , styleReserved = H.fromList [ "is", "new", "whenever" ] + , styleHighlight = Constant + , styleReservedHighlight = ReservedOperator + } + +dynaVarStyle :: MonadParser m => IdentifierStyle m +dynaVarStyle = IdentifierStyle + { styleName = "Variable" + , styleStart = () <$ (upper <|> char '_') + , styleLetter = () <$ (alphaNum <|> oneOf "_'") + , styleReserved = mempty + , styleHighlight = Identifier + , styleReservedHighlight = ReservedIdentifier + } + +dynaCommentStyle :: CommentStyle +dynaCommentStyle = CommentStyle + { commentStart = "{%" -- XXX? + , commentEnd = "%}" -- XXX? + , commentLine = "%" + , commentNesting = True + } + +dynaLanguage :: (MonadParser m) + => LanguageDef m +dynaLanguage = LanguageDef + { languageCommentStyle = dynaCommentStyle + , languageIdentifierStyle = undefined -- dynaAtomStyle (XXX) + , languageOperatorStyle = undefined -- dynaOperStyle (XXX) + } + +atom :: MonadParser m => m B.ByteString +atom = liftA BU.fromString stringLiteral + <|> ident dynaAtomStyle + +-- sparen :: MonadParser m => m a -> m a +-- sparen = between (char '(' *> spaces) (spaces <* char ')') + +term :: MonadParser m => m (Spanned Term) +term = lexeme $ choice + [ parens texpr + , spanned $ TVar <$> (ident dynaVarStyle) + , try $ spanned $ flip TFunctor [] <$> atom <* (notFollowedBy $ char '(') + , spanned $ parenfunc + ] + where + parenfunc = TFunctor <$> (highlight Identifier atom "Functor") + <*> parens (texpr `sepBy` symbolic ',') + +-- XXX right now all binops are at equal precedence and left-associative; that's wrong. +texpr :: MonadParser m => m (Spanned Term) +texpr = buildExpressionParser etable term "Expression" + where + etable = [ [ Prefix $ uf (spanned $ symbol "new") ] + , [ Prefix $ uf (spanned $ ident dynaOperStyle) ] + , [ Infix (bf (spanned $ ident dynaOperStyle)) AssocLeft ] + , [ Infix (bf (spanned $ dotOper)) AssocRight ] + , [ Infix (bf (spanned $ symbol "is")) AssocNone ] + ] + + -- The dot operator is required to have not-a-space following (to avoid + -- confusion with the end-of-rule marker, which is taken to be "dot space" + -- or "dot eof"). + dotAny = char '.' <* satisfy (not . isSpace) + dotOper = try (lookAhead dotAny *> identNL dynaDotOperStyle) + + uf f = do + (x:~spx) <- f + pure (\a@(_:~sp) -> (TFunctor x [a]):~(spx <> sp)) + bf f = do + (x:~spx) <- f + pure (\a@(_:~spa) b@(_:~spb) -> (TFunctor x [a,b]):~(spa <> spx <> spb)) + +hriss = highlight ReservedOperator . spanned . symbol + +dynafy :: MonadParser m => Language m a -> m a +dynafy = flip runLanguage dynaLanguage + +dterm, dtexpr :: MonadParser m => m (Spanned Term) +dterm = dynafy term +dtexpr = dynafy texpr + +-- | Rules are not just terms because we want to make it very syntactically +-- explicit about the head being a term (though that's not an expressivity +-- concern -- just use the parenthesized texpr case) so that there is no +-- risk of parsing ambiguity. +-- +-- XXX The span on Fact is a little silly +data Rule = Fact (Spanned Term) + | Rule !(Spanned Term) !B.ByteString ![Spanned Term] !(Spanned Term) + deriving (Eq,Ord,Show) + +-- XXX The span on LRule is a little silly +-- XXX Having one kind of Pragma is probably wrong +data Line = LRule (Spanned Rule) + | LPragma !(Spanned Term) + deriving (Eq,Ord,Show) + +rulepfx = Rule <$> term + <* spaces + <*> (ident dynaOperStyle "Aggregator") + +rule = choice [(try (liftA flip rulepfx + <*> texpr + <* hriss "whenever")) + <*> (texpr `sepBy1` symbolic ',') + + , (try rulepfx) + <*> many (try (texpr <* symbolic ',')) + <*> texpr + + , Fact <$> term + ] + +drule = spanned rule + +progline :: MonadParser m => m (Spanned Line) +progline = spanned $ choice [ LRule <$> drule + , LPragma <$> (symbol ":-" + *> spaces + *> texpr) + ] + +dline :: MonadParser m => m (Spanned Line) +dline = dynafy (progline <* optional (char '.' <* (spaces <|> eof))) + +dlines :: MonadParser m => m [Spanned Line] +dlines = dynafy (progline `sepEndBy` (char '.' <* spaces)) diff --git a/src/Dyna/ParserHS/ParserSelftest.hs b/src/Dyna/ParserHS/ParserSelftest.hs new file mode 100644 index 0000000..fdcd79f --- /dev/null +++ b/src/Dyna/ParserHS/ParserSelftest.hs @@ -0,0 +1,244 @@ +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE Rank2Types #-} +{-# LANGUAGE OverloadedStrings #-} + +-- TODO: +-- Writing these is still too hard, Template Haskell and the REPL +-- notwithstanding. +-- +-- Test.Framework.TH appears not to understand comments at the +-- moment, and parses right through them. + +-- XXX Cabal doesn't understand Main-Is in quite the right way +-- module Dyna.ParserHS.ParserSelftest where + +import Control.Applicative ((<*)) +import Data.ByteString (ByteString) +import Data.Foldable (toList) +import Data.Monoid (mempty) +import qualified Data.Sequence as S +import Data.String +import Test.Framework.Providers.HUnit +import Test.Framework.TH +import Test.HUnit +import Text.Trifecta + +import Dyna.Test.Trifecta +import Dyna.ParserHS.Parser + + +term :: ByteString -> Spanned Term +term = unsafeParse dterm + +case_basicAtom = e @=? (term "foo") + where e = TFunctor "foo" [] :~ Span (Columns 0 0) (Columns 3 3) "foo" + +case_basicAtomTWS = e @=? (term "foo ") + where e = TFunctor "foo" [] :~ Span (Columns 0 0) (Columns 4 4) "foo " + +case_basicFunctor = e @=? (term sfb) + where + e = TFunctor "foo" + [TFunctor "bar" [] :~ Span (Columns 4 4) (Columns 7 7) sfb + ] + :~ Span (Columns 0 0) (Columns 8 8) sfb + + sfb :: (IsString s) => s + sfb = "foo(bar)" + +case_nestedFunctorsWithArgs = e @=? (term st) + where + e = TFunctor "foo" + [TFunctor "bar" [] :~ Span (Columns 4 4) (Columns 7 7) st + ,TVar "X" :~ Span (Columns 8 8) (Columns 9 9) st + ,TFunctor "bif" [] :~ Span (Columns 10 10) (Columns 15 15) st + ,TFunctor "baz" + [TFunctor "quux" [] :~ Span (Columns 20 20) (Columns 24 24) st + ,TVar "Y" :~ Span (Columns 25 25) (Columns 26 26) st + ] + :~ Span (Columns 16 16) (Columns 27 27) st + ] + :~ Span (Columns 0 0) (Columns 28 28) st + + st :: (IsString s) => s + st = "foo(bar,X,bif(),baz(quux,Y))" + + +case_basicFunctorTWS = e @=? (term sfb) + where + e = TFunctor "foo" + [TFunctor "bar" [] :~ Span (Columns 5 5) (Columns 9 9) sfb + ] :~ Span (Columns 0 0) (Columns 10 10) sfb + + sfb :: (IsString s) => s + sfb = "foo (bar )" + +case_basicFunctorNL = e @=? (term sfb) + where + e = TFunctor "foo" + [TFunctor "bar" [] :~ Span (Lines 1 1 5 1) (Lines 1 5 9 5) "(bar )" + ] :~ Span (Columns 0 0) (Lines 1 6 10 6) "foo\n" + + sfb :: (IsString s) => s + sfb = "foo\n(bar )" + +case_colonFunctor = e @=? (term pvv) + where + e = TFunctor "possible" + [TFunctor ":" + [TVar "Var" :~ Span (Columns 9 9) (Columns 12 12) pvv + ,TVar "Val" :~ Span (Columns 13 13) (Columns 16 16) pvv + ] + :~ Span (Columns 9 9) (Columns 16 16) pvv + ] + :~ Span (Columns 0 0) (Columns 17 17) "possible(Var:Val)" + pvv = "possible(Var:Val)" + +case_failIncompleteExpr = checkParseFail dterm "foo +" + [(Right (Columns 4 4), "expected: \"(\", end of input")] + +progline :: ByteString -> Spanned Line +progline = unsafeParse dline + +proglines :: ByteString -> [Spanned Line] +proglines = unsafeParse dlines + +case_ruleSimple = e @=? (progline sr) + where + e = LRule (Rule (TFunctor "goal" [] :~ Span (Columns 0 0) (Columns 5 5) sr) + "+=" + [] + (TFunctor "1" [] :~ Span (Columns 8 8) (Columns 10 10) sr) + :~ Span (Columns 0 0) (Columns 10 10) sr) + :~ Span (Columns 0 0) (Columns 10 10) sr + sr = "goal += 1 ." + +case_ruleExpr = e @=? (progline sr) + where + e = LRule (Rule (TFunctor "goal" [] :~ Span (Columns 0 0) (Columns 5 5) sr) + "+=" + [] + (TFunctor "+" + [TFunctor "foo" [] :~ Span (Columns 8 8) (Columns 12 12) sr + ,TFunctor "bar" [] :~ Span (Columns 14 14) (Columns 18 18) sr + ] + :~ Span (Columns 8 8) (Columns 18 18) sr + ) + :~ Span (Columns 0 0) (Columns 18 18) sr) + :~ Span (Columns 0 0) (Columns 18 18) sr + sr = "goal += foo + bar ." + +case_ruleDotExpr = e @=? (progline sr) + where + e = LRule (Rule (TFunctor "goal" [] :~ Span (Columns 0 0) (Columns 5 5) sr) + "+=" + [] + (TFunctor "." + [TFunctor "foo" [] :~ Span (Columns 8 8) (Columns 11 11) sr + ,TFunctor "bar" [] :~ Span (Columns 12 12) (Columns 15 15) sr + ] + :~ Span (Columns 8 8) (Columns 15 15) sr + ) + :~ Span (Columns 0 0) (Columns 15 15) sr) + :~ Span (Columns 0 0) (Columns 15 15) sr + sr = "goal += foo.bar." + +case_ruleComma = e @=? (progline sr) + where + e = LRule (Rule (TFunctor "foo" [] :~ Span (Columns 0 0) (Columns 4 4) sr) + "+=" + [TFunctor "bar" + [TVar "X" :~ Span (Columns 11 11) (Columns 12 12) sr] + :~ Span (Columns 7 7) (Columns 13 13) sr + ,TFunctor "baz" + [TVar "X" :~ Span (Columns 19 19) (Columns 20 20) sr] + :~ Span (Columns 15 15) (Columns 21 21) sr + ] + (TVar "X" :~ Span (Columns 23 23) (Columns 24 24) sr) + :~ Span (Columns 0 0) (Columns 24 24) sr) + :~ Span (Columns 0 0) (Columns 24 24) sr + sr = "foo += bar(X), baz(X), X." + +case_ruleKeywordsComma = e @=? (progline sr) + where + e = LRule (Rule (TFunctor "foo" [] :~ Span (Columns 0 0) (Columns 4 4) sr) + "=" + [TFunctor "is" + [TVar "X" :~ Span (Columns 21 21) (Columns 23 23) sr + ,TFunctor "baz" + [TVar "Y" :~ Span (Columns 30 30) (Columns 31 31) sr] + :~ Span (Columns 26 26) (Columns 32 32) sr + ] + :~ Span (Columns 21 21) (Columns 32 32) sr + ,TFunctor "is" + [TVar "Y" :~ Span (Columns 34 34) (Columns 36 36) sr + ,TFunctor "3" [] :~ Span (Columns 39 39) (Columns 41 41) sr + ] + :~ Span (Columns 34 34) (Columns 41 41) sr + ] + (TFunctor "new" + [TVar "X" :~ Span (Columns 10 10) (Columns 12 12) sr] + :~ Span (Columns 6 6) (Columns 12 12) sr) + :~ Span (Columns 0 0) (Columns 41 41) sr) + :~ Span (Columns 0 0) (Columns 41 41) sr + sr = "foo = new X whenever X is baz(Y), Y is 3 ." + +-- XXX It takes a while to parse this one. Why? +case_rules = e @=? (proglines sr) + where + e = [ LRule (Rule (TFunctor "goal" [] :~ Span (Columns 0 0) (Columns 5 5) sr) + "+=" + [] + (TFunctor "1" [] :~ Span (Columns 8 8) (Columns 9 9) sr) + :~ Span (Columns 0 0) (Columns 9 9) sr) + :~ Span (Columns 0 0) (Columns 9 9) sr + , LRule (Rule (TFunctor "goal" [] :~ Span (Columns 11 11) (Columns 16 16) sr) + "+=" + [] + (TFunctor "2" [] :~ Span (Columns 19 19) (Columns 20 20) sr) + :~ Span (Columns 11 11) (Columns 20 20) sr) + :~ Span (Columns 11 11) (Columns 20 20) sr + ] + sr = "goal += 1. goal += 2." + +-- XXX It takes a while to parse this one. Why? +case_rulesDotExpr = e @=? (proglines sr) + where + e = [ LRule (Rule (TFunctor "goal" [] :~ Span (Columns 0 0) (Columns 5 5) sr) + "+=" + [] + (TFunctor "." + [TFunctor "foo" [] :~ Span (Columns 8 8) (Columns 11 11) sr + ,TFunctor "bar" [] :~ Span (Columns 12 12) (Columns 15 15) sr + ] + :~ Span (Columns 8 8) (Columns 15 15) sr + ) + :~ Span (Columns 0 0) (Columns 15 15) sr) + :~ Span (Columns 0 0) (Columns 15 15) sr + , LRule (Rule (TFunctor "goal" [] :~ Span (Columns 17 17) (Columns 22 22) sr) + "+=" + [] + (TFunctor "1" [] :~ Span (Columns 25 25) (Columns 26 26) sr) + :~ Span (Columns 17 17) (Columns 26 26) sr) + :~ Span (Columns 17 17) (Columns 26 26) sr + ] + sr = "goal += foo.bar. goal += 1." + + +main :: IO () +main = $(defaultMainGenerator) + +{- +runParser :: (Show a) => (forall r . Language (Parser r String) a) -> B.ByteString -> Result TermDoc a +runParser p = parseByteString (dynafy p <* eof) M.mempty + +testParser :: (Show a) => (forall r . Language (Parser r String) a) -> String -> IO () +testParser p = parseTest (dynafy p <* eof) + +testDyna :: (Show a) => (forall r . Language (Parser r String) a) -> String -> Result TermDoc a +testDyna p i = runParser p (BU.fromString i) + +cs r e = case r of + Success w s | S.null w -> assertEqual "XXX" e s + _ -> assertBool "XXX" False +-} diff --git a/src/Dyna/Test/Trifecta.hs b/src/Dyna/Test/Trifecta.hs new file mode 100644 index 0000000..e0d8907 --- /dev/null +++ b/src/Dyna/Test/Trifecta.hs @@ -0,0 +1,34 @@ +{-# LANGUAGE Rank2Types #-} + +module Dyna.Test.Trifecta where + +import Control.Applicative ((<*)) +import Data.ByteString (ByteString) +import Data.Foldable (toList) +import Data.Monoid (mempty) +import qualified Data.Sequence as S +import Data.String +import Test.HUnit +import Text.Trifecta +import Text.Trifecta.Diagnostic.Rendering.Prim (Rendering(..)) + +unsafeParse :: (Show a) => (forall r . (Parser r String a)) -> ByteString -> a +unsafeParse p = unsafeFS . parseByteString (p <* eof) mempty + where unsafeFS (Success xs s) | S.null xs = s + unsafeFS (Success xs _) = error $ "Warnings: " ++ show (toList xs) + unsafeFS (Failure xs) = error $ "Errors: " ++ show (toList xs) + +-- XXX this fails to properly check the last argument of the "Diagnostic"s +-- we get (the [Diagnostic m] argument). We should fix that eventually. +checkParseFail :: (Show a) + => (forall r . (Parser r String a)) + -> ByteString + -> [(Either String Delta, String)] + -> Assertion +checkParseFail p i e = unsafeFF e $ parseByteString (p <* eof) mempty i + where + unsafeFF e (Success _ _) = error $ "Unexpected success" + unsafeFF e (Failure xs) = e @=? map extractDiag (toList xs) + extractDiag (Diagnostic (Left s) _ m _) = (Left s, show m) + extractDiag (Diagnostic (Right (Rendering d _ _ _ _)) _ m _) = (Right d, show m) + diff --git a/src/Dyna/XXX/README b/src/Dyna/XXX/README new file mode 100644 index 0000000..4c27c79 --- /dev/null +++ b/src/Dyna/XXX/README @@ -0,0 +1,2 @@ +This directory contains modules that augment the functionality of upstream packages +in a way that should be pushed back upstream diff --git a/src/Dyna/XXX/Trifecta.hs b/src/Dyna/XXX/Trifecta.hs new file mode 100644 index 0000000..53596b0 --- /dev/null +++ b/src/Dyna/XXX/Trifecta.hs @@ -0,0 +1,26 @@ +-- XXX contribute back to trifecta + +module Dyna.XXX.Trifecta ( + identNL, pureSpanned +) where + +import Data.ByteString as Strict hiding (map, zip, foldl, foldr) +import Control.Applicative +import Control.Monad (when) +import Data.HashSet as HashSet (member) +import Text.Trifecta + +-- | Just like ident but without the "lexeme $" prefix +-- +-- belongs in Text.Trifecta.Parser.Identifier +-- +identNL :: MonadParser m => IdentifierStyle m -> m ByteString +identNL s = try $ do + name <- highlight (styleHighlight s) (sliced (styleStart s *> skipMany (styleLetter s))) styleName s + when (member name (styleReserved s)) $ unexpected $ "reserved " ++ styleName s ++ " " ++ show name + return name + +-- | Just like "pure" but right here in the parsing state +-- +-- belongs in Text.Trifecta.Diagnostic.Rendering.Span +pureSpanned r = (liftA (r :~) $ Span <$> position <*> position <*> line) -- 2.50.1