diff options
| -rw-r--r-- | COPYING | 661 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | tuplr.cpp (renamed from ll.cpp) | 334 |
3 files changed, 831 insertions, 166 deletions
@@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 <http://www.gnu.org/licenses/>. + +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 +<http://www.gnu.org/licenses/>. @@ -1,5 +1,5 @@ #!/bin/sh CXXFLAGS="-O0 -g -Wall -Wextra -Wno-unused-parameter" -g++ $CXXFLAGS ll.cpp `llvm-config --cppflags --ldflags --libs core jit native` -lm -o ll +g++ $CXXFLAGS tuplr.cpp `llvm-config --cppflags --ldflags --libs core jit native` -lm -o tuplr @@ -1,21 +1,18 @@ -/* A Trivial LLVM LISP +/* Tuplr: A minimalist programming language * Copyright (C) 2008-2009 David Robillard <dave@drobilla.net> * - * Parts from the Kaleidoscope tutorial <http://llvm.org/docs/tutorial/> - * by Chris Lattner and Erick Tryzelaar + * Tuplr 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 free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with This program. If not, see <http://www.gnu.org/licenses/>. + * Tuplr 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 Tuplr. If not, see <http://www.gnu.org/licenses/>. */ #include <stdarg.h> @@ -120,7 +117,6 @@ readExpression(std::istream& in) struct TEnv; ///< Type-Time Environment struct CEnv; ///< Compile-Time Environment -struct AType; ///< Abstract Type /// Base class for all AST nodes struct AST { @@ -158,23 +154,30 @@ private: const string cppstr; }; -typedef vector<AST*> TupV; - -/// Tuple (heterogeneous sequence of known length), e.g. "(a b c)" -struct ASTTuple : public AST { - ASTTuple(const TupV& t=TupV()) : tup(t) {} +/// Tuple (heterogeneous sequence of fixed length), e.g. "(a b c)" +struct ASTTuple : public AST, public vector<AST*> { + ASTTuple(const vector<AST*>& t=vector<AST*>()) : vector<AST*>(t) {} + ASTTuple(size_t size) : vector<AST*>(size) {} + ASTTuple(AST* ast, ...) { + push_back(ast); + va_list args; + va_start(args, ast); + for (AST* a = va_arg(args, AST*); a; a = va_arg(args, AST*)) + push_back(a); + va_end(args); + } string str() const { string ret = "("; - for (size_t i = 0; i != tup.size(); ++i) - ret += tup[i]->str() + ((i != tup.size() - 1) ? " " : ""); + for (size_t i = 0; i != size(); ++i) + ret += at(i)->str() + ((i != size() - 1) ? " " : ""); return ret + ")"; } bool operator==(const AST& rhs) const { const ASTTuple* rt = dynamic_cast<const ASTTuple*>(&rhs); if (!rt) return false; - if (rt->tup.size() != tup.size()) return false; - TupV::const_iterator l = tup.begin(); - FOREACH(TupV::const_iterator, r, rt->tup) { + if (rt->size() != size()) return false; + const_iterator l = begin(); + FOREACH(const_iterator, r, *rt) { AST* mine = *l++; AST* other = *r; if (!(*mine == *other)) @@ -183,34 +186,21 @@ struct ASTTuple : public AST { return true; } void lift(CEnv& cenv) { - FOREACH(TupV::iterator, t, tup) + FOREACH(iterator, t, *this) (*t)->lift(cenv); } - bool isForm(const string& f) { return !tup.empty() && tup[0]->str() == f; } + bool isForm(const string& f) { return !empty() && at(0)->str() == f; } bool contains(AST* child) const; void constrain(TEnv& tenv) const; Value* compile(CEnv& cenv) { return NULL; } - TupV tup; }; -static TupV -tuple(AST* ast, ...) -{ - TupV tup(1, ast); - va_list args; - va_start(args, ast); - for (AST* a = va_arg(args, AST*); a; a = va_arg(args, AST*)) - tup.push_back(a); - va_end(args); - return tup; -} - -/// Type Expression ::= (TName TExpr*) | ?Num +/// Type Expression, e.g. "(Int)" or "(Fn ((Int)) (Float))" struct AType : public ASTTuple { - AType(const TupV& t) : ASTTuple(t), var(false), ctype(0) {} + AType(const ASTTuple& t) : ASTTuple(t), var(false), ctype(0) {} AType(unsigned i) : var(true), ctype(0), id(i) {} AType(ASTSymbol* n, const Type* t) : var(false), ctype(t) { - tup.push_back(n); + push_back(n); } string str() const { if (var) { @@ -223,7 +213,7 @@ struct AType : public ASTTuple { Value* compile(CEnv& cenv) { return NULL; } bool concrete() const { if (var) return false; - FOREACH(TupV::const_iterator, t, tup) { + FOREACH(const_iterator, t, *this) { AType* kid = dynamic_cast<AType*>(*t); if (kid && !kid->concrete()) return false; @@ -247,8 +237,7 @@ struct AType : public ASTTuple { /// Closure (first-class function with captured lexical bindings) struct ASTClosure : public ASTTuple { - ASTClosure(ASTTuple* p, AST* b) - : ASTTuple(tuple(0, p, b)), prot(p), func(0) {} + ASTClosure(ASTTuple* p, AST* b) : ASTTuple(0, p, b), prot(p), func(0) {} bool operator==(const AST& rhs) const { return this == &rhs; } string str() const { ostringstream s; s << this; return s.str(); } void constrain(TEnv& tenv) const; @@ -258,10 +247,10 @@ struct ASTClosure : public ASTTuple { private: Function* func; }; - + /// Function call/application, e.g. "(func arg1 arg2)" struct ASTCall : public ASTTuple { - ASTCall(const TupV& t) : ASTTuple(t) {} + ASTCall(const ASTTuple& t) : ASTTuple(t) {} void constrain(TEnv& tenv) const; void lift(CEnv& cenv); Value* compile(CEnv& cenv); @@ -269,7 +258,7 @@ struct ASTCall : public ASTTuple { /// Definition special form, e.g. "(def x 2)" or "(def (next y) (+ y 1))" struct ASTDefinition : public ASTCall { - ASTDefinition(const TupV& t) : ASTCall(t) {} + ASTDefinition(const ASTTuple& t) : ASTCall(t) {} void constrain(TEnv& tenv) const; void lift(CEnv& cenv); Value* compile(CEnv& cenv); @@ -277,14 +266,14 @@ struct ASTDefinition : public ASTCall { /// Conditional special form, e.g. "(if cond thenexp elseexp)" struct ASTIf : public ASTCall { - ASTIf(const TupV& t) : ASTCall(t) {} + ASTIf(const ASTTuple& t) : ASTCall(t) {} void constrain(TEnv& tenv) const; Value* compile(CEnv& cenv); }; /// Primitive (builtin arithmetic function), e.g. "(+ 2 3)" struct ASTPrimitive : public ASTCall { - ASTPrimitive(const TupV& t, int o, int a=0) : ASTCall(t), op(o), arg(a) {} + ASTPrimitive(const ASTTuple& t, int o, int a=0) : ASTCall(t), op(o), arg(a) {} void constrain(TEnv& tenv) const; Value* compile(CEnv& cenv); unsigned op; @@ -324,10 +313,10 @@ struct PEnv : private map<const string, ASTSymbol*> { /// The fundamental parser method static AST* parseExpression(PEnv& penv, const SExp& exp); -static TupV +static ASTTuple pmap(PEnv& penv, const SExp::List& l) { - TupV ret(l.size()); + ASTTuple ret(l.size()); size_t n = 0; FOREACH(SExp::List::const_iterator, i, l) ret[n++] = parseExpression(penv, *i); @@ -388,7 +377,8 @@ struct Env : public list< map<K,V> > { Env() : list<Frame>(1) {} void push_front() { list<Frame>::push_front(Frame()); } const V& def(const K& k, const V& v) { - if (this->front().find(k) != this->front().end()) + typename Frame::iterator existing = this->front().find(k); + if (existing != this->front().end() && existing->second != v) throw SyntaxError("Redefinition"); return (this->front()[k] = v); } @@ -449,74 +439,72 @@ struct TEnv { void ASTTuple::constrain(TEnv& tenv) const { - TupV texp; - FOREACH(TupV::const_iterator, p, tup) { + AType* t = new AType(ASTTuple()); + FOREACH(const_iterator, p, *this) { (*p)->constrain(tenv); - texp.push_back(tenv.type(*p)); + t->push_back(tenv.type(*p)); } - AType* t = tenv.type(this); - t->var = false; - t->tup = texp; + tenv.constrain(tenv.type(this), t); } void ASTClosure::constrain(TEnv& tenv) const { prot->constrain(tenv); - tup[2]->constrain(tenv); - AType* bodyT = tenv.type(tup[2]); - tenv.constrain(this, new AType(tuple( - tenv.penv.sym("Fn"), tenv.type(prot), bodyT, 0))); + at(2)->constrain(tenv); + AType* bodyT = tenv.type(at(2)); + tenv.constrain(this, new AType( + ASTTuple(tenv.penv.sym("Fn"), tenv.type(prot), bodyT, 0))); } void ASTCall::constrain(TEnv& tenv) const { - FOREACH(TupV::const_iterator, p, tup) + FOREACH(const_iterator, p, *this) (*p)->constrain(tenv); AType* retT = tenv.type(this); - TupV texp = tuple(tenv.penv.sym("Fn"), tenv.var(), retT, NULL); - tenv.constrain(tup[0], new AType(texp)); + tenv.constrain(at(0), new AType(ASTTuple( + tenv.penv.sym("Fn"), tenv.var(), retT, NULL))); } void ASTDefinition::constrain(TEnv& tenv) const { - if (tup.size() != 3) + if (size() != 3) throw SyntaxError("\"def\" not passed 2 arguments"); - if (!dynamic_cast<const ASTSymbol*>(tup[1])) + if (!dynamic_cast<const ASTSymbol*>(at(1))) throw SyntaxError("\"def\" name is not a symbol"); - FOREACH(TupV::const_iterator, p, tup) + FOREACH(const_iterator, p, *this) (*p)->constrain(tenv); AType* tvar = tenv.type(this); - tenv.constrain(tup[1], tvar); - tenv.constrain(tup[2], tvar); + tenv.constrain(at(1), tvar); + tenv.constrain(at(2), tvar); } void ASTIf::constrain(TEnv& tenv) const { - FOREACH(TupV::const_iterator, p, tup) + FOREACH(const_iterator, p, *this) (*p)->constrain(tenv); AType* tvar = tenv.type(this); - tenv.constrain(tup[1], tenv.named("Bool")); - tenv.constrain(tup[2], tvar); - tenv.constrain(tup[3], tvar); + tenv.constrain(at(1), tenv.named("Bool")); + tenv.constrain(at(2), tvar); + tenv.constrain(at(3), tvar); } void ASTPrimitive::constrain(TEnv& tenv) const { - FOREACH(TupV::const_iterator, p, tup) + FOREACH(const_iterator, p, *this) (*p)->constrain(tenv); if (OP_IS_A(op, Instruction::BinaryOps)) { - if (tup.size() <= 1) throw SyntaxError("Primitive call with 0 args"); + if (size() <= 1) throw SyntaxError("Primitive call with 0 args"); AType* tvar = tenv.type(this); - for (size_t i = 1; i < tup.size(); ++i) - tenv.constrain(tup[i], tvar); + for (size_t i = 1; i < size(); ++i) + tenv.constrain(at(i), tvar); } else if (op == Instruction::ICmp) { - if (tup.size() != 3) throw SyntaxError("Comparison call with != 2 args"); - tenv.constrain(tup[1], tenv.type(tup[2])); + if (size() != 3) throw SyntaxError("Comparison call with != 2 args"); + tenv.constrain(at(1), tenv.type(at(2))); tenv.constrain(this, tenv.named("Bool")); } else { throw TypeError("Unknown primitive"); @@ -527,18 +515,18 @@ static void substitute(ASTTuple* tup, AST* from, AST* to) { if (!tup) return; - for (size_t i = 0; i < tup->tup.size(); ++i) - if (*tup->tup[i] == *from) - tup->tup[i] = to; + for (size_t i = 0; i < tup->size(); ++i) + if (*tup->at(i) == *from) + tup->at(i) = to; else - substitute(dynamic_cast<ASTTuple*>(tup->tup[i]), from, to); + substitute(dynamic_cast<ASTTuple*>(tup->at(i)), from, to); } bool ASTTuple::contains(AST* child) const { if (*this == *child) return true; - FOREACH(TupV::const_iterator, p, tup) + FOREACH(const_iterator, p, *this) if (**p == *child || (*p)->contains(child)) return true; return false; @@ -590,10 +578,10 @@ TEnv::unify(const Constraints& constraints) // TAPL 22.4 substConstraints(cp, t, s); return compose(unify(cp), TSubst(t, s)); } else if (s->isForm("Fn") && t->isForm("Fn")) { - AType* s1 = dynamic_cast<AType*>(s->tup[1]); - AType* t1 = dynamic_cast<AType*>(t->tup[1]); - AType* s2 = dynamic_cast<AType*>(s->tup[2]); - AType* t2 = dynamic_cast<AType*>(t->tup[2]); + AType* s1 = dynamic_cast<AType*>(s->at(1)); + AType* t1 = dynamic_cast<AType*>(t->at(1)); + AType* s2 = dynamic_cast<AType*>(s->at(2)); + AType* t2 = dynamic_cast<AType*>(t->at(2)); assert(s1 && t1 && s2 && t2); cp.push_back(make_pair(s1, t1)); cp.push_back(make_pair(s2, t2)); @@ -624,14 +612,14 @@ class PEnv; /// Compile-Time Environment struct CEnv { CEnv(PEnv& p, Module* m, const TargetData* target) - : penv(p), tenv(p), module(m), emp(module), fpm(&emp), symID(0) - { + : penv(p), tenv(p), module(m), emp(module), opt(&emp), symID(0) + { // Set up the optimizer pipeline: - fpm.add(new TargetData(*target)); // Register target arch - fpm.add(createInstructionCombiningPass()); // Simple optimizations - fpm.add(createReassociatePass()); // Reassociate expressions - fpm.add(createGVNPass()); // Eleminate Common Subexpressions - fpm.add(createCFGSimplificationPass()); // Simplify control flow + opt.add(new TargetData(*target)); // Register target arch + opt.add(createInstructionCombiningPass()); // Simple optimizations + opt.add(createReassociatePass()); // Reassociate expressions + opt.add(createGVNPass()); // Eliminate Common Subexpressions + opt.add(createCFGSimplificationPass()); // Simplify control flow } string gensym(const char* base="_") { ostringstream s; s << base << symID++; return s.str(); @@ -646,6 +634,7 @@ struct CEnv { assert(!vals.ref(obj)); vals.def(obj, value); } + void optimise(Function& f) { verifyFunction(f); opt.run(f); } typedef Env<const AST*, AST*> Code; typedef Env<const AST*, Value*> Vals; PEnv& penv; @@ -653,7 +642,7 @@ struct CEnv { IRBuilder<> builder; Module* module; ExistingModuleProvider emp; - FunctionPassManager fpm; + FunctionPassManager opt; unsigned symID; Code code; Vals vals; @@ -675,11 +664,10 @@ compileFunction(CEnv& cenv, const std::string& name, ASTTuple& prot, const Type* { Function::LinkageTypes linkage = Function::ExternalLinkage; - const TupV& texp = cenv.tenv.type(&prot)->tup; vector<const Type*> cprot; - for (size_t i = 0; i < texp.size(); ++i) { - const AType* at = dynamic_cast<AType*>(texp[i]); assert(at); - if (!at->ctype) throw CompileError("Parameter is untyped"); + for (size_t i = 0; i < prot.size(); ++i) { + const AType* at = cenv.tenv.type(prot.at(i)); + if (!at->ctype || at->var) throw CompileError("Parameter is untyped"); cprot.push_back(at->ctype); } @@ -694,8 +682,8 @@ compileFunction(CEnv& cenv, const std::string& name, ASTTuple& prot, const Type* // Set argument names in generated code Function::arg_iterator a = f->arg_begin(); - for (size_t i = 0; i != prot.tup.size(); ++a, ++i) - a->setName(prot.tup[i]->str()); + for (size_t i = 0; i != prot.size(); ++a, ++i) + a->setName(prot.at(i)->str()); return f; } @@ -711,33 +699,32 @@ ASTSymbol::compile(CEnv& cenv) void ASTClosure::lift(CEnv& cenv) { - if (cenv.tenv.type(tup[2])->var) + if (cenv.tenv.type(at(2))->var) throw CompileError("Closure with untyped body lifted"); - for (size_t i = 0; i < prot->tup.size(); ++i) - if (cenv.tenv.type(prot->tup[i])->var) + for (size_t i = 0; i < prot->size(); ++i) + if (cenv.tenv.type(prot->at(i))->var) throw CompileError("Closure with untyped parameter lifted"); assert(!func); cenv.push(); // Write function declaration - Function* f = compileFunction(cenv, cenv.gensym("_fn"), *prot, cenv.tenv.type(tup[2])->ctype); + Function* f = compileFunction(cenv, cenv.gensym("_fn"), *prot, cenv.tenv.type(at(2))->ctype); BasicBlock* bb = BasicBlock::Create("entry", f); cenv.builder.SetInsertPoint(bb); - + // Bind argument values in CEnv vector<Value*> args; - TupV::const_iterator p = prot->tup.begin(); + const_iterator p = prot->begin(); for (Function::arg_iterator a = f->arg_begin(); a != f->arg_end(); ++a, ++p) cenv.vals.def(dynamic_cast<ASTSymbol*>(*p), &*a); // Write function body try { cenv.precompile(this, f); // Define our value first for recursion - Value* retVal = cenv.compile(tup[2]); + Value* retVal = cenv.compile(at(2)); cenv.builder.CreateRet(retVal); // Finish function - verifyFunction(*f); // Validate generated code - cenv.fpm.run(*f); // Optimize function + cenv.optimise(*f); func = f; } catch (exception e) { f->eraseFromParent(); // Error reading body, remove function @@ -758,39 +745,46 @@ ASTClosure::compile(CEnv& cenv) void ASTCall::lift(CEnv& cenv) { - ASTClosure* c = dynamic_cast<ASTClosure*>(tup[0]); + ASTClosure* c = dynamic_cast<ASTClosure*>(at(0)); if (!c) { - AST** val = cenv.code.ref(tup[0]); + AST** val = cenv.code.ref(at(0)); c = (val) ? dynamic_cast<ASTClosure*>(*val) : c; } // Lift arguments - for (size_t i = 1; i < tup.size(); ++i) - tup[i]->lift(cenv); - + for (size_t i = 1; i < size(); ++i) + at(i)->lift(cenv); + if (!c) return; // Extend environment with bound and typed parameters cenv.push(); - if (c->prot->tup.size() != tup.size() - 1) + if (c->prot->size() != size() - 1) throw CompileError("Call to closure with mismatched arguments"); - for (size_t i = 1; i < tup.size(); ++i) - cenv.code.def(c->prot->tup[i-1], tup[i]); + for (size_t i = 1; i < size(); ++i) + cenv.code.def(c->prot->at(i-1), at(i)); - tup[0]->lift(cenv); // Lift called closure + at(0)->lift(cenv); // Lift called closure cenv.pop(); // Restore environment } Value* ASTCall::compile(CEnv& cenv) { - Function* f = dynamic_cast<Function*>(cenv.compile(tup[0])); + ASTClosure* c = dynamic_cast<ASTClosure*>(at(0)); + if (!c) { + AST** val = cenv.code.ref(at(0)); + c = (val) ? dynamic_cast<ASTClosure*>(*val) : c; + } + + assert(c); + Function* f = dynamic_cast<Function*>(cenv.compile(c)); if (!f) throw CompileError("Callee failed to compile"); - vector<Value*> params(tup.size() - 1); - for (size_t i = 1; i < tup.size(); ++i) - params[i-1] = cenv.compile(tup[i]); + vector<Value*> params(size() - 1); + for (size_t i = 1; i < size(); ++i) + params[i-1] = cenv.compile(at(i)); return cenv.builder.CreateCall(f, params.begin(), params.end(), "calltmp"); } @@ -798,70 +792,81 @@ ASTCall::compile(CEnv& cenv) void ASTDefinition::lift(CEnv& cenv) { - cenv.code.def((ASTSymbol*)tup[1], tup[2]); // Define first for recursion - tup[2]->lift(cenv); + cenv.code.def((ASTSymbol*)at(1), at(2)); // Define first for recursion + at(2)->lift(cenv); } Value* ASTDefinition::compile(CEnv& cenv) { - return cenv.compile(tup[2]); + return cenv.compile(at(2)); } Value* ASTIf::compile(CEnv& cenv) { - Value* condV = cenv.compile(tup[1]); - Function* parent = cenv.builder.GetInsertBlock()->getParent(); + typedef vector< pair<Value*, BasicBlock*> > Branches; + Function* parent = cenv.builder.GetInsertBlock()->getParent(); + BasicBlock* mergeBB = BasicBlock::Create("endif"); + BasicBlock* nextBB = NULL; + Branches branches; + ostringstream ss; + for (size_t i = 1; i < size() - 1; i += 2) { + Value* condV = cenv.compile(at(i)); - // Create blocks for the then and else cases. - // Insert the 'then' block at the end of the function. - BasicBlock* thenBB = BasicBlock::Create("then", parent); - BasicBlock* elseBB = BasicBlock::Create("else"); - BasicBlock* mergeBB = BasicBlock::Create("ifcont"); + ss.str(""); ss << "then" << ((i + 1) / 2); + BasicBlock* thenBB = BasicBlock::Create(ss.str()); - cenv.builder.CreateCondBr(condV, thenBB, elseBB); + ss.str(""); ss << "else" << ((i + 1) / 2); + nextBB = BasicBlock::Create(ss.str()); - // Emit then block - cenv.builder.SetInsertPoint(thenBB); - Value* thenV = cenv.compile(tup[2]); // Can change current block, so... - cenv.builder.CreateBr(mergeBB); - thenBB = cenv.builder.GetInsertBlock(); // ... update thenBB afterwards + cenv.builder.CreateCondBr(condV, thenBB, nextBB); + + // Emit then block for this condition + parent->getBasicBlockList().push_back(thenBB); + cenv.builder.SetInsertPoint(thenBB); + Value* thenV = cenv.compile(at(i + 1)); + cenv.builder.CreateBr(mergeBB); + branches.push_back(make_pair(thenV, cenv.builder.GetInsertBlock())); + + parent->getBasicBlockList().push_back(nextBB); + cenv.builder.SetInsertPoint(nextBB); + } // Emit else block - parent->getBasicBlockList().push_back(elseBB); - cenv.builder.SetInsertPoint(elseBB); - Value* elseV = cenv.compile(tup[3]); // Can change current block, so... + cenv.builder.SetInsertPoint(nextBB); + Value* elseV = cenv.compile(at(size() - 1)); cenv.builder.CreateBr(mergeBB); - elseBB = cenv.builder.GetInsertBlock(); // ... update elseBB afterwards + branches.push_back(make_pair(elseV, cenv.builder.GetInsertBlock())); - // Emit merge block + // Emit merge block (Phi node) parent->getBasicBlockList().push_back(mergeBB); cenv.builder.SetInsertPoint(mergeBB); - PHINode* pn = cenv.builder.CreatePHI(cenv.tenv.type(this)->ctype, "iftmp"); + PHINode* pn = cenv.builder.CreatePHI(cenv.tenv.type(this)->ctype, "ifval"); + + for (Branches::iterator i = branches.begin(); i != branches.end(); ++i) + pn->addIncoming(i->first, i->second); - pn->addIncoming(thenV, thenBB); - pn->addIncoming(elseV, elseBB); return pn; } Value* ASTPrimitive::compile(CEnv& cenv) { - if (tup.size() < 3) throw SyntaxError("Too few arguments"); - Value* a = cenv.compile(tup[1]); - Value* b = cenv.compile(tup[2]); + if (size() < 3) throw SyntaxError("Too few arguments"); + Value* a = cenv.compile(at(1)); + Value* b = cenv.compile(at(2)); if (OP_IS_A(op, Instruction::BinaryOps)) { const Instruction::BinaryOps bo = (Instruction::BinaryOps)op; - if (tup.size() == 2) - return cenv.compile(tup[1]); + if (size() == 2) + return cenv.compile(at(1)); Value* val = cenv.builder.CreateBinOp(bo, a, b); - for (size_t i = 3; i < tup.size(); ++i) - val = cenv.builder.CreateBinOp(bo, val, cenv.compile(tup[i])); + for (size_t i = 3; i < size(); ++i) + val = cenv.builder.CreateBinOp(bo, val, cenv.compile(at(i))); return val; } else if (op == Instruction::ICmp) { - bool isInt = cenv.tenv.type(tup[1])->str() == "(Int)"; + bool isInt = cenv.tenv.type(at(1))->str() == "(Int)"; if (isInt) { return cenv.builder.CreateICmp((CmpInst::Predicate)arg, a, b); } else { @@ -912,7 +917,7 @@ main() Module* module = new Module("repl"); ExecutionEngine* engine = ExecutionEngine::create(module); CEnv cenv(penv, module, engine->getTargetData()); - + cenv.tenv.name("Bool", Type::Int1Ty); cenv.tenv.name("Int", Type::Int32Ty); cenv.tenv.name("Float", Type::FloatTy); @@ -934,9 +939,9 @@ main() AType* bodyT = cenv.tenv.type(body); if (!bodyT) throw TypeError("REPL call to untyped body"); if (bodyT->var) throw TypeError("REPL call to variable typed body"); - + body->lift(cenv); - + if (bodyT->ctype) { // Create anonymous function to insert code into. ASTTuple* prot = new ASTTuple(); @@ -946,8 +951,7 @@ main() try { Value* retVal = cenv.compile(body); cenv.builder.CreateRet(retVal); // Finish function - verifyFunction(*f); // Validate generated code - cenv.fpm.run(*f); // Optimize function + cenv.optimise(*f); } catch (SyntaxError e) { f->eraseFromParent(); // Error reading body, remove function throw e; |