From e4f0b13a0525d7717c6f18aa52c89d257538d26b Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 12 Nov 2025 20:38:04 +0300 Subject: [PATCH 01/42] initial commit --- Svirukov/COPYING | 674 +++++++++++++++++++++++++++++++ Svirukov/COPYING.CC0 | 121 ++++++ Svirukov/COPYING.LESSER | 165 ++++++++ Svirukov/Makefile | 49 +++ Svirukov/Svirukov.opam | 44 ++ Svirukov/Svirukov.opam.template | 4 + Svirukov/bin/REPL.ml | 139 +++++++ Svirukov/bin/REPL.mli | 7 + Svirukov/bin/dune | 10 + Svirukov/bin/repl.t | 12 + Svirukov/dune | 7 + Svirukov/dune-project | 41 ++ Svirukov/lib/ast.mli | 19 + Svirukov/lib/dune | 20 + Svirukov/lib/interpret.mli | 9 + Svirukov/lib/parser.ml | 65 +++ Svirukov/lib/parser.mli | 22 + Svirukov/tests/.gitignore | 1 + Svirukov/tests/dune | 31 ++ Svirukov/tests/gen_tests.ml | 61 +++ Svirukov/tests/gen_tests.mli | 9 + Svirukov/tests/interpret_tests.t | 74 ++++ 22 files changed, 1584 insertions(+) create mode 100644 Svirukov/COPYING create mode 100644 Svirukov/COPYING.CC0 create mode 100644 Svirukov/COPYING.LESSER create mode 100644 Svirukov/Makefile create mode 100644 Svirukov/Svirukov.opam create mode 100644 Svirukov/Svirukov.opam.template create mode 100644 Svirukov/bin/REPL.ml create mode 100644 Svirukov/bin/REPL.mli create mode 100644 Svirukov/bin/dune create mode 100644 Svirukov/bin/repl.t create mode 100644 Svirukov/dune create mode 100644 Svirukov/dune-project create mode 100644 Svirukov/lib/ast.mli create mode 100644 Svirukov/lib/dune create mode 100644 Svirukov/lib/interpret.mli create mode 100644 Svirukov/lib/parser.ml create mode 100644 Svirukov/lib/parser.mli create mode 100644 Svirukov/tests/.gitignore create mode 100644 Svirukov/tests/dune create mode 100644 Svirukov/tests/gen_tests.ml create mode 100644 Svirukov/tests/gen_tests.mli create mode 100644 Svirukov/tests/interpret_tests.t diff --git a/Svirukov/COPYING b/Svirukov/COPYING new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/Svirukov/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 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 General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + 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 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Svirukov/COPYING.CC0 b/Svirukov/COPYING.CC0 new file mode 100644 index 00000000..0e259d42 --- /dev/null +++ b/Svirukov/COPYING.CC0 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/Svirukov/COPYING.LESSER b/Svirukov/COPYING.LESSER new file mode 100644 index 00000000..0a041280 --- /dev/null +++ b/Svirukov/COPYING.LESSER @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 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. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/Svirukov/Makefile b/Svirukov/Makefile new file mode 100644 index 00000000..e234db4b --- /dev/null +++ b/Svirukov/Makefile @@ -0,0 +1,49 @@ +.PHONY: repl tests test fmt lint celan + +all: + dune build + +repl: + dune build ./REPL.exe && rlwrap _build/default/REPL.exe + +tests: test +test: + dune runtest + +celan: clean +clean: + @$(RM) -r _build _coverage + +fmt: + dune build @fmt --auto-promote + +lint: + dune build @lint --force + +release: + dune build --profile=release + dune runtest --profile=release + +install: + dune b @install --profile=release + dune install + +ODIG_SWITCHES = --odoc-theme=odig.gruvbox.light +ODIG_SWITCHES += --no-tag-index +ODIG_SWITCHES += --no-pkg-deps +odig: + odig odoc $(ODIG_SWITCHES) Lambda + +TEST_COV_D = /tmp/cov +COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect tests/ + +.PHONY: test_coverage coverage +test_coverage: coverage +coverage: + $(RM) -r $(TEST_COV_D) + mkdir -p $(TEST_COV_D) + BISECT_FILE=$(TEST_COV_D)/language dune runtest --no-print-directory \ + --instrument-with bisect_ppx --force + bisect-ppx-report html $(COVERAGE_OPTS) + bisect-ppx-report summary $(COVERAGE_OPTS) + @echo "Use 'xdg-open _coverage/index.html' to see coverage report" diff --git a/Svirukov/Svirukov.opam b/Svirukov/Svirukov.opam new file mode 100644 index 00000000..68ca103d --- /dev/null +++ b/Svirukov/Svirukov.opam @@ -0,0 +1,44 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +version: "0.1" +synopsis: "FIXME An interpreter for language" +description: + "FIXME. A longer description, for example, which are the most interesing features being supported, etc." +maintainer: ["FIXME Vasya Pupkin "] +authors: [ + "FIXME Vasya Pupkin " + "FIXME Pupkin Vasya " +] +license: "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception" +homepage: "https://github.com/Kakadu/fp25" +doc: "https://kakadu.github.io/fp25/docs/Lambda" +bug-reports: "https://github.com/Kakadu/fp25" +depends: [ + "dune" {>= "3.7" & = "3.19.1"} + "angstrom" {= "0.16.0"} + "base" + "ppx_inline_test" {with-test} + "ppx_expect" + "ppx_deriving" + "bisect_ppx" + "odoc" {with-doc} + "ocamlformat" {build & = "0.26.2"} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +pin-depends: [ + ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] +] +# Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Svirukov/Svirukov.opam.template b/Svirukov/Svirukov.opam.template new file mode 100644 index 00000000..480da691 --- /dev/null +++ b/Svirukov/Svirukov.opam.template @@ -0,0 +1,4 @@ +pin-depends: [ + ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] +] +# Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml new file mode 100644 index 00000000..c761231e --- /dev/null +++ b/Svirukov/bin/REPL.ml @@ -0,0 +1,139 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib + +include struct + open Ast + open Utils + + type 'a status = + | Done of 'a + | WIP of 'a + + let fin x = Done x + let wip x = WIP x + + let ao_small_step_strat = + let rec helper = function + | Var _ as l -> fin l + | Abs (x, b) -> + (match helper b with + | WIP b2 -> wip (abs x b2) + | Done b2 -> fin (abs x b2)) + | App (f, arg) -> + (match helper f with + | WIP f2 -> wip (app f2 arg) + | Done (Abs (x, body)) -> + (match helper arg with + | Done arg -> wip (Lambda.subst x ~by:arg body) + | WIP arg -> wip (app f arg)) + | Done f2 -> fin (App (f2, arg))) + in + let rec loop t = + match helper t with + | Done x -> x + | WIP x -> + Format.printf " -- %a\n%!" Pprintast.pp_hum x; + loop x + in + let on_app _ f arg = loop (app f arg) in + let on_abs _ f x = loop (abs f x) in + let on_var _ x = loop (var x) in + { Lambda.on_var; on_abs; on_app } + ;; +end + +type strategy = + | CBN + | CBV + | NO + | AO + +type strategy_kind = + | Small_step + | Big_step + +type stop_after = + | SA_parsing + | SA_never + +type opts = + { mutable dump_parsetree : bool + ; mutable mode : strategy_kind * strategy + ; mutable stop_after : stop_after + } + +let big_step_evaluator = function + | AO -> Lambda.ao_strat + | NO -> Lambda.nor_strat + | CBN -> Lambda.cbn_strat + | CBV -> Lambda.cbv_strat +;; + +let run_single dump_parsetree stop_after eval = + let text = In_channel.(input_all stdin) |> String.trim in + let ast = Parser.parse text in + match ast with + | Error e -> Format.printf "Error: %a\n%!" Parser.pp_error e + | Result.Ok ast -> + if dump_parsetree then Format.printf "Parsed result: @[%a@]\n%!" Printast.pp_named ast; + (match stop_after with + | SA_parsing -> () + | SA_never -> + let rez = eval ast in + Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez) +;; + +let () = + let opts = { dump_parsetree = false; mode = Big_step, NO; stop_after = SA_never } in + let pick_strategy stra () = + let kind, _ = opts.mode in + opts.mode <- kind, stra + in + let pick_step step () = + let _, stra = opts.mode in + opts.mode <- step, stra + in + let () = + let open Stdlib.Arg in + parse + [ "-cbv", Unit (pick_strategy CBV), "Call-by-value strategy" + ; "-cbn", Unit (pick_strategy CBN), "Call-by-name strategy" + ; "-no", Unit (pick_strategy NO), "Normal Order strategy" + ; "-ao", Unit (pick_strategy AO), "Applicative Order strategy" + ; ( "-small" + , Unit (pick_step Small_step) + , "Small-step strategy kind (default is big-step)" ) + ; ( "-big" + , Unit (pick_step Big_step) + , "Small-step strategy kind (default is big-step)" ) + ; ( "-dparsetree" + , Unit (fun () -> opts.dump_parsetree <- true) + , "Dump parse tree, don't eval enything" ) + ; ( "-stop-after" + , String + (function + | "parsing" -> opts.stop_after <- SA_parsing + | _ -> failwith "Bad argument of -stop-after") + , "" ) + ] + (fun _ -> + Stdlib.Format.eprintf "Positioned arguments are not supported\n"; + Stdlib.exit 1) + "Read-Eval-Print-Loop for Utyped Lambda Calculus" + in + run_single opts.dump_parsetree opts.stop_after (fun ast -> + let stra = + match opts.mode with + | Big_step, stra -> big_step_evaluator stra + | Small_step, AO -> ao_small_step_strat + | _ -> raise (Failure "Implement it yourself") + in + Lambda.apply_strat stra ast) +;; diff --git a/Svirukov/bin/REPL.mli b/Svirukov/bin/REPL.mli new file mode 100644 index 00000000..c1135e06 --- /dev/null +++ b/Svirukov/bin/REPL.mli @@ -0,0 +1,7 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] diff --git a/Svirukov/bin/dune b/Svirukov/bin/dune new file mode 100644 index 00000000..a03fbc3b --- /dev/null +++ b/Svirukov/bin/dune @@ -0,0 +1,10 @@ +(executable + (name REPL) + (public_name REPL) + (modules REPL) + (libraries lambda_lib) + (instrumentation + (backend bisect_ppx))) + +(cram + (deps ./REPL.exe %{bin:REPL})) diff --git a/Svirukov/bin/repl.t b/Svirukov/bin/repl.t new file mode 100644 index 00000000..35b4916c --- /dev/null +++ b/Svirukov/bin/repl.t @@ -0,0 +1,12 @@ + + $ ./REPL.exe -help + Read-Eval-Print-Loop for Utyped Lambda Calculus + -cbv Call-by-value strategy + -cbn Call-by-name strategy + -no Normal Order strategy + -ao Applicative Order strategy + -small Small-step strategy kind (default is big-step) + -big Small-step strategy kind (default is big-step) + -dparsetree Dump parse tree, don't eval enything + -help Display this list of options + --help Display this list of options diff --git a/Svirukov/dune b/Svirukov/dune new file mode 100644 index 00000000..98e54536 --- /dev/null +++ b/Svirukov/dune @@ -0,0 +1,7 @@ +(env + (dev + (flags + (:standard -alert @deprecated -warn-error -A -w -3-9-32-34-58))) + (release + (flags + (:standard -alert @deprecated -warn-error +A -w +A-4-40-42-44-70)))) diff --git a/Svirukov/dune-project b/Svirukov/dune-project new file mode 100644 index 00000000..cce98b8b --- /dev/null +++ b/Svirukov/dune-project @@ -0,0 +1,41 @@ +(lang dune 3.7) + +(generate_opam_files true) + +(cram enable) + +(license "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception") + +(authors "Svirukov Mikhail ") + +(maintainers "Svirukov Mikhail ") + +(bug_reports "https://github.com/Kakadu/fp25") + +(homepage "https://github.com/Kakadu/fp25") + +(package + (name Svirukov) ; + (synopsis "FIXME An interpreter for language") + (description + "FIXME. A longer description, for example, which are the most interesing features being supported, etc.") + (documentation "https://kakadu.github.io/fp25/docs/Lambda") + (version 0.1) + (depends + (dune + (= "3.19.1")) + (angstrom + (= "0.16.0")) + base + (ppx_inline_test :with-test) + ppx_expect + ppx_deriving + bisect_ppx + (odoc :with-doc) + (ocamlformat + (and + :build + (= "0.26.2"))) + ; base + ; After adding dependencies to 'dune' files add the same dependecies here too + )) diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli new file mode 100644 index 00000000..2d0f48fc --- /dev/null +++ b/Svirukov/lib/ast.mli @@ -0,0 +1,19 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type name = string + +(** The main type for our AST (дерева абстрактного синтаксиса) *) +type 'name t = + | Var of 'name (** Variable [x] *) + | Abs of 'name * 'name t (** Abstraction [λx.t] *) + | App of 'name t * 'name t + +(* Application [f g ] *) +(** In type definition above the 3rd constructor is intentionally without documentation + to test linter *) diff --git a/Svirukov/lib/dune b/Svirukov/lib/dune new file mode 100644 index 00000000..cb2a478e --- /dev/null +++ b/Svirukov/lib/dune @@ -0,0 +1,20 @@ +(library + (name lambda_lib) + (public_name Svirukov.Lib) + (modules Ast Lambda Interpret Parser Printast Pprintast utils) + (modules_without_implementation ast) + (libraries base angstrom) + (preprocess + (pps ppx_deriving.show)) + (instrumentation + (backend bisect_ppx))) + +(library + (name tests) + (modules tests) + (libraries lambda_lib) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx)) + (inline_tests)) diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli new file mode 100644 index 00000000..8575e8ab --- /dev/null +++ b/Svirukov/lib/interpret.mli @@ -0,0 +1,9 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +val parse_and_run : string -> unit diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml new file mode 100644 index 00000000..2b7f709b --- /dev/null +++ b/Svirukov/lib/parser.ml @@ -0,0 +1,65 @@ +(** Copyright 2021-2023, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +(* TODO: implement parser here *) +open Angstrom + +let is_space = function + | ' ' | '\t' | '\n' | '\r' -> true + | _ -> false +;; + +let spaces = skip_while is_space + +let varname = + satisfy (function + | 'a' .. 'z' -> true + | _ -> false) +;; + +let conde = function + | [] -> fail "empty conde" + | h :: tl -> List.fold_left ( <|> ) h tl +;; + +type dispatch = + { apps : dispatch -> string Ast.t Angstrom.t + ; single : dispatch -> string Ast.t Angstrom.t + } + +type error = [ `Parsing_error of string ] + +let pp_error ppf = function + | `Parsing_error s -> Format.fprintf ppf "%s" s +;; + +let parse_lam = + let single pack = + fix (fun _ -> + conde + [ char '(' *> pack.apps pack <* char ')' "Parentheses expected" + ; ((string "λ" <|> string "\\") *> spaces *> varname + <* spaces + <* (return () <* char '.' <|> string "->" *> return ()) + >>= fun var -> + pack.apps pack >>= fun b -> return (Ast.Abs (String.make 1 var, b))) + ; (varname <* spaces >>= fun c -> return (Ast.Var (String.make 1 c))) + ]) + in + let apps pack = + many1 (spaces *> pack.single pack <* spaces) + >>= function + | [] -> fail "bad syntax" + | x :: xs -> return @@ List.fold_left (fun l r -> Ast.App (l, r)) x xs + in + { single; apps } +;; + +let parse str = + match + Angstrom.parse_string (parse_lam.apps parse_lam) ~consume:Angstrom.Consume.All str + with + | Result.Ok x -> Result.Ok x + | Error er -> Result.Error (`Parsing_error er) +;; diff --git a/Svirukov/lib/parser.mli b/Svirukov/lib/parser.mli new file mode 100644 index 00000000..815d0317 --- /dev/null +++ b/Svirukov/lib/parser.mli @@ -0,0 +1,22 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type error = [ `Parsing_error of string ] + +val pp_error : Format.formatter -> [< `Parsing_error of string ] -> unit + +(** Main entry of parser *) +val parse : string -> (Ast.name Ast.t, [> error ]) result + +type dispatch = + { apps : dispatch -> Ast.name Ast.t Angstrom.t + ; single : dispatch -> Ast.name Ast.t Angstrom.t + } + +(* A collection of miniparsers *) +val parse_lam : dispatch diff --git a/Svirukov/tests/.gitignore b/Svirukov/tests/.gitignore new file mode 100644 index 00000000..26685e79 --- /dev/null +++ b/Svirukov/tests/.gitignore @@ -0,0 +1 @@ +lam*.txt \ No newline at end of file diff --git a/Svirukov/tests/dune b/Svirukov/tests/dune new file mode 100644 index 00000000..31780410 --- /dev/null +++ b/Svirukov/tests/dune @@ -0,0 +1,31 @@ +(executable + (name gen_tests) + (libraries lambda_lib) + (modules gen_tests) + (instrumentation + (backend bisect_ppx))) + +(rule + (deps ./gen_tests.exe) + (targets + lam_zero.txt + lam_one.txt + lam_1+1.txt + lam_2x1.txt + lam_3x2.txt + lam_fac3.txt) + (mode + (promote (until-clean))) + (action + (run %{deps}))) + +(cram + (applies_to interpret_tests) + (deps + lam_zero.txt + lam_one.txt + lam_1+1.txt + lam_2x1.txt + lam_3x2.txt + lam_fac3.txt + ../bin/REPL.exe)) diff --git a/Svirukov/tests/gen_tests.ml b/Svirukov/tests/gen_tests.ml new file mode 100644 index 00000000..6ae0f429 --- /dev/null +++ b/Svirukov/tests/gen_tests.ml @@ -0,0 +1,61 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib +open Ast +open Lambda +open Utils + +let zero = abs "g" @@ abs "y" @@ Var "y" +let one = abs "f" @@ abs "x" @@ app f (Var "x") +let two = abs "f" @@ abs "x" @@ app f (app f x) +let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) +let plus = abs "m" @@ abs "n" @@ abs "f" @@ abs "x" @@ app m @@ app f @@ app n @@ app f x +let mul = abs "x" @@ abs "y" @@ abs "z" @@ app x (app y z) +let true_ = abs "x" @@ abs "y" @@ Var "x" +let false_ = abs "x" @@ abs "y" @@ Var "y" +let isZero = abs "n" @@ app (app n (abs "x" false_)) true_ + +(* TODO: write the right if-then-else + by adding thunk around then and else branches to delay the evaluation *) +let pred = + let xxx = abs "g" @@ abs "h" @@ app h (app g f) in + abs "n" @@ abs "f" @@ abs "x" @@ app (app (app n xxx) (abs "u" x)) (abs "u" (Var "u")) +;; + +let pp = Pprintast.pp + +let out_term file lam = + Out_channel.with_open_text file (fun ch -> + Format.fprintf (Format.formatter_of_out_channel ch) "%a%!" pp lam; + flush ch) +;; + +let () = out_term "lam_zero.txt" zero +let () = out_term "lam_one.txt" one +let () = out_term "lam_1+1.txt" (app plus @@ app one one) +let () = out_term "lam_2x1.txt" (app (app mul two) one) +let () = out_term "lam_3x2.txt" (app (app mul three) two) + +(** Definition for normal order *) +module _ = struct + let ite cond th el = app (app (app isZero cond) th) el + + let fact = + abs "s" + @@ abs "n" + @@ ite (Var "n") one (app (app mul (app (var "s") (app pred (var "n")))) (var "n")) + ;; + + let ygrek = + let hack = abs "x" (app f (app x x)) in + abs "f" (app hack hack) + ;; + + let () = out_term "lam_fac3.txt" @@ app (app ygrek fact) three +end diff --git a/Svirukov/tests/gen_tests.mli b/Svirukov/tests/gen_tests.mli new file mode 100644 index 00000000..b0431923 --- /dev/null +++ b/Svirukov/tests/gen_tests.mli @@ -0,0 +1,9 @@ +(* Intentionally empty *) + +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] diff --git a/Svirukov/tests/interpret_tests.t b/Svirukov/tests/interpret_tests.t new file mode 100644 index 00000000..8a377a93 --- /dev/null +++ b/Svirukov/tests/interpret_tests.t @@ -0,0 +1,74 @@ +Copyright 2021-2024, Kakadu and contributors +SPDX-License-Identifier: CC0-1.0 + +Cram tests here. They run and compare program output to the expected output +https://dune.readthedocs.io/en/stable/tests.html#cram-tests +Use `dune promote` after you change things that should runned + +If you need to put sample program and use it both in your interpreter and preinstalled one, +you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` +in the dune file + + $ ../bin/REPL.exe -cbv -dparsetree < \f.x + Parsed result: (Abs (f, (Var x))) + Evaluated result: (λ _ . x) + $ ../bin/REPL.exe -dparsetree < garbage242 + Error: : end_of_input + + + + $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) + Parsed result: (App ( + (App ((Abs (x, (Abs (y, (Var x))))), (Abs (u, (Var u))))), + (App ((Abs (x, (App ((Var x), (Var x))))), + (Abs (x, (App ((Var x), (Var x))))))) + )) + Evaluated result: (λ u . u) +Below we redirect contents of the file to the evaluator + $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt + Parsed result: (App ( + (Abs (m, + (Abs (n, + (Abs (f, + (Abs (x, + (App ((Var m), + (App ((Var f), + (App ((Var n), (App ((Var f), (Var x))))) + )) + )) + )) + )) + )) + )), + (App ((Abs (f, (Abs (x, (App ((Var f), (Var x))))))), + (Abs (f, (Abs (x, (App ((Var f), (Var x))))))))) + )) + + $ ../bin/REPL.exe -ao < lam_1+1.txt + Evaluated result: (λ n f x _x -> ((f (n (f x))) _x)) + $ ../bin/REPL.exe -ao < lam_2x1.txt + Evaluated result: 2 +Call by value doesn't reduce under abstraction + $ ../bin/REPL.exe -cbv < lam_2x1.txt + Evaluated result: (λ z . (2 (1 z))) + $ ../bin/REPL.exe -ao -small < lam_3x2.txt + -- ((λ y z -> ((λ f x -> (f (f (f x)))) (y z))) 2) + -- ((λ y z x -> ((y z) ((y z) ((y z) x)))) 2) + -- (λ z x -> ((2 z) ((2 z) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((2 z) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((λ x . (z (z x))) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) (z (z x))))) + -- (λ z x -> ((λ x . (z (z x))) (z (z (z (z x)))))) + -- (λ z x -> (z (z (z (z (z (z x))))))) + Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) + $ ../bin/REPL.exe -ao < lam_zero.txt + Evaluated result: ⊥ +For 3! we use noral order reduction + $ cat lam_fac3.txt + (((λ f . ((λ x . (f (x x))) (λ x . (f (x x))))) (λ s . (λ n . ((((λ n . ((n (λ x . (λ x . (λ y . y)))) (λ x . (λ y . x)))) n) (λ f . (λ x . (f x)))) (((λ x . (λ y . (λ z . (x (y z))))) (s ((λ n . (λ f . (λ x . (((n (λ g . (λ h . (h (g f))))) (λ u . x)) (λ u . u))))) n))) n))))) (λ f . (λ x . (f (f (f x)))))) + $ ../bin/REPL.exe -no < lam_fac3.txt + Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) From 91dfe1fa0547d1032f33e3449dd27f72f28cf47f Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 12 Nov 2025 23:28:46 +0300 Subject: [PATCH 02/42] feat: add binop parser - add several primitive parsers - add parser for operations, considering: 1) there would be nothing but binopr or constant inside 2) there will be only 1 cmp operation --- Svirukov/bin/REPL.ml | 133 ++---------------------------------- Svirukov/lib/ast.mli | 39 ++++++++--- Svirukov/lib/parser.ml | 145 +++++++++++++++++++++++++++++++--------- Svirukov/lib/parser.mli | 12 +--- 4 files changed, 153 insertions(+), 176 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index c761231e..cb54b4a1 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -8,132 +8,9 @@ open Lambda_lib -include struct - open Ast - open Utils +let expression = "5 > 8 - 8" - type 'a status = - | Done of 'a - | WIP of 'a - - let fin x = Done x - let wip x = WIP x - - let ao_small_step_strat = - let rec helper = function - | Var _ as l -> fin l - | Abs (x, b) -> - (match helper b with - | WIP b2 -> wip (abs x b2) - | Done b2 -> fin (abs x b2)) - | App (f, arg) -> - (match helper f with - | WIP f2 -> wip (app f2 arg) - | Done (Abs (x, body)) -> - (match helper arg with - | Done arg -> wip (Lambda.subst x ~by:arg body) - | WIP arg -> wip (app f arg)) - | Done f2 -> fin (App (f2, arg))) - in - let rec loop t = - match helper t with - | Done x -> x - | WIP x -> - Format.printf " -- %a\n%!" Pprintast.pp_hum x; - loop x - in - let on_app _ f arg = loop (app f arg) in - let on_abs _ f x = loop (abs f x) in - let on_var _ x = loop (var x) in - { Lambda.on_var; on_abs; on_app } - ;; -end - -type strategy = - | CBN - | CBV - | NO - | AO - -type strategy_kind = - | Small_step - | Big_step - -type stop_after = - | SA_parsing - | SA_never - -type opts = - { mutable dump_parsetree : bool - ; mutable mode : strategy_kind * strategy - ; mutable stop_after : stop_after - } - -let big_step_evaluator = function - | AO -> Lambda.ao_strat - | NO -> Lambda.nor_strat - | CBN -> Lambda.cbn_strat - | CBV -> Lambda.cbv_strat -;; - -let run_single dump_parsetree stop_after eval = - let text = In_channel.(input_all stdin) |> String.trim in - let ast = Parser.parse text in - match ast with - | Error e -> Format.printf "Error: %a\n%!" Parser.pp_error e - | Result.Ok ast -> - if dump_parsetree then Format.printf "Parsed result: @[%a@]\n%!" Printast.pp_named ast; - (match stop_after with - | SA_parsing -> () - | SA_never -> - let rez = eval ast in - Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez) -;; - -let () = - let opts = { dump_parsetree = false; mode = Big_step, NO; stop_after = SA_never } in - let pick_strategy stra () = - let kind, _ = opts.mode in - opts.mode <- kind, stra - in - let pick_step step () = - let _, stra = opts.mode in - opts.mode <- step, stra - in - let () = - let open Stdlib.Arg in - parse - [ "-cbv", Unit (pick_strategy CBV), "Call-by-value strategy" - ; "-cbn", Unit (pick_strategy CBN), "Call-by-name strategy" - ; "-no", Unit (pick_strategy NO), "Normal Order strategy" - ; "-ao", Unit (pick_strategy AO), "Applicative Order strategy" - ; ( "-small" - , Unit (pick_step Small_step) - , "Small-step strategy kind (default is big-step)" ) - ; ( "-big" - , Unit (pick_step Big_step) - , "Small-step strategy kind (default is big-step)" ) - ; ( "-dparsetree" - , Unit (fun () -> opts.dump_parsetree <- true) - , "Dump parse tree, don't eval enything" ) - ; ( "-stop-after" - , String - (function - | "parsing" -> opts.stop_after <- SA_parsing - | _ -> failwith "Bad argument of -stop-after") - , "" ) - ] - (fun _ -> - Stdlib.Format.eprintf "Positioned arguments are not supported\n"; - Stdlib.exit 1) - "Read-Eval-Print-Loop for Utyped Lambda Calculus" - in - run_single opts.dump_parsetree opts.stop_after (fun ast -> - let stra = - match opts.mode with - | Big_step, stra -> big_step_evaluator stra - | Small_step, AO -> ao_small_step_strat - | _ -> raise (Failure "Implement it yourself") - in - Lambda.apply_strat stra ast) -;; +let () = +match Parser.parse expression with +| Ok expr -> Printf.printf "%s\n" (Parser.printer expr) +| Error _ -> Printf.printf "Error" diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index 2d0f48fc..a0192124 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -6,14 +6,35 @@ [@@@ocaml.text "/*"] -type name = string +type constant = + | CInt of int + | CBool of bool + | CUnit -(** The main type for our AST (дерева абстрактного синтаксиса) *) -type 'name t = - | Var of 'name (** Variable [x] *) - | Abs of 'name * 'name t (** Abstraction [λx.t] *) - | App of 'name t * 'name t +type pattern = + | PVar of string + | PAny -(* Application [f g ] *) -(** In type definition above the 3rd constructor is intentionally without documentation - to test linter *) +type rec_flag = + | NonRec + | Rec + +type binop = + | Plus + | Minus + | Asteriks + | Dash + | Equals + | MoreThan + | LessThan + | EqLess + | EqMore + +type expr = + | Constant of constant + | Var of string + | Let of rec_flag * pattern * expr * expr + | Fun of pattern * expr + | App of expr * expr + | Binop of binop * expr * expr + | Conditional of expr * expr * expr option \ No newline at end of file diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index 2b7f709b..a544ff06 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -4,18 +4,24 @@ (* TODO: implement parser here *) open Angstrom +open Ast + +let is_keyword = function + | "let" | "in" | "fun" -> true + | _ -> false + let is_space = function | ' ' | '\t' | '\n' | '\r' -> true | _ -> false ;; -let spaces = skip_while is_space +let skip_spaces = skip_while is_space let varname = - satisfy (function - | 'a' .. 'z' -> true - | _ -> false) + function + | 'a' .. 'z' | 'A'..'Z' | '_' -> true + | _ -> false ;; let conde = function @@ -23,10 +29,6 @@ let conde = function | h :: tl -> List.fold_left ( <|> ) h tl ;; -type dispatch = - { apps : dispatch -> string Ast.t Angstrom.t - ; single : dispatch -> string Ast.t Angstrom.t - } type error = [ `Parsing_error of string ] @@ -34,31 +36,114 @@ let pp_error ppf = function | `Parsing_error s -> Format.fprintf ppf "%s" s ;; -let parse_lam = - let single pack = - fix (fun _ -> - conde - [ char '(' *> pack.apps pack <* char ')' "Parentheses expected" - ; ((string "λ" <|> string "\\") *> spaces *> varname - <* spaces - <* (return () <* char '.' <|> string "->" *> return ()) - >>= fun var -> - pack.apps pack >>= fun b -> return (Ast.Abs (String.make 1 var, b))) - ; (varname <* spaces >>= fun c -> return (Ast.Var (String.make 1 c))) - ]) - in - let apps pack = - many1 (spaces *> pack.single pack <* spaces) - >>= function - | [] -> fail "bad syntax" - | x :: xs -> return @@ List.fold_left (fun l r -> Ast.App (l, r)) x xs - in - { single; apps } -;; +let token p = skip_spaces *> p + +let variable = token (take_while varname) >>| fun s -> if is_keyword s then s else raise (Invalid_argument "Keyword!!!") + +let skip_parens p = token (char '(') *> p <* token (char ')') + +let parse_bool = token (string "true") <|> token (string "false") >>| fun b -> if b = "true" then true else false + +let is_digit = function +| '0'..'9' -> true +| _ -> false + +let cmp = choice [ + token (string ">="); + token (string "<="); + token (string "="); + token (string "<"); + token (string ">"); +] + +let plus = token (char '+') +let minus = token (char '-') +let asteriks = token (char '*') + +let dash = token (char '/') + +let number = + let integer = take_while1 is_digit >>| int_of_string in + token ( + option '+' (char '-') >>= fun sign -> + integer >>| fun num -> + match sign with + | '+' -> num + | '-' -> -num + | _ -> num + ) + +let plus_op = plus *> return Plus +let minus_op = minus *> return Minus +let asterisk_op = asteriks *> return Asteriks +let slash_op = dash *> return Dash + +let cmp_op = + cmp >>= function + | ">=" -> return EqMore + | "<=" -> return EqLess + | "=" -> return Equals + | ">" -> return MoreThan + | "<" -> return LessThan + | _ -> fail "Invalid comparison operator" + +let expr = + fix (fun expr -> + let atom = + conde [ + number >>| (fun n -> Constant (CInt n)); + skip_parens expr; + ] + in + let mul_div = + atom >>= fun first -> + many ( + conde [asterisk_op; slash_op] >>= fun op -> + atom >>| fun right -> (op, right) + ) >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + + let add_sub = + mul_div >>= fun first -> + many ( + conde [plus_op; minus_op] >>= fun op -> + mul_div >>| fun right -> (op, right) + ) >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + + let comparison = + add_sub >>= fun left -> + option left ( + cmp_op >>= fun op -> + add_sub >>| fun right -> Binop (op, left, right) + ) + in + + comparison + ) + +let rec printer = function +| Constant (CInt n) -> Printf.sprintf "%d" n +| Binop (op, left, right) -> + let l = printer left in + let r = printer right in + let s = match op with + | Plus -> "+" + | Minus -> "-" + | Asteriks -> "*" + | Dash -> "/" + | Equals -> "=" + | MoreThan -> ">" + | LessThan -> "<" + | EqLess -> "<=" + | EqMore -> ">=" in + Printf.sprintf "( %s %s %s)" l s r +| _ -> "Can not parse them yet" + let parse str = match - Angstrom.parse_string (parse_lam.apps parse_lam) ~consume:Angstrom.Consume.All str + Angstrom.parse_string (expr) ~consume:Angstrom.Consume.All str with | Result.Ok x -> Result.Ok x | Error er -> Result.Error (`Parsing_error er) diff --git a/Svirukov/lib/parser.mli b/Svirukov/lib/parser.mli index 815d0317..22929154 100644 --- a/Svirukov/lib/parser.mli +++ b/Svirukov/lib/parser.mli @@ -8,15 +8,9 @@ type error = [ `Parsing_error of string ] -val pp_error : Format.formatter -> [< `Parsing_error of string ] -> unit - (** Main entry of parser *) -val parse : string -> (Ast.name Ast.t, [> error ]) result +val parse : string -> (Ast.expr, error) result + +val printer: Ast.expr -> string -type dispatch = - { apps : dispatch -> Ast.name Ast.t Angstrom.t - ; single : dispatch -> Ast.name Ast.t Angstrom.t - } -(* A collection of miniparsers *) -val parse_lam : dispatch From d8ed9ece42185d6b55a9899ad72894c75ce6f976 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 13 Nov 2025 12:43:38 +0300 Subject: [PATCH 03/42] feat: add variables recognision - add varibales to parser - move printer in separate module - remove tests dir --- Svirukov/bin/REPL.ml | 6 +- Svirukov/lib/ast.mli | 23 ++-- Svirukov/lib/dune | 14 +-- Svirukov/lib/parser.ml | 197 ++++++++++++++++--------------- Svirukov/lib/parser.mli | 4 - Svirukov/lib/print.ml | 54 +++++++++ Svirukov/lib/print.mli | 1 + Svirukov/tests/.gitignore | 1 - Svirukov/tests/dune | 31 ----- Svirukov/tests/gen_tests.ml | 61 ---------- Svirukov/tests/gen_tests.mli | 9 -- Svirukov/tests/interpret_tests.t | 74 ------------ 12 files changed, 178 insertions(+), 297 deletions(-) create mode 100644 Svirukov/lib/print.ml create mode 100644 Svirukov/lib/print.mli delete mode 100644 Svirukov/tests/.gitignore delete mode 100644 Svirukov/tests/dune delete mode 100644 Svirukov/tests/gen_tests.ml delete mode 100644 Svirukov/tests/gen_tests.mli delete mode 100644 Svirukov/tests/interpret_tests.t diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index cb54b4a1..720d27ca 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -8,9 +8,9 @@ open Lambda_lib -let expression = "5 > 8 - 8" - +let expression = "(x+y)*(x-y)" + let () = match Parser.parse expression with -| Ok expr -> Printf.printf "%s\n" (Parser.printer expr) +| Ok expr -> Printf.printf "%s\n" (Print.printer expr) | Error _ -> Printf.printf "Error" diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index a0192124..ae5937ba 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -6,7 +6,7 @@ [@@@ocaml.text "/*"] -type constant = +type constant = | CInt of int | CBool of bool | CUnit @@ -15,13 +15,13 @@ type pattern = | PVar of string | PAny -type rec_flag = - | NonRec +type rec_flag = + | NonRec | Rec -type binop = +type binop = | Plus - | Minus + | Minus | Asteriks | Dash | Equals @@ -32,9 +32,16 @@ type binop = type expr = | Constant of constant - | Var of string - | Let of rec_flag * pattern * expr * expr + | Var of pattern + | Let of rec_flag * pattern * expr * expr option | Fun of pattern * expr | App of expr * expr | Binop of binop * expr * expr - | Conditional of expr * expr * expr option \ No newline at end of file + | Conditional of expr * expr * expr option + +(*TODO + - обрабатывать _ как отдельный случай + - распознавать переменные внутри выражений + + - распознавать функции +*) diff --git a/Svirukov/lib/dune b/Svirukov/lib/dune index cb2a478e..af2fef6a 100644 --- a/Svirukov/lib/dune +++ b/Svirukov/lib/dune @@ -1,20 +1,10 @@ (library (name lambda_lib) (public_name Svirukov.Lib) - (modules Ast Lambda Interpret Parser Printast Pprintast utils) - (modules_without_implementation ast) + (modules Ast Interpret Parser Print) + (modules_without_implementation ast interpret) (libraries base angstrom) (preprocess (pps ppx_deriving.show)) (instrumentation (backend bisect_ppx))) - -(library - (name tests) - (modules tests) - (libraries lambda_lib) - (preprocess - (pps ppx_expect ppx_deriving.show)) - (instrumentation - (backend bisect_ppx)) - (inline_tests)) diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index a544ff06..c98a83e5 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -6,10 +6,10 @@ open Angstrom open Ast -let is_keyword = function - | "let" | "in" | "fun" -> true +let is_keyword = function + | "let" | "in" | "fun" | "true" | "false" | "rec" -> true | _ -> false - +;; let is_space = function | ' ' | '\t' | '\n' | '\r' -> true @@ -18,10 +18,9 @@ let is_space = function let skip_spaces = skip_while is_space -let varname = - function - | 'a' .. 'z' | 'A'..'Z' | '_' -> true - | _ -> false +let varname = function + | 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' -> true + | _ -> false ;; let conde = function @@ -29,7 +28,6 @@ let conde = function | h :: tl -> List.fold_left ( <|> ) h tl ;; - type error = [ `Parsing_error of string ] let pp_error ppf = function @@ -38,113 +36,124 @@ let pp_error ppf = function let token p = skip_spaces *> p -let variable = token (take_while varname) >>| fun s -> if is_keyword s then s else raise (Invalid_argument "Keyword!!!") - -let skip_parens p = token (char '(') *> p <* token (char ')') - -let parse_bool = token (string "true") <|> token (string "false") >>| fun b -> if b = "true" then true else false - -let is_digit = function -| '0'..'9' -> true -| _ -> false - -let cmp = choice [ - token (string ">="); - token (string "<="); - token (string "="); - token (string "<"); - token (string ">"); -] +let is_digit = function + | '0' .. '9' -> true + | _ -> false +;; -let plus = token (char '+') -let minus = token (char '-') -let asteriks = token (char '*') +let variable_name = + token (take_while varname) + >>| fun s -> + if is_keyword s + then raise (Invalid_argument "Keyword!!!") + else if String.for_all is_digit s + then raise (Invalid_argument "Varname can't be number") + else s +;; -let dash = token (char '/') +let var = variable_name >>| fun s -> Var (if s = "_" then PAny else PVar s) +let skip_parens p = token (char '(') *> p <* token (char ')') +let parse_bool = token (string "true") <|> token (string "false") >>| bool_of_string + +let cmp = + choice + [ token (string ">=") + ; token (string "<=") + ; token (string "=") + ; token (string "<") + ; token (string ">") + ] +;; let number = let integer = take_while1 is_digit >>| int_of_string in - token ( - option '+' (char '-') >>= fun sign -> - integer >>| fun num -> - match sign with - | '+' -> num - | '-' -> -num - | _ -> num - ) - -let plus_op = plus *> return Plus -let minus_op = minus *> return Minus -let asterisk_op = asteriks *> return Asteriks -let slash_op = dash *> return Dash + token + (option '+' (char '-') + >>= fun sign -> + integer + >>| fun num -> + match sign with + | '+' -> num + | '-' -> -num + | _ -> num) +;; + +let plus_op = token (char '+') *> return Plus +let minus_op = token (char '-') *> return Minus +let asterisk_op = token (char '*') *> return Asteriks +let slash_op = token (char '/') *> return Dash let cmp_op = - cmp >>= function + cmp + >>= function | ">=" -> return EqMore | "<=" -> return EqLess | "=" -> return Equals | ">" -> return MoreThan | "<" -> return LessThan | _ -> fail "Invalid comparison operator" +;; let expr = fix (fun expr -> - let atom = - conde [ - number >>| (fun n -> Constant (CInt n)); - skip_parens expr; - ] - in - let mul_div = - atom >>= fun first -> - many ( - conde [asterisk_op; slash_op] >>= fun op -> - atom >>| fun right -> (op, right) - ) >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + let binopr = + fix (fun binopr -> + let atom = + choice [ (number >>| fun n -> Constant (CInt n)); skip_parens binopr; var ] + in + let mul_div = + atom + >>= fun first -> + many + (conde [ asterisk_op; slash_op ] >>= fun op -> atom >>| fun right -> op, right) + >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + let add_sub = + mul_div + >>= fun first -> + many + (conde [ plus_op; minus_op ] >>= fun op -> mul_div >>| fun right -> op, right) + >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + let comparison = + add_sub + >>= fun left -> + option + left + (cmp_op >>= fun op -> add_sub >>| fun right -> Binop (op, left, right)) + in + comparison) in - - let add_sub = - mul_div >>= fun first -> - many ( - conde [plus_op; minus_op] >>= fun op -> - mul_div >>| fun right -> (op, right) - ) >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + let conditional = + token (string "if") *> binopr + >>= fun cond -> + token (string "then") *> binopr + >>= fun main -> + option None (token (string "else") *> binopr >>| fun alt -> Some alt) + >>= function + | Some alt -> return (Conditional (cond, main, Some alt)) + | None -> return (Conditional (cond, main, None)) in - - let comparison = - add_sub >>= fun left -> - option left ( - cmp_op >>= fun op -> - add_sub >>| fun right -> Binop (op, left, right) - ) + let let_binding = + token (string "let") *> option NonRec (token (string "rec") >>| fun _ -> Rec) + >>= fun recurs -> + variable_name + >>= fun name -> + token (char '=') *> expr + >>= fun ex -> + option None (token (string "in") *> expr >>| fun cont -> Some cont) + >>= function + | Some next -> + if name = "_" + then return (Let (recurs, PAny, ex, Some next)) + else return (Let (recurs, PVar name, ex, Some next)) + | None -> return (Let (NonRec, PVar name, ex, None)) in - - comparison - ) - -let rec printer = function -| Constant (CInt n) -> Printf.sprintf "%d" n -| Binop (op, left, right) -> - let l = printer left in - let r = printer right in - let s = match op with - | Plus -> "+" - | Minus -> "-" - | Asteriks -> "*" - | Dash -> "/" - | Equals -> "=" - | MoreThan -> ">" - | LessThan -> "<" - | EqLess -> "<=" - | EqMore -> ">=" in - Printf.sprintf "( %s %s %s)" l s r -| _ -> "Can not parse them yet" - + choice [ let_binding; binopr; conditional ]) +;; let parse str = - match - Angstrom.parse_string (expr) ~consume:Angstrom.Consume.All str - with + match Angstrom.parse_string expr ~consume:Angstrom.Consume.All str with | Result.Ok x -> Result.Ok x | Error er -> Result.Error (`Parsing_error er) ;; diff --git a/Svirukov/lib/parser.mli b/Svirukov/lib/parser.mli index 22929154..eba61f57 100644 --- a/Svirukov/lib/parser.mli +++ b/Svirukov/lib/parser.mli @@ -10,7 +10,3 @@ type error = [ `Parsing_error of string ] (** Main entry of parser *) val parse : string -> (Ast.expr, error) result - -val printer: Ast.expr -> string - - diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml new file mode 100644 index 00000000..99325646 --- /dev/null +++ b/Svirukov/lib/print.ml @@ -0,0 +1,54 @@ +open Ast + +let rec printer = function + | Constant (CInt n) -> Printf.sprintf "%d" n + | Var pat -> + let line = + match pat with + | PAny -> "_" + | PVar name -> Printf.sprintf "%s" name + in + line + | Binop (op, left, right) -> + let l = printer left in + let r = printer right in + let s = + match op with + | Plus -> "+" + | Minus -> "-" + | Asteriks -> "*" + | Dash -> "/" + | Equals -> "=" + | MoreThan -> ">" + | LessThan -> "<" + | EqLess -> "<=" + | EqMore -> ">=" + in + Printf.sprintf "(%s %s %s)" l s r + | Conditional (cond, main, alt) -> + let cond = printer cond in + let main = printer main in + let res = + match alt with + | None -> Printf.sprintf "if (%s) then (%s)" cond main + | Some op -> + let alt = printer op in + Printf.sprintf "if (%s) then (%s) else (%s)" cond main alt + in + res + | Let (flag, PVar name, body, next) -> + let b = printer body in + let res = + match next, flag with + | Some next, Rec -> + let cont = printer next in + Printf.sprintf "(let rec %s = %s in %s)" name b cont + | None, NonRec -> Printf.sprintf "(let rec %s = %s)" name b + | Some next, NonRec -> + let cont = printer next in + Printf.sprintf "(let %s = %s in %s)" name b cont + | None, Rec -> raise (Invalid_argument "No sense creating rec func without name") + in + res + | _ -> "Can not parse them yet" +;; diff --git a/Svirukov/lib/print.mli b/Svirukov/lib/print.mli new file mode 100644 index 00000000..f3012e21 --- /dev/null +++ b/Svirukov/lib/print.mli @@ -0,0 +1 @@ +val printer : Ast.expr -> string diff --git a/Svirukov/tests/.gitignore b/Svirukov/tests/.gitignore deleted file mode 100644 index 26685e79..00000000 --- a/Svirukov/tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -lam*.txt \ No newline at end of file diff --git a/Svirukov/tests/dune b/Svirukov/tests/dune deleted file mode 100644 index 31780410..00000000 --- a/Svirukov/tests/dune +++ /dev/null @@ -1,31 +0,0 @@ -(executable - (name gen_tests) - (libraries lambda_lib) - (modules gen_tests) - (instrumentation - (backend bisect_ppx))) - -(rule - (deps ./gen_tests.exe) - (targets - lam_zero.txt - lam_one.txt - lam_1+1.txt - lam_2x1.txt - lam_3x2.txt - lam_fac3.txt) - (mode - (promote (until-clean))) - (action - (run %{deps}))) - -(cram - (applies_to interpret_tests) - (deps - lam_zero.txt - lam_one.txt - lam_1+1.txt - lam_2x1.txt - lam_3x2.txt - lam_fac3.txt - ../bin/REPL.exe)) diff --git a/Svirukov/tests/gen_tests.ml b/Svirukov/tests/gen_tests.ml deleted file mode 100644 index 6ae0f429..00000000 --- a/Svirukov/tests/gen_tests.ml +++ /dev/null @@ -1,61 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -open Lambda_lib -open Ast -open Lambda -open Utils - -let zero = abs "g" @@ abs "y" @@ Var "y" -let one = abs "f" @@ abs "x" @@ app f (Var "x") -let two = abs "f" @@ abs "x" @@ app f (app f x) -let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) -let plus = abs "m" @@ abs "n" @@ abs "f" @@ abs "x" @@ app m @@ app f @@ app n @@ app f x -let mul = abs "x" @@ abs "y" @@ abs "z" @@ app x (app y z) -let true_ = abs "x" @@ abs "y" @@ Var "x" -let false_ = abs "x" @@ abs "y" @@ Var "y" -let isZero = abs "n" @@ app (app n (abs "x" false_)) true_ - -(* TODO: write the right if-then-else - by adding thunk around then and else branches to delay the evaluation *) -let pred = - let xxx = abs "g" @@ abs "h" @@ app h (app g f) in - abs "n" @@ abs "f" @@ abs "x" @@ app (app (app n xxx) (abs "u" x)) (abs "u" (Var "u")) -;; - -let pp = Pprintast.pp - -let out_term file lam = - Out_channel.with_open_text file (fun ch -> - Format.fprintf (Format.formatter_of_out_channel ch) "%a%!" pp lam; - flush ch) -;; - -let () = out_term "lam_zero.txt" zero -let () = out_term "lam_one.txt" one -let () = out_term "lam_1+1.txt" (app plus @@ app one one) -let () = out_term "lam_2x1.txt" (app (app mul two) one) -let () = out_term "lam_3x2.txt" (app (app mul three) two) - -(** Definition for normal order *) -module _ = struct - let ite cond th el = app (app (app isZero cond) th) el - - let fact = - abs "s" - @@ abs "n" - @@ ite (Var "n") one (app (app mul (app (var "s") (app pred (var "n")))) (var "n")) - ;; - - let ygrek = - let hack = abs "x" (app f (app x x)) in - abs "f" (app hack hack) - ;; - - let () = out_term "lam_fac3.txt" @@ app (app ygrek fact) three -end diff --git a/Svirukov/tests/gen_tests.mli b/Svirukov/tests/gen_tests.mli deleted file mode 100644 index b0431923..00000000 --- a/Svirukov/tests/gen_tests.mli +++ /dev/null @@ -1,9 +0,0 @@ -(* Intentionally empty *) - -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] diff --git a/Svirukov/tests/interpret_tests.t b/Svirukov/tests/interpret_tests.t deleted file mode 100644 index 8a377a93..00000000 --- a/Svirukov/tests/interpret_tests.t +++ /dev/null @@ -1,74 +0,0 @@ -Copyright 2021-2024, Kakadu and contributors -SPDX-License-Identifier: CC0-1.0 - -Cram tests here. They run and compare program output to the expected output -https://dune.readthedocs.io/en/stable/tests.html#cram-tests -Use `dune promote` after you change things that should runned - -If you need to put sample program and use it both in your interpreter and preinstalled one, -you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` -in the dune file - - $ ../bin/REPL.exe -cbv -dparsetree < \f.x - Parsed result: (Abs (f, (Var x))) - Evaluated result: (λ _ . x) - $ ../bin/REPL.exe -dparsetree < garbage242 - Error: : end_of_input - - - - $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) - Parsed result: (App ( - (App ((Abs (x, (Abs (y, (Var x))))), (Abs (u, (Var u))))), - (App ((Abs (x, (App ((Var x), (Var x))))), - (Abs (x, (App ((Var x), (Var x))))))) - )) - Evaluated result: (λ u . u) -Below we redirect contents of the file to the evaluator - $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt - Parsed result: (App ( - (Abs (m, - (Abs (n, - (Abs (f, - (Abs (x, - (App ((Var m), - (App ((Var f), - (App ((Var n), (App ((Var f), (Var x))))) - )) - )) - )) - )) - )) - )), - (App ((Abs (f, (Abs (x, (App ((Var f), (Var x))))))), - (Abs (f, (Abs (x, (App ((Var f), (Var x))))))))) - )) - - $ ../bin/REPL.exe -ao < lam_1+1.txt - Evaluated result: (λ n f x _x -> ((f (n (f x))) _x)) - $ ../bin/REPL.exe -ao < lam_2x1.txt - Evaluated result: 2 -Call by value doesn't reduce under abstraction - $ ../bin/REPL.exe -cbv < lam_2x1.txt - Evaluated result: (λ z . (2 (1 z))) - $ ../bin/REPL.exe -ao -small < lam_3x2.txt - -- ((λ y z -> ((λ f x -> (f (f (f x)))) (y z))) 2) - -- ((λ y z x -> ((y z) ((y z) ((y z) x)))) 2) - -- (λ z x -> ((2 z) ((2 z) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((2 z) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((λ x . (z (z x))) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) (z (z x))))) - -- (λ z x -> ((λ x . (z (z x))) (z (z (z (z x)))))) - -- (λ z x -> (z (z (z (z (z (z x))))))) - Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) - $ ../bin/REPL.exe -ao < lam_zero.txt - Evaluated result: ⊥ -For 3! we use noral order reduction - $ cat lam_fac3.txt - (((λ f . ((λ x . (f (x x))) (λ x . (f (x x))))) (λ s . (λ n . ((((λ n . ((n (λ x . (λ x . (λ y . y)))) (λ x . (λ y . x)))) n) (λ f . (λ x . (f x)))) (((λ x . (λ y . (λ z . (x (y z))))) (s ((λ n . (λ f . (λ x . (((n (λ g . (λ h . (h (g f))))) (λ u . x)) (λ u . u))))) n))) n))))) (λ f . (λ x . (f (f (f x)))))) - $ ../bin/REPL.exe -no < lam_fac3.txt - Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) From e813aa93678eb8fb7dfe2ccda495c2819c52345e Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 13 Nov 2025 21:22:28 +0300 Subject: [PATCH 04/42] feat: add functions with let and application - add let binding for functional types - add application (only to variable for now) - expand printer --- Svirukov/bin/REPL.ml | 18 ++++++--- Svirukov/lib/ast.mli | 7 ---- Svirukov/lib/parser.ml | 92 ++++++++++++++++++++++++------------------ Svirukov/lib/print.ml | 23 +++++++---- 4 files changed, 81 insertions(+), 59 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 720d27ca..d9dd051d 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -8,9 +8,15 @@ open Lambda_lib -let expression = "(x+y)*(x-y)" - -let () = -match Parser.parse expression with -| Ok expr -> Printf.printf "%s\n" (Print.printer expr) -| Error _ -> Printf.printf "Error" +let expression = + "let result =\n\ + \ let sterter x = if x + (8 * 9) > 4 then x * 2 else x * 5 in\n\ + \ let inner pp = sterter pp + 8 in\n\ + \ inner 8" +;; + +let () = + match Parser.parse expression with + | Ok expr -> Printf.printf "%s\n" (Print.printer expr) + | Error (`Parsing_error msg) -> Printf.printf "Parse error: %s\n" msg +;; diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index ae5937ba..ff4d6a61 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -38,10 +38,3 @@ type expr = | App of expr * expr | Binop of binop * expr * expr | Conditional of expr * expr * expr option - -(*TODO - - обрабатывать _ как отдельный случай - - распознавать переменные внутри выражений - - - распознавать функции -*) diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index c98a83e5..76fca957 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -6,6 +6,13 @@ open Angstrom open Ast +let with_error p = + p + >>= function + | Ok result -> return result + | Error (`Parsing_error msg) -> fail msg +;; + let is_keyword = function | "let" | "in" | "fun" | "true" | "false" | "rec" -> true | _ -> false @@ -42,7 +49,7 @@ let is_digit = function ;; let variable_name = - token (take_while varname) + token (take_while1 varname) >>| fun s -> if is_keyword s then raise (Invalid_argument "Keyword!!!") @@ -51,9 +58,10 @@ let variable_name = else s ;; -let var = variable_name >>| fun s -> Var (if s = "_" then PAny else PVar s) -let skip_parens p = token (char '(') *> p <* token (char ')') +let pattern = variable_name >>| fun s -> if s = "_" then PAny else PVar s +let var = pattern >>| fun p -> Var p let parse_bool = token (string "true") <|> token (string "false") >>| bool_of_string +let skip_parens p = token (char '(') *> p <* token (char ')') let cmp = choice @@ -96,40 +104,43 @@ let cmp_op = let expr = fix (fun expr -> - let binopr = - fix (fun binopr -> - let atom = - choice [ (number >>| fun n -> Constant (CInt n)); skip_parens binopr; var ] + let atom = + fix (fun atom -> + let app = + var + >>= fun func -> + many1 atom + >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args in - let mul_div = - atom - >>= fun first -> - many - (conde [ asterisk_op; slash_op ] >>= fun op -> atom >>| fun right -> op, right) - >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first - in - let add_sub = - mul_div - >>= fun first -> - many - (conde [ plus_op; minus_op ] >>= fun op -> mul_div >>| fun right -> op, right) - >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first - in - let comparison = - add_sub - >>= fun left -> - option - left - (cmp_op >>= fun op -> add_sub >>| fun right -> Binop (op, left, right)) - in - comparison) + choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; app; var ]) + in + let binopr = + let mul_div = + atom + >>= fun first -> + many + (conde [ asterisk_op; slash_op ] >>= fun op -> atom >>| fun right -> op, right) + >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + let add_sub = + mul_div + >>= fun first -> + many (conde [ plus_op; minus_op ] >>= fun op -> mul_div >>| fun right -> op, right) + >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first + in + let comparison = + add_sub + >>= fun left -> + option left (cmp_op >>= fun op -> add_sub >>| fun right -> Binop (op, left, right)) + in + comparison in let conditional = token (string "if") *> binopr >>= fun cond -> - token (string "then") *> binopr + token (string "then") *> expr >>= fun main -> - option None (token (string "else") *> binopr >>| fun alt -> Some alt) + option None (token (string "else") *> expr >>| fun alt -> Some alt) >>= function | Some alt -> return (Conditional (cond, main, Some alt)) | None -> return (Conditional (cond, main, None)) @@ -137,19 +148,22 @@ let expr = let let_binding = token (string "let") *> option NonRec (token (string "rec") >>| fun _ -> Rec) >>= fun recurs -> - variable_name + pattern >>= fun name -> + many pattern + >>= fun args -> token (char '=') *> expr >>= fun ex -> + let rec build_curried_function args body = + match args with + | [] -> body + | arg :: rest_args -> Fun (arg, build_curried_function rest_args body) + in + let body = if args = [] then ex else build_curried_function args ex in option None (token (string "in") *> expr >>| fun cont -> Some cont) - >>= function - | Some next -> - if name = "_" - then return (Let (recurs, PAny, ex, Some next)) - else return (Let (recurs, PVar name, ex, Some next)) - | None -> return (Let (NonRec, PVar name, ex, None)) + >>= fun skope -> return (Let (recurs, name, body, skope)) in - choice [ let_binding; binopr; conditional ]) + choice [ let_binding; conditional; binopr ]) ;; let parse str = diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index 99325646..a3228f2d 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -6,7 +6,7 @@ let rec printer = function let line = match pat with | PAny -> "_" - | PVar name -> Printf.sprintf "%s" name + | PVar name -> Printf.sprintf "Var(%s)" name in line | Binop (op, left, right) -> @@ -36,19 +36,28 @@ let rec printer = function Printf.sprintf "if (%s) then (%s) else (%s)" cond main alt in res - | Let (flag, PVar name, body, next) -> + | Let (flag, pat, body, next) -> let b = printer body in let res = - match next, flag with - | Some next, Rec -> + match next, flag, pat with + | Some next, Rec, PVar name -> let cont = printer next in Printf.sprintf "(let rec %s = %s in %s)" name b cont - | None, NonRec -> Printf.sprintf "(let rec %s = %s)" name b - | Some next, NonRec -> + | None, NonRec, PVar name -> Printf.sprintf "(let %s = %s)" name b + | Some next, NonRec, PVar name -> let cont = printer next in Printf.sprintf "(let %s = %s in %s)" name b cont - | None, Rec -> raise (Invalid_argument "No sense creating rec func without name") + | Some next, Rec, PAny -> + let cont = printer next in + Printf.sprintf "(let rec _ = %s in %s)" b cont + | None, NonRec, PAny -> Printf.sprintf "(let _ = %s)" b + | Some next, NonRec, PAny -> + let cont = printer next in + Printf.sprintf "(let _ = %s in %s)" b cont + | None, Rec, _ -> raise (Invalid_argument "No sense creating rec func without name") in res + | Fun (var, body) -> Printf.sprintf "Fun (%s, %s)" (printer (Var var)) (printer body) + | App (left, right) -> Printf.sprintf "App (%s, %s)" (printer left) (printer right) | _ -> "Can not parse them yet" ;; From 01b8562f07dc4db5e03abbd7ee5075cf048b1766 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Fri, 14 Nov 2025 23:02:36 +0300 Subject: [PATCH 05/42] feat: add function definition with fun and lambdas --- Svirukov/lib/parser.ml | 50 +++++++++++++++++++++++++----------------- Svirukov/lib/print.ml | 1 + 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index 76fca957..dc9327b5 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -14,7 +14,7 @@ let with_error p = ;; let is_keyword = function - | "let" | "in" | "fun" | "true" | "false" | "rec" -> true + | "let" | "in" | "fun" | "true" | "false" | "rec" | "else" | "if" | "then" -> true | _ -> false ;; @@ -50,12 +50,11 @@ let is_digit = function let variable_name = token (take_while1 varname) - >>| fun s -> - if is_keyword s - then raise (Invalid_argument "Keyword!!!") - else if String.for_all is_digit s - then raise (Invalid_argument "Varname can't be number") - else s + >>= fun s -> + match s with + | _ when is_keyword s -> fail "Cannot use keyword for varname" + | _ when String.for_all is_digit s -> fail "Cannot use number as varname" + | _ -> return s ;; let pattern = variable_name >>| fun s -> if s = "_" then PAny else PVar s @@ -102,17 +101,33 @@ let cmp_op = | _ -> fail "Invalid comparison operator" ;; +let rec build_curried_function args body = + match args with + | [] -> body + | arg :: rest_args -> Fun (arg, build_curried_function rest_args body) +;; + let expr = fix (fun expr -> + let anonymous_fun = + token (string "fun") *> many1 (token pattern) + <* token (string "->") + >>= fun args -> expr >>= fun body -> return (build_curried_function args body) + in let atom = - fix (fun atom -> - let app = - var - >>= fun func -> - many1 atom - >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args - in - choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; app; var ]) + let app = + choice [ skip_parens anonymous_fun; var ] + >>= fun func -> + many1 (choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var ]) + >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args + in + choice + [ (number >>| fun n -> Constant (CInt n)) + ; app + ; var + ; skip_parens expr + ; anonymous_fun + ] in let binopr = let mul_div = @@ -154,11 +169,6 @@ let expr = >>= fun args -> token (char '=') *> expr >>= fun ex -> - let rec build_curried_function args body = - match args with - | [] -> body - | arg :: rest_args -> Fun (arg, build_curried_function rest_args body) - in let body = if args = [] then ex else build_curried_function args ex in option None (token (string "in") *> expr >>| fun cont -> Some cont) >>= fun skope -> return (Let (recurs, name, body, skope)) diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index a3228f2d..a282129d 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -54,6 +54,7 @@ let rec printer = function | Some next, NonRec, PAny -> let cont = printer next in Printf.sprintf "(let _ = %s in %s)" b cont + | None, Rec, PVar name -> Printf.sprintf "(let rec %s = %s)" name b | None, Rec, _ -> raise (Invalid_argument "No sense creating rec func without name") in res From 1dcc03bcc1f0c0f1e0feacf521159d45c217f058 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Fri, 14 Nov 2025 23:03:51 +0300 Subject: [PATCH 06/42] tests: add mod with primitive tests --- Svirukov/bin/dune | 3 - Svirukov/bin/repl.t | 12 --- Svirukov/lib/dune | 10 +++ Svirukov/lib/tests.ml | 187 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 15 deletions(-) delete mode 100644 Svirukov/bin/repl.t create mode 100644 Svirukov/lib/tests.ml diff --git a/Svirukov/bin/dune b/Svirukov/bin/dune index a03fbc3b..6cbf1af2 100644 --- a/Svirukov/bin/dune +++ b/Svirukov/bin/dune @@ -5,6 +5,3 @@ (libraries lambda_lib) (instrumentation (backend bisect_ppx))) - -(cram - (deps ./REPL.exe %{bin:REPL})) diff --git a/Svirukov/bin/repl.t b/Svirukov/bin/repl.t deleted file mode 100644 index 35b4916c..00000000 --- a/Svirukov/bin/repl.t +++ /dev/null @@ -1,12 +0,0 @@ - - $ ./REPL.exe -help - Read-Eval-Print-Loop for Utyped Lambda Calculus - -cbv Call-by-value strategy - -cbn Call-by-name strategy - -no Normal Order strategy - -ao Applicative Order strategy - -small Small-step strategy kind (default is big-step) - -big Small-step strategy kind (default is big-step) - -dparsetree Dump parse tree, don't eval enything - -help Display this list of options - --help Display this list of options diff --git a/Svirukov/lib/dune b/Svirukov/lib/dune index af2fef6a..a37e833b 100644 --- a/Svirukov/lib/dune +++ b/Svirukov/lib/dune @@ -8,3 +8,13 @@ (pps ppx_deriving.show)) (instrumentation (backend bisect_ppx))) + + (library + (name tests) + (modules tests) + (libraries lambda_lib) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx)) + (inline_tests)) diff --git a/Svirukov/lib/tests.ml b/Svirukov/lib/tests.ml new file mode 100644 index 00000000..2f2327fd --- /dev/null +++ b/Svirukov/lib/tests.ml @@ -0,0 +1,187 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib.Print +open Lambda_lib.Parser + +let%expect_test "parse number" = + print_string (printer (parse "42" |> Result.get_ok)); + [%expect {| 42 |}] +;; + +let%expect_test "parse variable" = + print_string (printer (parse "x" |> Result.get_ok)); + [%expect {| Var(x) |}] +;; + +let%expect_test "parse addition" = + print_string (printer (parse "2 + 3" |> Result.get_ok)); + [%expect {| (2 + 3) |}] +;; + +let%expect_test "parse multiplication" = + print_string (printer (parse "2 * 3" |> Result.get_ok)); + [%expect {| (2 * 3) |}] +;; + +let%expect_test "parse parentheses" = + print_string (printer (parse "(2 + 3)" |> Result.get_ok)); + [%expect {| (2 + 3) |}] +;; + +let%expect_test "parse comparison" = + print_string (printer (parse "2 > 3" |> Result.get_ok)); + [%expect {| (2 > 3) |}] +;; + +let%expect_test "parse conditional" = + print_string (printer (parse "if 1 > 0 then 2 else 3" |> Result.get_ok)); + [%expect {| if ((1 > 0)) then (2) else (3) |}] +;; + +let%expect_test "parse let binding" = + print_string (printer (parse "let x = 5 in x" |> Result.get_ok)); + [%expect {| (let x = 5 in Var(x)) |}] +;; + +let%expect_test "parse application" = + print_string (printer (parse "f x" |> Result.get_ok)); + [%expect {| App (Var(f), Var(x)) |}] +;; + +let%expect_test "parse anonymous function" = + print_string (printer (parse "fun x -> x + 1" |> Result.get_ok)); + [%expect {| Fun (Var(x), (Var(x) + 1)) |}] +;; + +let%expect_test "parse negative number" = + print_string (printer (parse "-5" |> Result.get_ok)); + [%expect {| -5 |}] +;; + +let%expect_test "parse complex expression" = + print_string (printer (parse "2 + 3 * 4" |> Result.get_ok)); + [%expect {| (2 + (3 * 4)) |}] +;; + +let%expect_test "parse function with multiple args" = + print_string (printer (parse "let add x y = x + y in add 1 2" |> Result.get_ok)); + [%expect + {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), 1), 2)) |}] +;; + +let%expect_test "parse nested application" = + print_string (printer (parse "f (g x)" |> Result.get_ok)); + [%expect {| App (Var(f), App (Var(g), Var(x))) |}] +;; + +let%expect_test "factorial with rec" = + print_string + (printer + (parse "let rec fac n= if n = 1 then 1 else (fac (n-1)) * n" |> Result.get_ok)); + [%expect + {|(let rec fac = Fun (Var(n), if ((Var(n) = 1)) then (1) else ((App (Var(fac), App (Var(n), -1)) * Var(n)))))|}] +;; + +let%expect_test "some skope values" = + let expresion = + "let result =\n\ + \ let sterter x = if x + (8 * 9) > 4 then x * 2 else x * 5 in\n\ + \ let inner pp = sterter pp + 8 in\n\ + \ inner 8" + in + print_string (printer (parse expresion |> Result.get_ok)); + [%expect + {|(let result = (let sterter = Fun (Var(x), if (((Var(x) + (8 * 9)) > 4)) then ((Var(x) * 2)) else ((Var(x) * 5))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + 8)) in App (Var(inner), 8))))|}] +;; + +let%expect_test "function annotation via fun" = + print_string (printer (parse "let function = fun a -> a * a" |> Result.get_ok)); + [%expect {|(let function = Fun (Var(a), (Var(a) * Var(a))))|}] +;; + +let%expect_test "application with lambda" = + print_string (printer (parse "let tmp = (fun a -> a * a) 5" |> Result.get_ok)); + [%expect {|(let tmp = App (Fun (Var(a), (Var(a) * Var(a))), 5))|}] +;; + +let%expect_test "unbounded lambda" = + print_string (printer (parse "(fun a -> a * a)" |> Result.get_ok)); + [%expect {|Fun (Var(a), (Var(a) * Var(a)))|}] +;; + +let%expect_test "simple application" = + prerr_string (printer (parse "let _ = g 4 (f 5)" |> Result.get_ok)); + [%expect {|(let _ = App (App (Var(g), 4), App (Var(f), 5)))|}] +;; + +let%expect_test "nested let with application" = + print_string + (printer (parse "let f = fun x -> x + 1 in let y = f 5 in y * 2" |> Result.get_ok)); + [%expect + {| (let f = Fun (Var(x), (Var(x) + 1)) in (let y = App (Var(f), 5) in (Var(y) * 2))) |}] +;; + +let%expect_test "anonymous function in application" = + print_string (printer (parse "(fun x -> x * 2) 10" |> Result.get_ok)); + [%expect {| App (Fun (Var(x), (Var(x) * 2)), 10) |}] +;; + +let%expect_test "multiple applications with arithmetic" = + print_string (printer (parse "f (g x) + h (k y) * 2" |> Result.get_ok)); + [%expect + {| (App (Var(f), App (Var(g), Var(x))) + (App (Var(h), App (Var(k), Var(y))) * 2)) |}] +;; + +let%expect_test "conditional with applications" = + print_string (printer (parse "if f x > 0 then g y else h z" |> Result.get_ok)); + [%expect + {| if ((App (Var(f), Var(x)) > 0)) then (App (Var(g), Var(y))) else (App (Var(h), Var(z))) |}] +;; + +let%expect_test "nested anonymous functions" = + print_string (printer (parse "fun x -> fun y -> x + y" |> Result.get_ok)); + [%expect {| Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) |}] +;; + +let%expect_test "let with multiple arguments and application" = + print_string (printer (parse "let add x y = x + y in add (f 1) (g 2)" |> Result.get_ok)); + [%expect + {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), App (Var(f), 1)), App (Var(g), 2))) |}] +;; + +let%expect_test "application chain with comparison" = + print_string (printer (parse "f a b > g c d + 1" |> Result.get_ok)); + [%expect + {| (App (App (Var(f), Var(a)), Var(b)) > (App (App (Var(g), Var(c)), Var(d)) + 1)) |}] +;; + +let%expect_test "nested lets with applications" = + print_string + (printer + (parse "let x = 5 in let f = fun y -> x + y in let z = f 10 in z * 2" + |> Result.get_ok)); + [%expect + {| (let x = 5 in (let f = Fun (Var(y), (Var(x) + Var(y))) in (let z = App (Var(f), 10) in (Var(z) * 2)))) |}] +;; + +let%expect_test "application with complex expressions" = + print_string + (printer (parse "f (x + 1) (y * 2) (if z > 0 then a else b)" |> Result.get_ok)); + [%expect + {| App (App (App (Var(f), (Var(x) + 1)), (Var(y) * 2)), if ((Var(z) > 0)) then (Var(a)) else (Var(b))) |}] +;; + +let%expect_test "recursive function with application" = + print_string + (printer + (parse "let rec fact n = if n = 0 then 1 else n * fact (n - 1) in fact 5" + |> Result.get_ok)); + [%expect + {| (let rec fact = Fun (Var(n), if ((Var(n) = 0)) then (1) else ((Var(n) * App (Var(fact), (Var(n) - 1))))) in App (Var(fact), 5)) |}] +;; From 1b35ce0e5ee1208bf0f8f6f5ddfd086ba4aa8c7a Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 17 Nov 2025 19:10:40 +0300 Subject: [PATCH 07/42] feat: fix nested let without in --- Svirukov/lib/parser.ml | 24 ++++++---- Svirukov/lib/print.ml | 4 +- Svirukov/lib/tests.ml | 102 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 13 deletions(-) diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index dc9327b5..2c80356b 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -2,7 +2,6 @@ (** SPDX-License-Identifier: LGPL-3.0-or-later *) -(* TODO: implement parser here *) open Angstrom open Ast @@ -109,18 +108,19 @@ let rec build_curried_function args body = let expr = fix (fun expr -> - let anonymous_fun = - token (string "fun") *> many1 (token pattern) - <* token (string "->") - >>= fun args -> expr >>= fun body -> return (build_curried_function args body) - in let atom = + let anonymous_fun = + token (string "fun") *> many1 (token pattern) + <* token (string "->") + >>= fun args -> expr >>= fun body -> return (build_curried_function args body) + in let app = choice [ skip_parens anonymous_fun; var ] >>= fun func -> many1 (choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var ]) >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args in + (*we want to have oppotunity to use if-then-else (since it is obligatory) as arg to app*) choice [ (number >>| fun n -> Constant (CInt n)) ; app @@ -156,9 +156,7 @@ let expr = token (string "then") *> expr >>= fun main -> option None (token (string "else") *> expr >>| fun alt -> Some alt) - >>= function - | Some alt -> return (Conditional (cond, main, Some alt)) - | None -> return (Conditional (cond, main, None)) + >>| fun alt -> Conditional (cond, main, alt) in let let_binding = token (string "let") *> option NonRec (token (string "rec") >>| fun _ -> Rec) @@ -171,7 +169,13 @@ let expr = >>= fun ex -> let body = if args = [] then ex else build_curried_function args ex in option None (token (string "in") *> expr >>| fun cont -> Some cont) - >>= fun skope -> return (Let (recurs, name, body, skope)) + >>= fun skope -> + match skope with + | Some next -> + (match next with + | Let (_, _, _, None) -> fail "Need an expression in rigth side of =" + | _ -> return (Let (recurs, name, body, Some next))) + | None -> return (Let (recurs, name, body, None)) in choice [ let_binding; conditional; binopr ]) ;; diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index a282129d..16c3968d 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -30,10 +30,8 @@ let rec printer = function let main = printer main in let res = match alt with + | Some ex -> Printf.sprintf "if (%s) then (%s) else (%s)" cond main (printer ex) | None -> Printf.sprintf "if (%s) then (%s)" cond main - | Some op -> - let alt = printer op in - Printf.sprintf "if (%s) then (%s) else (%s)" cond main alt in res | Let (flag, pat, body, next) -> diff --git a/Svirukov/lib/tests.ml b/Svirukov/lib/tests.ml index 2f2327fd..03330367 100644 --- a/Svirukov/lib/tests.ml +++ b/Svirukov/lib/tests.ml @@ -185,3 +185,105 @@ let%expect_test "recursive function with application" = [%expect {| (let rec fact = Fun (Var(n), if ((Var(n) = 0)) then (1) else ((Var(n) * App (Var(fact), (Var(n) - 1))))) in App (Var(fact), 5)) |}] ;; + +let%expect_test "right application" = + print_string (printer (parse "g (f (q 5))" |> Result.get_ok)); + [%expect {|App (Var(g), App (Var(f), App (Var(q), 5)))|}] +;; + +let%expect_test "nested if-then-else" = + print_string + (printer (parse "if 4>8 then if 7>9 then 7 else g 7 else g (k 4) 7" |> Result.get_ok)); + [%expect + {| if ((4 > 8)) then (if ((7 > 9)) then (7) else (App (Var(g), 7))) else (App (App (Var(g), App (Var(k), 4)), 7)) |}] +;; + +let%expect_test "test else if" = + print_string + (printer (parse "if 4>8 then g 7 4 h else if 7>9 then 7 else g 7" |> Result.get_ok)); + [%expect + {| if ((4 > 8)) then (App (App (App (Var(g), 7), 4), Var(h))) else (if ((7 > 9)) then (7) else (App (Var(g), 7))) |}] +;; + +(*--------------incorrect------------------ + let%expect_test "let in application" = + assert ( + match parse "(let r = 4) 5" with + | Ok _ -> false + | Error _ -> true) + ;; + + let%expect_test "let inside let" = + assert ( + match parse "let = (let r = 4 + 5) 5" with + | Ok _ -> false + | Error _ -> true) + ;; + + let%expect_test "let inside if" = + assert ( + match parse "if let x = 5 in x > 0 then 1 else 0" with + | Ok _ -> false + | Error _ -> true) + ;; + + let%expect_test "double let" = + assert ( + match parse "let r = let x u= u + 7 in let q =7" with + | Ok p -> + let _ = Printf.printf "%s\n" (printer p) in + false + | Error _ -> true) + ;; + + (*apparently check, whether it is an expression or not, is something that should be done in interpreter*) + let%expect_test "if without else as app arg" = + assert ( + match parse "r 5 (let f = 7 in 8)" with + | Ok p -> + let _ = Printf.printf "%s\n" (printer p) in + false + | Error _ -> true) + ;; + + let%expect_test "let binding as app arg" = + assert ( + match parse "r 5 (let r = 7)" with + | Ok p -> + let _ = Printf.printf "%s\n" (printer p) in + false + | Error _ -> true) + ;; + let _ = + let r = fun s a -> s*a in + r 5 (fun d -> d*d) + + let%expect_test "lambda as app arg" = + assert ( + match parse "r 5 (fun r -> r*r)" with + | Ok p -> + let _ = Printf.printf "%s\n" (printer p) in + false + | Error _ -> true) + ;; + + let%expect_test "if in binop" = + assert ( + match parse "5 + (fun r -> r*r)" with + | Ok p -> + let _ = Printf.printf "%s\n" (printer p) in + false + | Error _ -> true) + ;; + + else is obligatory now*) +(*how to deal with in after let - there is either in or ;;*) + +(*okay, i should allow /\ (above) and check, whether is is an + expression (return some value) inside interpreter + but let = ... in let = g ;; - not allowed!!! + /\ + || ???? + || + \/ + separate cases for expressions and statements?*) From 8408106d4ce41bd3253ee6eec778052f1189b652 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 18 Nov 2025 20:03:55 +0300 Subject: [PATCH 08/42] feat: change print functions --- Svirukov/bin/REPL.ml | 14 ++++- Svirukov/lib/parser.ml | 8 +-- Svirukov/lib/print.ml | 43 ++++++++------ Svirukov/lib/print.mli | 3 +- Svirukov/lib/tests.ml | 132 +++++++++++++++++++++-------------------- 5 files changed, 107 insertions(+), 93 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index d9dd051d..962ed694 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -16,7 +16,15 @@ let expression = ;; let () = - match Parser.parse expression with - | Ok expr -> Printf.printf "%s\n" (Print.printer expr) - | Error (`Parsing_error msg) -> Printf.printf "Parse error: %s\n" msg + let expr = + match Parser.parse "let _ = 8" with + | Ok expr -> + (*let _ = Printf.printf "%d\n" r in*) + let _ = Printf.printf "%s\n" (Print.print_ast expr) in + expr + | Error (`Parsing_error msg) -> failwith msg + in + match Interpret.run_interpret expr with + | Ok expr -> Printf.printf "%s\n" (Print.print_ast expr) + | Error er -> Printf.printf "%s\n" (Print.print_error er) ;; diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index 2c80356b..f61c244b 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -169,13 +169,7 @@ let expr = >>= fun ex -> let body = if args = [] then ex else build_curried_function args ex in option None (token (string "in") *> expr >>| fun cont -> Some cont) - >>= fun skope -> - match skope with - | Some next -> - (match next with - | Let (_, _, _, None) -> fail "Need an expression in rigth side of =" - | _ -> return (Let (recurs, name, body, Some next))) - | None -> return (Let (recurs, name, body, None)) + >>= fun skope -> return (Let (recurs, name, body, skope)) in choice [ let_binding; conditional; binopr ]) ;; diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index 16c3968d..ca8e1a1a 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -1,17 +1,19 @@ open Ast +open Interpret -let rec printer = function - | Constant (CInt n) -> Printf.sprintf "%d" n +let rec print_ast = function + | Constant CUnit -> "CUnit" + | Constant (CInt n) -> Printf.sprintf "CInt(%d)" n | Var pat -> let line = match pat with - | PAny -> "_" + | PAny -> "Var(_)" | PVar name -> Printf.sprintf "Var(%s)" name in line | Binop (op, left, right) -> - let l = printer left in - let r = printer right in + let l = print_ast left in + let r = print_ast right in let s = match op with | Plus -> "+" @@ -26,37 +28,44 @@ let rec printer = function in Printf.sprintf "(%s %s %s)" l s r | Conditional (cond, main, alt) -> - let cond = printer cond in - let main = printer main in + let cond = print_ast cond in + let main = print_ast main in let res = match alt with - | Some ex -> Printf.sprintf "if (%s) then (%s) else (%s)" cond main (printer ex) + | Some ex -> Printf.sprintf "if (%s) then (%s) else (%s)" cond main (print_ast ex) | None -> Printf.sprintf "if (%s) then (%s)" cond main in res | Let (flag, pat, body, next) -> - let b = printer body in + let b = print_ast body in let res = match next, flag, pat with | Some next, Rec, PVar name -> - let cont = printer next in + let cont = print_ast next in Printf.sprintf "(let rec %s = %s in %s)" name b cont | None, NonRec, PVar name -> Printf.sprintf "(let %s = %s)" name b | Some next, NonRec, PVar name -> - let cont = printer next in + let cont = print_ast next in Printf.sprintf "(let %s = %s in %s)" name b cont | Some next, Rec, PAny -> - let cont = printer next in + let cont = print_ast next in Printf.sprintf "(let rec _ = %s in %s)" b cont | None, NonRec, PAny -> Printf.sprintf "(let _ = %s)" b | Some next, NonRec, PAny -> - let cont = printer next in + let cont = print_ast next in Printf.sprintf "(let _ = %s in %s)" b cont | None, Rec, PVar name -> Printf.sprintf "(let rec %s = %s)" name b - | None, Rec, _ -> raise (Invalid_argument "No sense creating rec func without name") + | None, Rec, _ -> Printf.sprintf "(let rec _ = %s)" b in res - | Fun (var, body) -> Printf.sprintf "Fun (%s, %s)" (printer (Var var)) (printer body) - | App (left, right) -> Printf.sprintf "App (%s, %s)" (printer left) (printer right) - | _ -> "Can not parse them yet" + | Fun (var, body) -> + Printf.sprintf "Fun (%s, %s)" (print_ast (Var var)) (print_ast body) + | App (left, right) -> Printf.sprintf "App (%s, %s)" (print_ast left) (print_ast right) +;; + +let print_error = function + | UnboundVariable name -> Printf.sprintf "Unbound variable %s" name + | TypeError err -> err + | DivisionByZero -> "Division by zero" + | Unimplemented -> "Not implemented yet..." ;; diff --git a/Svirukov/lib/print.mli b/Svirukov/lib/print.mli index f3012e21..926225ef 100644 --- a/Svirukov/lib/print.mli +++ b/Svirukov/lib/print.mli @@ -1 +1,2 @@ -val printer : Ast.expr -> string +val print_ast : Ast.expr -> string +val print_error : Interpret.error -> string diff --git a/Svirukov/lib/tests.ml b/Svirukov/lib/tests.ml index 03330367..e0837456 100644 --- a/Svirukov/lib/tests.ml +++ b/Svirukov/lib/tests.ml @@ -10,82 +10,82 @@ open Lambda_lib.Print open Lambda_lib.Parser let%expect_test "parse number" = - print_string (printer (parse "42" |> Result.get_ok)); - [%expect {| 42 |}] + print_string (print_ast (parse "42" |> Result.get_ok)); + [%expect {| CInt(42) |}] ;; let%expect_test "parse variable" = - print_string (printer (parse "x" |> Result.get_ok)); + print_string (print_ast (parse "x" |> Result.get_ok)); [%expect {| Var(x) |}] ;; let%expect_test "parse addition" = - print_string (printer (parse "2 + 3" |> Result.get_ok)); - [%expect {| (2 + 3) |}] + print_string (print_ast (parse "2 + 3" |> Result.get_ok)); + [%expect {| (CInt(2) + CInt(3)) |}] ;; let%expect_test "parse multiplication" = - print_string (printer (parse "2 * 3" |> Result.get_ok)); - [%expect {| (2 * 3) |}] + print_string (print_ast (parse "2 * 3" |> Result.get_ok)); + [%expect {| (CInt(2) * CInt(3)) |}] ;; let%expect_test "parse parentheses" = - print_string (printer (parse "(2 + 3)" |> Result.get_ok)); - [%expect {| (2 + 3) |}] + print_string (print_ast (parse "(2 + 3)" |> Result.get_ok)); + [%expect {| (CInt(2) + CInt(3)) |}] ;; let%expect_test "parse comparison" = - print_string (printer (parse "2 > 3" |> Result.get_ok)); - [%expect {| (2 > 3) |}] + print_string (print_ast (parse "2 > 3" |> Result.get_ok)); + [%expect {| (CInt(2) > CInt(3)) |}] ;; let%expect_test "parse conditional" = - print_string (printer (parse "if 1 > 0 then 2 else 3" |> Result.get_ok)); - [%expect {| if ((1 > 0)) then (2) else (3) |}] + print_string (print_ast (parse "if 1 > 0 then 2 else 3" |> Result.get_ok)); + [%expect {| if ((CInt(1) > CInt(0))) then (CInt(2)) else (CInt(3)) |}] ;; let%expect_test "parse let binding" = - print_string (printer (parse "let x = 5 in x" |> Result.get_ok)); - [%expect {| (let x = 5 in Var(x)) |}] + print_string (print_ast (parse "let x = 5 in x" |> Result.get_ok)); + [%expect {| (let x = CInt(5) in Var(x)) |}] ;; let%expect_test "parse application" = - print_string (printer (parse "f x" |> Result.get_ok)); + print_string (print_ast (parse "f x" |> Result.get_ok)); [%expect {| App (Var(f), Var(x)) |}] ;; let%expect_test "parse anonymous function" = - print_string (printer (parse "fun x -> x + 1" |> Result.get_ok)); - [%expect {| Fun (Var(x), (Var(x) + 1)) |}] + print_string (print_ast (parse "fun x -> x + 1" |> Result.get_ok)); + [%expect {| Fun (Var(x), (Var(x) + CInt(1))) |}] ;; let%expect_test "parse negative number" = - print_string (printer (parse "-5" |> Result.get_ok)); - [%expect {| -5 |}] + print_string (print_ast (parse "-5" |> Result.get_ok)); + [%expect {| CInt(-5) |}] ;; let%expect_test "parse complex expression" = - print_string (printer (parse "2 + 3 * 4" |> Result.get_ok)); - [%expect {| (2 + (3 * 4)) |}] + print_string (print_ast (parse "2 + 3 * 4" |> Result.get_ok)); + [%expect {| (CInt(2) + (CInt(3) * CInt(4))) |}] ;; let%expect_test "parse function with multiple args" = - print_string (printer (parse "let add x y = x + y in add 1 2" |> Result.get_ok)); + print_string (print_ast (parse "let add x y = x + y in add 1 2" |> Result.get_ok)); [%expect - {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), 1), 2)) |}] + {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), CInt(1)), CInt(2))) |}] ;; let%expect_test "parse nested application" = - print_string (printer (parse "f (g x)" |> Result.get_ok)); + print_string (print_ast (parse "f (g x)" |> Result.get_ok)); [%expect {| App (Var(f), App (Var(g), Var(x))) |}] ;; let%expect_test "factorial with rec" = print_string - (printer + (print_ast (parse "let rec fac n= if n = 1 then 1 else (fac (n-1)) * n" |> Result.get_ok)); [%expect - {|(let rec fac = Fun (Var(n), if ((Var(n) = 1)) then (1) else ((App (Var(fac), App (Var(n), -1)) * Var(n)))))|}] + {|(let rec fac = Fun (Var(n), if ((Var(n) = CInt(1))) then (CInt(1)) else ((App (Var(fac), App (Var(n), CInt(-1))) * Var(n)))))|}] ;; let%expect_test "some skope values" = @@ -95,114 +95,116 @@ let%expect_test "some skope values" = \ let inner pp = sterter pp + 8 in\n\ \ inner 8" in - print_string (printer (parse expresion |> Result.get_ok)); + print_string (print_ast (parse expresion |> Result.get_ok)); [%expect - {|(let result = (let sterter = Fun (Var(x), if (((Var(x) + (8 * 9)) > 4)) then ((Var(x) * 2)) else ((Var(x) * 5))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + 8)) in App (Var(inner), 8))))|}] + {|(let result = (let sterter = Fun (Var(x), if (((Var(x) + (CInt(8) * CInt(9))) > CInt(4))) then ((Var(x) * CInt(2))) else ((Var(x) * CInt(5)))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + CInt(8))) in App (Var(inner), CInt(8)))))|}] ;; let%expect_test "function annotation via fun" = - print_string (printer (parse "let function = fun a -> a * a" |> Result.get_ok)); + print_string (print_ast (parse "let function = fun a -> a * a" |> Result.get_ok)); [%expect {|(let function = Fun (Var(a), (Var(a) * Var(a))))|}] ;; let%expect_test "application with lambda" = - print_string (printer (parse "let tmp = (fun a -> a * a) 5" |> Result.get_ok)); - [%expect {|(let tmp = App (Fun (Var(a), (Var(a) * Var(a))), 5))|}] + print_string (print_ast (parse "let tmp = (fun a -> a * a) 5" |> Result.get_ok)); + [%expect {|(let tmp = App (Fun (Var(a), (Var(a) * Var(a))), CInt(5)))|}] ;; let%expect_test "unbounded lambda" = - print_string (printer (parse "(fun a -> a * a)" |> Result.get_ok)); + print_string (print_ast (parse "(fun a -> a * a)" |> Result.get_ok)); [%expect {|Fun (Var(a), (Var(a) * Var(a)))|}] ;; let%expect_test "simple application" = - prerr_string (printer (parse "let _ = g 4 (f 5)" |> Result.get_ok)); - [%expect {|(let _ = App (App (Var(g), 4), App (Var(f), 5)))|}] + prerr_string (print_ast (parse "let _ = g 4 (f 5)" |> Result.get_ok)); + [%expect {|(let _ = App (App (Var(g), CInt(4)), App (Var(f), CInt(5))))|}] ;; let%expect_test "nested let with application" = print_string - (printer (parse "let f = fun x -> x + 1 in let y = f 5 in y * 2" |> Result.get_ok)); + (print_ast (parse "let f = fun x -> x + 1 in let y = f 5 in y * 2" |> Result.get_ok)); [%expect - {| (let f = Fun (Var(x), (Var(x) + 1)) in (let y = App (Var(f), 5) in (Var(y) * 2))) |}] + {| (let f = Fun (Var(x), (Var(x) + CInt(1))) in (let y = App (Var(f), CInt(5)) in (Var(y) * CInt(2)))) |}] ;; let%expect_test "anonymous function in application" = - print_string (printer (parse "(fun x -> x * 2) 10" |> Result.get_ok)); - [%expect {| App (Fun (Var(x), (Var(x) * 2)), 10) |}] + print_string (print_ast (parse "(fun x -> x * 2) 10" |> Result.get_ok)); + [%expect {| App (Fun (Var(x), (Var(x) * CInt(2))), CInt(10)) |}] ;; let%expect_test "multiple applications with arithmetic" = - print_string (printer (parse "f (g x) + h (k y) * 2" |> Result.get_ok)); + print_string (print_ast (parse "f (g x) + h (k y) * 2" |> Result.get_ok)); [%expect - {| (App (Var(f), App (Var(g), Var(x))) + (App (Var(h), App (Var(k), Var(y))) * 2)) |}] + {| (App (Var(f), App (Var(g), Var(x))) + (App (Var(h), App (Var(k), Var(y))) * CInt(2))) |}] ;; let%expect_test "conditional with applications" = - print_string (printer (parse "if f x > 0 then g y else h z" |> Result.get_ok)); + print_string (print_ast (parse "if f x > 0 then g y else h z" |> Result.get_ok)); [%expect - {| if ((App (Var(f), Var(x)) > 0)) then (App (Var(g), Var(y))) else (App (Var(h), Var(z))) |}] + {| if ((App (Var(f), Var(x)) > CInt(0))) then (App (Var(g), Var(y))) else (App (Var(h), Var(z))) |}] ;; let%expect_test "nested anonymous functions" = - print_string (printer (parse "fun x -> fun y -> x + y" |> Result.get_ok)); + print_string (print_ast (parse "fun x -> fun y -> x + y" |> Result.get_ok)); [%expect {| Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) |}] ;; let%expect_test "let with multiple arguments and application" = - print_string (printer (parse "let add x y = x + y in add (f 1) (g 2)" |> Result.get_ok)); + print_string + (print_ast (parse "let add x y = x + y in add (f 1) (g 2)" |> Result.get_ok)); [%expect - {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), App (Var(f), 1)), App (Var(g), 2))) |}] + {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), App (Var(f), CInt(1))), App (Var(g), CInt(2)))) |}] ;; let%expect_test "application chain with comparison" = - print_string (printer (parse "f a b > g c d + 1" |> Result.get_ok)); + print_string (print_ast (parse "f a b > g c d + 1" |> Result.get_ok)); [%expect - {| (App (App (Var(f), Var(a)), Var(b)) > (App (App (Var(g), Var(c)), Var(d)) + 1)) |}] + {| (App (App (Var(f), Var(a)), Var(b)) > (App (App (Var(g), Var(c)), Var(d)) + CInt(1))) |}] ;; let%expect_test "nested lets with applications" = print_string - (printer + (print_ast (parse "let x = 5 in let f = fun y -> x + y in let z = f 10 in z * 2" |> Result.get_ok)); [%expect - {| (let x = 5 in (let f = Fun (Var(y), (Var(x) + Var(y))) in (let z = App (Var(f), 10) in (Var(z) * 2)))) |}] + {| (let x = CInt(5) in (let f = Fun (Var(y), (Var(x) + Var(y))) in (let z = App (Var(f), CInt(10)) in (Var(z) * CInt(2))))) |}] ;; let%expect_test "application with complex expressions" = print_string - (printer (parse "f (x + 1) (y * 2) (if z > 0 then a else b)" |> Result.get_ok)); + (print_ast (parse "f (x + 1) (y * 2) (if z > 0 then a else b)" |> Result.get_ok)); [%expect - {| App (App (App (Var(f), (Var(x) + 1)), (Var(y) * 2)), if ((Var(z) > 0)) then (Var(a)) else (Var(b))) |}] + {| App (App (App (Var(f), (Var(x) + CInt(1))), (Var(y) * CInt(2))), if ((Var(z) > CInt(0))) then (Var(a)) else (Var(b))) |}] ;; let%expect_test "recursive function with application" = print_string - (printer + (print_ast (parse "let rec fact n = if n = 0 then 1 else n * fact (n - 1) in fact 5" |> Result.get_ok)); [%expect - {| (let rec fact = Fun (Var(n), if ((Var(n) = 0)) then (1) else ((Var(n) * App (Var(fact), (Var(n) - 1))))) in App (Var(fact), 5)) |}] + {| (let rec fact = Fun (Var(n), if ((Var(n) = CInt(0))) then (CInt(1)) else ((Var(n) * App (Var(fact), (Var(n) - CInt(1)))))) in App (Var(fact), CInt(5))) |}] ;; let%expect_test "right application" = - print_string (printer (parse "g (f (q 5))" |> Result.get_ok)); - [%expect {|App (Var(g), App (Var(f), App (Var(q), 5)))|}] + print_string (print_ast (parse "g (f (q 5))" |> Result.get_ok)); + [%expect {|App (Var(g), App (Var(f), App (Var(q), CInt(5))))|}] ;; let%expect_test "nested if-then-else" = print_string - (printer (parse "if 4>8 then if 7>9 then 7 else g 7 else g (k 4) 7" |> Result.get_ok)); + (print_ast + (parse "if 4>8 then if 7>9 then 7 else g 7 else g (k 4) 7" |> Result.get_ok)); [%expect - {| if ((4 > 8)) then (if ((7 > 9)) then (7) else (App (Var(g), 7))) else (App (App (Var(g), App (Var(k), 4)), 7)) |}] + {| if ((CInt(4) > CInt(8))) then (if ((CInt(7) > CInt(9))) then (CInt(7)) else (App (Var(g), CInt(7)))) else (App (App (Var(g), App (Var(k), CInt(4))), CInt(7))) |}] ;; let%expect_test "test else if" = print_string - (printer (parse "if 4>8 then g 7 4 h else if 7>9 then 7 else g 7" |> Result.get_ok)); + (print_ast (parse "if 4>8 then g 7 4 h else if 7>9 then 7 else g 7" |> Result.get_ok)); [%expect - {| if ((4 > 8)) then (App (App (App (Var(g), 7), 4), Var(h))) else (if ((7 > 9)) then (7) else (App (Var(g), 7))) |}] + {| if ((CInt(4) > CInt(8))) then (App (App (App (Var(g), CInt(7)), CInt(4)), Var(h))) else (if ((CInt(7) > CInt(9))) then (CInt(7)) else (App (Var(g), CInt(7)))) |}] ;; (*--------------incorrect------------------ @@ -231,7 +233,7 @@ let%expect_test "test else if" = assert ( match parse "let r = let x u= u + 7 in let q =7" with | Ok p -> - let _ = Printf.printf "%s\n" (printer p) in + let _ = Printf.printf "%s\n" (print_ast p) in false | Error _ -> true) ;; @@ -241,7 +243,7 @@ let%expect_test "test else if" = assert ( match parse "r 5 (let f = 7 in 8)" with | Ok p -> - let _ = Printf.printf "%s\n" (printer p) in + let _ = Printf.printf "%s\n" (print_ast p) in false | Error _ -> true) ;; @@ -250,7 +252,7 @@ let%expect_test "test else if" = assert ( match parse "r 5 (let r = 7)" with | Ok p -> - let _ = Printf.printf "%s\n" (printer p) in + let _ = Printf.printf "%s\n" (print_ast p) in false | Error _ -> true) ;; @@ -262,7 +264,7 @@ let%expect_test "test else if" = assert ( match parse "r 5 (fun r -> r*r)" with | Ok p -> - let _ = Printf.printf "%s\n" (printer p) in + let _ = Printf.printf "%s\n" (print_ast p) in false | Error _ -> true) ;; @@ -271,7 +273,7 @@ let%expect_test "test else if" = assert ( match parse "5 + (fun r -> r*r)" with | Ok p -> - let _ = Printf.printf "%s\n" (printer p) in + let _ = Printf.printf "%s\n" (print_ast p) in false | Error _ -> true) ;; From b5fe166c5b1e6692d05ec1429373ca5415fbb483 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 18 Nov 2025 20:18:54 +0300 Subject: [PATCH 09/42] refactor: move tests to separate dir --- Svirukov/lib/dune | 12 +--- Svirukov/test/dune | 13 ++++ Svirukov/test/interpret_tests.t | 66 +++++++++++++++++++ .../{lib/tests.ml => test/parser_test.ml} | 0 4 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 Svirukov/test/dune create mode 100644 Svirukov/test/interpret_tests.t rename Svirukov/{lib/tests.ml => test/parser_test.ml} (100%) diff --git a/Svirukov/lib/dune b/Svirukov/lib/dune index a37e833b..98385516 100644 --- a/Svirukov/lib/dune +++ b/Svirukov/lib/dune @@ -2,19 +2,9 @@ (name lambda_lib) (public_name Svirukov.Lib) (modules Ast Interpret Parser Print) - (modules_without_implementation ast interpret) + (modules_without_implementation ast) (libraries base angstrom) (preprocess (pps ppx_deriving.show)) (instrumentation (backend bisect_ppx))) - - (library - (name tests) - (modules tests) - (libraries lambda_lib) - (preprocess - (pps ppx_expect ppx_deriving.show)) - (instrumentation - (backend bisect_ppx)) - (inline_tests)) diff --git a/Svirukov/test/dune b/Svirukov/test/dune new file mode 100644 index 00000000..0136169f --- /dev/null +++ b/Svirukov/test/dune @@ -0,0 +1,13 @@ +(library + (name parser_test) + (libraries lambda_lib) + (modules parser_test) + (inline_tests) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx))) + +(cram + (applies_to interpret_tests) + (deps ../bin/REPL.exe)) diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t new file mode 100644 index 00000000..178e758b --- /dev/null +++ b/Svirukov/test/interpret_tests.t @@ -0,0 +1,66 @@ +Copyright 2021-2024, Kakadu and contributors +SPDX-License-Identifier: CC0-1.0 + +Cram tests here. They run and compare program output to the expected output +https://dune.readthedocs.io/en/stable/tests.html#cram-tests +Use `dune promote` after you change things that should runned + +If you need to put sample program and use it both in your interpreter and preinstalled one, +you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` +in the dune file + + $ ../bin/REPL.exe -cbv -dparsetree < \f.x + (let _ = CInt(8)) + Fatal error: exception Failure("unimlemented") + Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 + Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 + Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 + [2] + $ ../bin/REPL.exe -dparsetree < garbage242 + (let _ = CInt(8)) + Fatal error: exception Failure("unimlemented") + Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 + Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 + Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 + [2] + + + + $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) + (let _ = CInt(8)) + Fatal error: exception Failure("unimlemented") + Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 + Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 + Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 + [2] +Below we redirect contents of the file to the evaluator + $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt + cannot open lam_1+1.txt: No such file + [2] + + $ ../bin/REPL.exe -ao < lam_1+1.txt + cannot open lam_1+1.txt: No such file + [2] + $ ../bin/REPL.exe -ao < lam_2x1.txt + cannot open lam_2x1.txt: No such file + [2] +Call by value doesn't reduce under abstraction + $ ../bin/REPL.exe -cbv < lam_2x1.txt + cannot open lam_2x1.txt: No such file + [2] + $ ../bin/REPL.exe -ao -small < lam_3x2.txt + cannot open lam_3x2.txt: No such file + [2] + $ ../bin/REPL.exe -ao < lam_zero.txt + cannot open lam_zero.txt: No such file + [2] +For 3! we use noral order reduction + $ cat lam_fac3.txt + cat: lam_fac3.txt: No such file or directory + [1] + $ ../bin/REPL.exe -no < lam_fac3.txt + cannot open lam_fac3.txt: No such file + [2] diff --git a/Svirukov/lib/tests.ml b/Svirukov/test/parser_test.ml similarity index 100% rename from Svirukov/lib/tests.ml rename to Svirukov/test/parser_test.ml From 27acecf931167f207b0d4f7c3152422b71328a6b Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 19 Nov 2025 00:23:30 +0300 Subject: [PATCH 10/42] feat: add application (though not complitely working) --- Svirukov/bin/REPL.ml | 11 +- Svirukov/bin/dune | 5 +- Svirukov/lib/ast.mli | 1 - Svirukov/lib/interpret.ml | 181 ++++++++++++++++++++++++++++++++ Svirukov/lib/interpret.mli | 28 ++++- Svirukov/lib/print.ml | 2 + Svirukov/test/interpret_tests.t | 65 +++--------- 7 files changed, 233 insertions(+), 60 deletions(-) create mode 100644 Svirukov/lib/interpret.ml diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 962ed694..303c1bc7 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -7,19 +7,12 @@ [@@@ocaml.text "/*"] open Lambda_lib - -let expression = - "let result =\n\ - \ let sterter x = if x + (8 * 9) > 4 then x * 2 else x * 5 in\n\ - \ let inner pp = sterter pp + 8 in\n\ - \ inner 8" -;; +open Stdio let () = let expr = - match Parser.parse "let _ = 8" with + match Parser.parse (Stdio.In_channel.(input_all stdin) |> Base.String.rstrip) with | Ok expr -> - (*let _ = Printf.printf "%d\n" r in*) let _ = Printf.printf "%s\n" (Print.print_ast expr) in expr | Error (`Parsing_error msg) -> failwith msg diff --git a/Svirukov/bin/dune b/Svirukov/bin/dune index 6cbf1af2..c1e593d1 100644 --- a/Svirukov/bin/dune +++ b/Svirukov/bin/dune @@ -2,6 +2,9 @@ (name REPL) (public_name REPL) (modules REPL) - (libraries lambda_lib) + (libraries lambda_lib stdio) (instrumentation (backend bisect_ppx))) + +(cram + (deps ./REPL.exe %{bin:REPL})) diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index ff4d6a61..2c0ab3f6 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -8,7 +8,6 @@ type constant = | CInt of int - | CBool of bool | CUnit type pattern = diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml new file mode 100644 index 00000000..b9cd1e51 --- /dev/null +++ b/Svirukov/lib/interpret.ml @@ -0,0 +1,181 @@ +open Ast +open Base + +type value = + | VInt of int + | VClosure of pattern * expr + | VRecClosure of pattern * pattern * expr + +and env = (string, value, Base.String.comparator_witness) Base.Map.t + +type error = + | UnboundVariable of string + | TypeError of string + | DivisionByZero + | ParttialApplication + | TooManyArgs + | Unimplemented + +module type MONAD = sig + type 'a t + + val return : 'a -> 'a t + val fail : error -> 'a t + val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t + val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t +end + +module ResultM : MONAD with type 'a t = ('a, error) result = struct + type 'a t = ('a, error) result + + let return x = Ok x + let fail msg = Error msg + + let ( >>= ) m f = + match m with + | Ok x -> f x + | Error e -> Error e + ;; + + let ( let* ) = ( >>= ) +end + +let ( let* ) = ResultM.( >>= ) + +let ok_or_novar option err = + match option with + | Some v -> ResultM.return v + | None -> ResultM.fail err +;; + +module Env : sig + val find : env -> string -> value option + val init : env + val add_val : env -> string -> value -> env +end = struct + let init = Map.empty (module String) + let find env key = Map.find env key + let add_val env key value = Map.set env ~key ~data:value +end + +let rec substitute expr varname value = + match expr with + | Constant _ -> expr + | Var (PVar name) when Base.String.( = ) name varname -> value + | Var _ -> expr + | Binop (op, left, right) -> + Binop (op, substitute left varname value, substitute right varname value) + | Conditional (cond, then_expr, else_expr) -> + Conditional + ( substitute cond varname value + , substitute then_expr varname value + , match else_expr with + | Some e -> Some (substitute e varname value) + | None -> None ) + | Let (rec_flag, pattern, value_expr, body_expr) -> + (match pattern with + | PVar bound_name when Base.String.( = ) bound_name varname -> expr + | _ -> + Let + ( rec_flag + , pattern + , substitute value_expr varname value + , match body_expr with + | Some e -> Some (substitute e varname value) + | None -> None )) + | Fun (PVar param, _) when Base.String.( = ) param varname -> expr + | Fun (param, body) -> Fun (param, substitute body varname value) + | App (func, arg) -> App (substitute func varname value, substitute arg varname value) +;; + +let rec count_args expr n = + match expr with + | Fun (_, body) -> count_args body (n + 1) + | expr -> expr, n +;; + +(* удобно при спуске к самой Fun делать список из вычисленных аргументов *) +let rec eval exp env = + match exp with + | Constant CUnit -> ResultM.return (Constant CUnit) + | Constant (CInt n) -> ResultM.return (Constant (CInt n)) + | Var (PVar name) -> + let* binding = ok_or_novar (Env.find env name) (UnboundVariable name) in + (match binding with + | VInt n -> ResultM.return (Constant (CInt n)) + | VClosure (pat, body) -> ResultM.return (Fun (pat, body)) + | VRecClosure (_, _, _) -> ResultM.fail Unimplemented) + | Binop (op, left, right) -> + let* l = + match eval left env with + | Ok (Constant (CInt n)) -> ResultM.return n + | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") + | Error er -> ResultM.fail er + in + let* r = + match eval right env with + | Ok (Constant (CInt n)) -> ResultM.return n + | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") + | Error er -> ResultM.fail er + in + (match op with + | Plus -> ResultM.return (Constant (CInt (l + r))) + | Minus -> ResultM.return (Constant (CInt (l - r))) + | Asteriks -> ResultM.return (Constant (CInt (l * r))) + | Dash -> ResultM.return (Constant (CInt (l / r))) + | Equals -> ResultM.return (Constant (CInt (if l = r then 1 else 0))) + | MoreThan -> ResultM.return (Constant (CInt (if l > r then 1 else 0))) + | LessThan -> ResultM.return (Constant (CInt (if l < r then 1 else 0))) + | EqLess -> ResultM.return (Constant (CInt (if l <= r then 1 else 0))) + | EqMore -> ResultM.return (Constant (CInt (if l >= r then 1 else 0)))) + (*TODO: don't know rec yet and something's wrong with functional types*) + | Let (NonRec, PVar name, body, cont) -> + let* body = eval body env in + let letval = + match body with + | Constant (CInt n) -> VInt n + | Fun (pat, inner) -> VClosure (pat, inner) + | _ -> failwith "can put only vars and funcs in env" + in + let new_env = Env.add_val env name letval in + (match cont with + | Some exp -> eval exp new_env + | None -> ResultM.return (Constant CUnit)) + | Conditional (cond, ifbr, elsebr) -> + let* cond = eval cond env in + (match cond with + | Constant (CInt n) when n = 1 -> eval ifbr env + | Constant (CInt n) when n = 0 -> + (match elsebr with + | Some e -> eval e env + | None -> ResultM.return (Constant CUnit)) + | _ -> ResultM.fail (TypeError "not a number in cond evaluation")) + | App (_, _) -> + let rec application core env args = + match args, core with + | [], Fun (_, _) -> ResultM.fail ParttialApplication + | [], expr -> eval expr env + | arg :: tail, Fun (PVar name, body) -> + let new_body = substitute body name arg in + application new_body env tail + | _ :: _, _ -> ResultM.fail TooManyArgs + in + let rec form_args expr list = + match expr with + | App (left, arg) -> + let* arg = eval arg env in + (match arg with + | Constant (CInt _) -> form_args left (List.append list [ arg ]) + | _ -> ResultM.fail TooManyArgs) + | _ -> ResultM.return (list, expr) + in + let* args, body = form_args exp [] in + application body env args + | _ -> failwith "unimlemented" +;; + +let run_interpret expr = + match eval expr Env.init with + | Ok exp -> Ok exp + | Error er -> Error er +;; diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index 8575e8ab..f50d0de0 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -6,4 +6,30 @@ [@@@ocaml.text "/*"] -val parse_and_run : string -> unit +open Ast + +type error = + | UnboundVariable of string + | TypeError of string + | DivisionByZero + | ParttialApplication + | TooManyArgs + | Unimplemented + +type value = + | VInt of int + | VClosure of pattern * expr + | VRecClosure of pattern * pattern * expr + +and env = (string, value, Base.String.comparator_witness) Base.Map.t + +module type MONAD = sig + type 'a t + + val return : 'a -> 'a t + val fail : error -> 'a t + val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t + val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t +end + +val run_interpret : expr -> (expr, error) result diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index ca8e1a1a..0bb5d22e 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -68,4 +68,6 @@ let print_error = function | TypeError err -> err | DivisionByZero -> "Division by zero" | Unimplemented -> "Not implemented yet..." + | TooManyArgs -> "Too many args for function" + | ParttialApplication -> "Not enought args to calculate function" ;; diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t index 178e758b..ee4c1f80 100644 --- a/Svirukov/test/interpret_tests.t +++ b/Svirukov/test/interpret_tests.t @@ -9,58 +9,27 @@ If you need to put sample program and use it both in your interpreter and preins you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` in the dune file - $ ../bin/REPL.exe -cbv -dparsetree < \f.x - (let _ = CInt(8)) - Fatal error: exception Failure("unimlemented") - Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 - Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 - Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 - [2] + $ ../bin/REPL.exe < 5 + 5 + (CInt(5) + CInt(5)) + CInt(10) $ ../bin/REPL.exe -dparsetree < garbage242 - (let _ = CInt(8)) + > let r x = x+x*8 in r 9 + (let r = Fun (Var(x), (Var(x) + (Var(x) * CInt(8)))) in App (Var(r), CInt(9))) Fatal error: exception Failure("unimlemented") Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 - Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 - Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 + Called from Lambda_lib__Interpret.eval in file "lib/interpret.ml", line 133, characters 16-29 + Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 189, characters 8-26 + Called from Dune__exe__REPL in file "bin/REPL.ml", line 20, characters 8-36 [2] + $ ../bin/REPL.exe < (fun s k -> s+k) 5 7 + App (App (Fun (Var(s), Fun (Var(k), (Var(s) + Var(k)))), CInt(5)), CInt(7)) + CInt(12) + $ ../bin/REPL.exe < let r = (fun s k -> s+k) 5 7 in let p = (fun s->s*2) ((fun k -> k*3) 10) in p/2 + r + (let r = App (App (Fun (Var(s), Fun (Var(k), (Var(s) + Var(k)))), CInt(5)), CInt(7)) in (let p = App (Fun (Var(s), (Var(s) * CInt(2))), App (Fun (Var(k), (Var(k) * CInt(3))), CInt(10))) in ((Var(p) / CInt(2)) + Var(r)))) + CInt(42) - $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) - (let _ = CInt(8)) - Fatal error: exception Failure("unimlemented") - Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 - Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 127, characters 8-26 - Called from Dune__exe__REPL in file "bin/REPL.ml", line 19, characters 8-36 - [2] -Below we redirect contents of the file to the evaluator - $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt - cannot open lam_1+1.txt: No such file - [2] - - $ ../bin/REPL.exe -ao < lam_1+1.txt - cannot open lam_1+1.txt: No such file - [2] - $ ../bin/REPL.exe -ao < lam_2x1.txt - cannot open lam_2x1.txt: No such file - [2] -Call by value doesn't reduce under abstraction - $ ../bin/REPL.exe -cbv < lam_2x1.txt - cannot open lam_2x1.txt: No such file - [2] - $ ../bin/REPL.exe -ao -small < lam_3x2.txt - cannot open lam_3x2.txt: No such file - [2] - $ ../bin/REPL.exe -ao < lam_zero.txt - cannot open lam_zero.txt: No such file - [2] -For 3! we use noral order reduction - $ cat lam_fac3.txt - cat: lam_fac3.txt: No such file or directory - [1] - $ ../bin/REPL.exe -no < lam_fac3.txt - cannot open lam_fac3.txt: No such file - [2] From 122bd68916be9a4b47a35ed3393d80566bd61efb Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 19 Nov 2025 00:47:21 +0300 Subject: [PATCH 11/42] fix: application order --- Svirukov/lib/interpret.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index b9cd1e51..8632d45d 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -165,7 +165,7 @@ let rec eval exp env = | App (left, arg) -> let* arg = eval arg env in (match arg with - | Constant (CInt _) -> form_args left (List.append list [ arg ]) + | Constant (CInt _) -> form_args left (List.append [ arg ] list) | _ -> ResultM.fail TooManyArgs) | _ -> ResultM.return (list, expr) in @@ -179,3 +179,5 @@ let run_interpret expr = | Ok exp -> Ok exp | Error er -> Error er ;; + +let r = 7 * 8 From e12dfb5544d911438ac28275e8554a6d511323c8 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 19 Nov 2025 09:25:39 +0300 Subject: [PATCH 12/42] fix: add body evaluation inside application and allow part app --- Svirukov/lib/interpret.ml | 21 +++++++++++---------- Svirukov/test/interpret_tests.t | 20 ++++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index 8632d45d..198ffed1 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -88,13 +88,6 @@ let rec substitute expr varname value = | App (func, arg) -> App (substitute func varname value, substitute arg varname value) ;; -let rec count_args expr n = - match expr with - | Fun (_, body) -> count_args body (n + 1) - | expr -> expr, n -;; - -(* удобно при спуске к самой Fun делать список из вычисленных аргументов *) let rec eval exp env = match exp with | Constant CUnit -> ResultM.return (Constant CUnit) @@ -153,7 +146,6 @@ let rec eval exp env = | App (_, _) -> let rec application core env args = match args, core with - | [], Fun (_, _) -> ResultM.fail ParttialApplication | [], expr -> eval expr env | arg :: tail, Fun (PVar name, body) -> let new_body = substitute body name arg in @@ -170,8 +162,17 @@ let rec eval exp env = | _ -> ResultM.return (list, expr) in let* args, body = form_args exp [] in - application body env args - | _ -> failwith "unimlemented" + let* new_body = + match body with + | Var (PVar name) -> + let* binding = eval body env in + ResultM.return (substitute body name binding) + | Fun (_, _) -> ResultM.return body + | _ -> ResultM.fail (TypeError "Can only apply args to funcs") + in + application new_body env args + | Fun (pat, ex) -> ResultM.return (Fun (pat, ex)) + | _ -> ResultM.fail Unimplemented ;; let run_interpret expr = diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t index ee4c1f80..44ff04a0 100644 --- a/Svirukov/test/interpret_tests.t +++ b/Svirukov/test/interpret_tests.t @@ -14,14 +14,9 @@ in the dune file (CInt(5) + CInt(5)) CInt(10) $ ../bin/REPL.exe -dparsetree < let r x = x+x*8 in r 9 - (let r = Fun (Var(x), (Var(x) + (Var(x) * CInt(8)))) in App (Var(r), CInt(9))) - Fatal error: exception Failure("unimlemented") - Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33 - Called from Lambda_lib__Interpret.eval in file "lib/interpret.ml", line 133, characters 16-29 - Called from Lambda_lib__Interpret.run_interpret in file "lib/interpret.ml", line 189, characters 8-26 - Called from Dune__exe__REPL in file "bin/REPL.ml", line 20, characters 8-36 - [2] + > let r x y= y+x*8 in r 9 + (let r = Fun (Var(x), Fun (Var(y), (Var(y) + (Var(x) * CInt(8))))) in App (Var(r), CInt(9))) + Fun (Var(y), (Var(y) + (CInt(9) * CInt(8)))) $ ../bin/REPL.exe < (fun s k -> s+k) 5 7 @@ -33,3 +28,12 @@ in the dune file (let r = App (App (Fun (Var(s), Fun (Var(k), (Var(s) + Var(k)))), CInt(5)), CInt(7)) in (let p = App (Fun (Var(s), (Var(s) * CInt(2))), App (Fun (Var(k), (Var(k) * CInt(3))), CInt(10))) in ((Var(p) / CInt(2)) + Var(r)))) CInt(42) + $ ../bin/REPL.exe < let x = 7*8+9 in (fun x -> x+x) 5 + (let x = ((CInt(7) * CInt(8)) + CInt(9)) in App (Fun (Var(x), (Var(x) + Var(x))), CInt(5))) + CInt(10) + + $ ../bin/REPL.exe < let x = 7 in let function a b = if x > 4 then x+b else a-b in function 0 1 + (let x = CInt(7) in (let function = Fun (Var(a), Fun (Var(b), if ((Var(x) > CInt(4))) then ((Var(x) + Var(b))) else ((Var(a) - Var(b))))) in App (App (Var(function), CInt(0)), CInt(1)))) + CInt(8) From 003bbc835cd6479bce4dff599fe715b0bee2e0a2 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 19 Nov 2025 19:50:00 +0300 Subject: [PATCH 13/42] feat: add rec functions - add calc of rec functions - add parser to fix split args bug --- Svirukov/lib/interpret.ml | 21 ++++++++++++++++++--- Svirukov/lib/interpret.mli | 2 +- Svirukov/lib/parser.ml | 23 ++++++++--------------- Svirukov/test/interpret_tests.t | 21 ++++++++++++++++++--- Svirukov/test/parser_test.ml | 14 +++++++------- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index 198ffed1..d09a809c 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -4,7 +4,7 @@ open Base type value = | VInt of int | VClosure of pattern * expr - | VRecClosure of pattern * pattern * expr + | VRecClosure of pattern * expr and env = (string, value, Base.String.comparator_witness) Base.Map.t @@ -97,7 +97,7 @@ let rec eval exp env = (match binding with | VInt n -> ResultM.return (Constant (CInt n)) | VClosure (pat, body) -> ResultM.return (Fun (pat, body)) - | VRecClosure (_, _, _) -> ResultM.fail Unimplemented) + | VRecClosure (pat, body) -> ResultM.return (Fun (pat, body))) | Binop (op, left, right) -> let* l = match eval left env with @@ -121,7 +121,7 @@ let rec eval exp env = | LessThan -> ResultM.return (Constant (CInt (if l < r then 1 else 0))) | EqLess -> ResultM.return (Constant (CInt (if l <= r then 1 else 0))) | EqMore -> ResultM.return (Constant (CInt (if l >= r then 1 else 0)))) - (*TODO: don't know rec yet and something's wrong with functional types*) + (*TODO: don't know rec yet*) | Let (NonRec, PVar name, body, cont) -> let* body = eval body env in let letval = @@ -134,6 +134,21 @@ let rec eval exp env = (match cont with | Some exp -> eval exp new_env | None -> ResultM.return (Constant CUnit)) + | Let (Rec, PVar name, body, cont) -> + let* helper = + match body with + | Fun (PVar var, func) -> ResultM.return (Fun (PVar var, func)) + | _ -> eval body env + in + let* new_env = + match helper with + | Fun (PVar var, func) -> + ResultM.return (Env.add_val env name (VRecClosure (PVar var, func))) + | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") + in + (match cont with + | Some e -> eval e new_env + | None -> ResultM.return (Constant CUnit)) | Conditional (cond, ifbr, elsebr) -> let* cond = eval cond env in (match cond with diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index f50d0de0..ea5c9d85 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -19,7 +19,7 @@ type error = type value = | VInt of int | VClosure of pattern * expr - | VRecClosure of pattern * pattern * expr + | VRecClosure of pattern * expr and env = (string, value, Base.String.comparator_witness) Base.Map.t diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index f61c244b..71151557 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -5,13 +5,6 @@ open Angstrom open Ast -let with_error p = - p - >>= function - | Ok result -> return result - | Error (`Parsing_error msg) -> fail msg -;; - let is_keyword = function | "let" | "in" | "fun" | "true" | "false" | "rec" | "else" | "if" | "then" -> true | _ -> false @@ -22,7 +15,9 @@ let is_space = function | _ -> false ;; +let skip_while1 p = satisfy p >>= fun c -> skip_while p >>| fun () -> c let skip_spaces = skip_while is_space +let split_args = skip_while1 is_space let varname = function | 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' -> true @@ -117,10 +112,11 @@ let expr = let app = choice [ skip_parens anonymous_fun; var ] >>= fun func -> - many1 (choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var ]) + many1 + (split_args + *> choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var ]) >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args in - (*we want to have oppotunity to use if-then-else (since it is obligatory) as arg to app*) choice [ (number >>| fun n -> Constant (CInt n)) ; app @@ -143,12 +139,9 @@ let expr = many (conde [ plus_op; minus_op ] >>= fun op -> mul_div >>| fun right -> op, right) >>| List.fold_left (fun left (op, right) -> Binop (op, left, right)) first in - let comparison = - add_sub - >>= fun left -> - option left (cmp_op >>= fun op -> add_sub >>| fun right -> Binop (op, left, right)) - in - comparison + add_sub + >>= fun left -> + option left (cmp_op >>= fun op -> add_sub >>| fun right -> Binop (op, left, right)) in let conditional = token (string "if") *> binopr diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t index 44ff04a0..b54f33e7 100644 --- a/Svirukov/test/interpret_tests.t +++ b/Svirukov/test/interpret_tests.t @@ -14,9 +14,9 @@ in the dune file (CInt(5) + CInt(5)) CInt(10) $ ../bin/REPL.exe -dparsetree < let r x y= y+x*8 in r 9 - (let r = Fun (Var(x), Fun (Var(y), (Var(y) + (Var(x) * CInt(8))))) in App (Var(r), CInt(9))) - Fun (Var(y), (Var(y) + (CInt(9) * CInt(8)))) + > let r x y= y+x*8 in r 9 10 + (let r = Fun (Var(x), Fun (Var(y), (Var(y) + (Var(x) * CInt(8))))) in App (App (Var(r), CInt(9)), CInt(10))) + CInt(82) $ ../bin/REPL.exe < (fun s k -> s+k) 5 7 @@ -37,3 +37,18 @@ in the dune file > let x = 7 in let function a b = if x > 4 then x+b else a-b in function 0 1 (let x = CInt(7) in (let function = Fun (Var(a), Fun (Var(b), if ((Var(x) > CInt(4))) then ((Var(x) + Var(b))) else ((Var(a) - Var(b))))) in App (App (Var(function), CInt(0)), CInt(1)))) CInt(8) + + $ ../bin/REPL.exe < let x = 7 in let y = x in x+y+8 + (let x = CInt(7) in (let y = Var(x) in ((Var(x) + Var(y)) + CInt(8)))) + CInt(22) + + $ ../bin/REPL.exe < let rec fac n = if n < 1 then 1 else (fac (n-1)) * n in fac 63 + (let rec fac = Fun (Var(n), if ((Var(n) < CInt(1))) then (CInt(1)) else ((App (Var(fac), (Var(n) - CInt(1))) * Var(n)))) in App (Var(fac), CInt(63))) + CInt(1585267068834414592) + + $ ../bin/REPL.exe < let rec fib n = if n < 2 then 1 else (fib (n-1)) + (fib (n-2)) in fib 10 + (let rec fib = Fun (Var(n), if ((Var(n) < CInt(2))) then (CInt(1)) else ((App (Var(fib), (Var(n) - CInt(1))) + App (Var(fib), (Var(n) - CInt(2)))))) in App (Var(fib), CInt(10))) + CInt(89) diff --git a/Svirukov/test/parser_test.ml b/Svirukov/test/parser_test.ml index e0837456..af804772 100644 --- a/Svirukov/test/parser_test.ml +++ b/Svirukov/test/parser_test.ml @@ -85,7 +85,7 @@ let%expect_test "factorial with rec" = (print_ast (parse "let rec fac n= if n = 1 then 1 else (fac (n-1)) * n" |> Result.get_ok)); [%expect - {|(let rec fac = Fun (Var(n), if ((Var(n) = CInt(1))) then (CInt(1)) else ((App (Var(fac), App (Var(n), CInt(-1))) * Var(n)))))|}] + {| (let rec fac = Fun (Var(n), if ((Var(n) = CInt(1))) then (CInt(1)) else ((App (Var(fac), (Var(n) - CInt(1))) * Var(n))))) |}] ;; let%expect_test "some skope values" = @@ -97,27 +97,27 @@ let%expect_test "some skope values" = in print_string (print_ast (parse expresion |> Result.get_ok)); [%expect - {|(let result = (let sterter = Fun (Var(x), if (((Var(x) + (CInt(8) * CInt(9))) > CInt(4))) then ((Var(x) * CInt(2))) else ((Var(x) * CInt(5)))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + CInt(8))) in App (Var(inner), CInt(8)))))|}] + {| (let result = (let sterter = Fun (Var(x), if (((Var(x) + (CInt(8) * CInt(9))) > CInt(4))) then ((Var(x) * CInt(2))) else ((Var(x) * CInt(5)))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + CInt(8))) in App (Var(inner), CInt(8))))) |}] ;; let%expect_test "function annotation via fun" = print_string (print_ast (parse "let function = fun a -> a * a" |> Result.get_ok)); - [%expect {|(let function = Fun (Var(a), (Var(a) * Var(a))))|}] + [%expect {| (let function = Fun (Var(a), (Var(a) * Var(a)))) |}] ;; let%expect_test "application with lambda" = print_string (print_ast (parse "let tmp = (fun a -> a * a) 5" |> Result.get_ok)); - [%expect {|(let tmp = App (Fun (Var(a), (Var(a) * Var(a))), CInt(5)))|}] + [%expect {| (let tmp = App (Fun (Var(a), (Var(a) * Var(a))), CInt(5))) |}] ;; let%expect_test "unbounded lambda" = print_string (print_ast (parse "(fun a -> a * a)" |> Result.get_ok)); - [%expect {|Fun (Var(a), (Var(a) * Var(a)))|}] + [%expect {| Fun (Var(a), (Var(a) * Var(a))) |}] ;; let%expect_test "simple application" = prerr_string (print_ast (parse "let _ = g 4 (f 5)" |> Result.get_ok)); - [%expect {|(let _ = App (App (Var(g), CInt(4)), App (Var(f), CInt(5))))|}] + [%expect {| (let _ = App (App (Var(g), CInt(4)), App (Var(f), CInt(5)))) |}] ;; let%expect_test "nested let with application" = @@ -189,7 +189,7 @@ let%expect_test "recursive function with application" = let%expect_test "right application" = print_string (print_ast (parse "g (f (q 5))" |> Result.get_ok)); - [%expect {|App (Var(g), App (Var(f), App (Var(q), CInt(5))))|}] + [%expect {| App (Var(g), App (Var(f), App (Var(q), CInt(5)))) |}] ;; let%expect_test "nested if-then-else" = From 1fc5439630a0fa47382455d705e130ed44da5290 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Wed, 19 Nov 2025 20:31:24 +0300 Subject: [PATCH 14/42] refactor: clean code - remove PAny - not much sence - remove VRecClosure - quite equal to simple VClosure - rewrite some obsolete parts of code --- Svirukov/lib/ast.mli | 4 +-- Svirukov/lib/interpret.ml | 52 +++++++++++++----------------------- Svirukov/lib/interpret.mli | 1 - Svirukov/lib/parser.ml | 23 +++++++--------- Svirukov/lib/print.ml | 16 +---------- Svirukov/test/parser_test.ml | 4 +-- 6 files changed, 33 insertions(+), 67 deletions(-) diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index 2c0ab3f6..95175dad 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -10,9 +10,7 @@ type constant = | CInt of int | CUnit -type pattern = - | PVar of string - | PAny +type pattern = PVar of string type rec_flag = | NonRec diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index d09a809c..fa20d3ff 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -4,7 +4,6 @@ open Base type value = | VInt of int | VClosure of pattern * expr - | VRecClosure of pattern * expr and env = (string, value, Base.String.comparator_witness) Base.Map.t @@ -42,20 +41,21 @@ end let ( let* ) = ResultM.( >>= ) -let ok_or_novar option err = - match option with - | Some v -> ResultM.return v - | None -> ResultM.fail err -;; - module Env : sig val find : env -> string -> value option val init : env val add_val : env -> string -> value -> env + val ok_or_novar : env -> string -> value ResultM.t end = struct let init = Map.empty (module String) let find env key = Map.find env key let add_val env key value = Map.set env ~key ~data:value + + let ok_or_novar env name = + match find env name with + | Some v -> ResultM.return v + | None -> ResultM.fail (UnboundVariable name) + ;; end let rec substitute expr varname value = @@ -93,24 +93,19 @@ let rec eval exp env = | Constant CUnit -> ResultM.return (Constant CUnit) | Constant (CInt n) -> ResultM.return (Constant (CInt n)) | Var (PVar name) -> - let* binding = ok_or_novar (Env.find env name) (UnboundVariable name) in + let* binding = Env.ok_or_novar env name in (match binding with | VInt n -> ResultM.return (Constant (CInt n)) - | VClosure (pat, body) -> ResultM.return (Fun (pat, body)) - | VRecClosure (pat, body) -> ResultM.return (Fun (pat, body))) + | VClosure (pat, body) -> ResultM.return (Fun (pat, body))) | Binop (op, left, right) -> - let* l = - match eval left env with - | Ok (Constant (CInt n)) -> ResultM.return n - | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") - | Error er -> ResultM.fail er - in - let* r = - match eval right env with + let eval_binop expr = + match eval expr env with | Ok (Constant (CInt n)) -> ResultM.return n | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") | Error er -> ResultM.fail er in + let* l = eval_binop left in + let* r = eval_binop right in (match op with | Plus -> ResultM.return (Constant (CInt (l + r))) | Minus -> ResultM.return (Constant (CInt (l - r))) @@ -121,29 +116,23 @@ let rec eval exp env = | LessThan -> ResultM.return (Constant (CInt (if l < r then 1 else 0))) | EqLess -> ResultM.return (Constant (CInt (if l <= r then 1 else 0))) | EqMore -> ResultM.return (Constant (CInt (if l >= r then 1 else 0)))) - (*TODO: don't know rec yet*) | Let (NonRec, PVar name, body, cont) -> let* body = eval body env in - let letval = + let* letval = match body with - | Constant (CInt n) -> VInt n - | Fun (pat, inner) -> VClosure (pat, inner) - | _ -> failwith "can put only vars and funcs in env" + | Constant (CInt n) -> ResultM.return (VInt n) + | Fun (pat, inner) -> ResultM.return (VClosure (pat, inner)) + | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") in let new_env = Env.add_val env name letval in (match cont with | Some exp -> eval exp new_env | None -> ResultM.return (Constant CUnit)) | Let (Rec, PVar name, body, cont) -> - let* helper = - match body with - | Fun (PVar var, func) -> ResultM.return (Fun (PVar var, func)) - | _ -> eval body env - in let* new_env = - match helper with + match body with | Fun (PVar var, func) -> - ResultM.return (Env.add_val env name (VRecClosure (PVar var, func))) + ResultM.return (Env.add_val env name (VClosure (PVar var, func))) | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") in (match cont with @@ -187,7 +176,6 @@ let rec eval exp env = in application new_body env args | Fun (pat, ex) -> ResultM.return (Fun (pat, ex)) - | _ -> ResultM.fail Unimplemented ;; let run_interpret expr = @@ -195,5 +183,3 @@ let run_interpret expr = | Ok exp -> Ok exp | Error er -> Error er ;; - -let r = 7 * 8 diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index ea5c9d85..7d670f2f 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -19,7 +19,6 @@ type error = type value = | VInt of int | VClosure of pattern * expr - | VRecClosure of pattern * expr and env = (string, value, Base.String.comparator_witness) Base.Map.t diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index 71151557..569a0a07 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -6,7 +6,7 @@ open Angstrom open Ast let is_keyword = function - | "let" | "in" | "fun" | "true" | "false" | "rec" | "else" | "if" | "then" -> true + | "let" | "in" | "fun" | "true" | "false" | "rec" | "else" | "if" | "then" | "_" -> true | _ -> false ;; @@ -31,10 +31,6 @@ let conde = function type error = [ `Parsing_error of string ] -let pp_error ppf = function - | `Parsing_error s -> Format.fprintf ppf "%s" s -;; - let token p = skip_spaces *> p let is_digit = function @@ -51,8 +47,8 @@ let variable_name = | _ -> return s ;; -let pattern = variable_name >>| fun s -> if s = "_" then PAny else PVar s -let var = pattern >>| fun p -> Var p +let var = variable_name >>| fun s -> PVar s +let var_expr = var >>| fun p -> Var p let parse_bool = token (string "true") <|> token (string "false") >>| bool_of_string let skip_parens p = token (char '(') *> p <* token (char ')') @@ -105,22 +101,23 @@ let expr = fix (fun expr -> let atom = let anonymous_fun = - token (string "fun") *> many1 (token pattern) + token (string "fun") *> many1 (token var) <* token (string "->") >>= fun args -> expr >>= fun body -> return (build_curried_function args body) in let app = - choice [ skip_parens anonymous_fun; var ] + choice [ skip_parens anonymous_fun; var_expr ] >>= fun func -> many1 (split_args - *> choice [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var ]) + *> choice + [ (number >>| fun n -> Constant (CInt n)); skip_parens expr; var_expr ]) >>| fun args -> List.fold_left (fun func arg -> App (func, arg)) func args in choice [ (number >>| fun n -> Constant (CInt n)) ; app - ; var + ; var_expr ; skip_parens expr ; anonymous_fun ] @@ -154,9 +151,9 @@ let expr = let let_binding = token (string "let") *> option NonRec (token (string "rec") >>| fun _ -> Rec) >>= fun recurs -> - pattern + var >>= fun name -> - many pattern + many var >>= fun args -> token (char '=') *> expr >>= fun ex -> diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index 0bb5d22e..779b9a1f 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -4,13 +4,7 @@ open Interpret let rec print_ast = function | Constant CUnit -> "CUnit" | Constant (CInt n) -> Printf.sprintf "CInt(%d)" n - | Var pat -> - let line = - match pat with - | PAny -> "Var(_)" - | PVar name -> Printf.sprintf "Var(%s)" name - in - line + | Var (PVar name) -> Printf.sprintf "Var(%s)" name | Binop (op, left, right) -> let l = print_ast left in let r = print_ast right in @@ -47,15 +41,7 @@ let rec print_ast = function | Some next, NonRec, PVar name -> let cont = print_ast next in Printf.sprintf "(let %s = %s in %s)" name b cont - | Some next, Rec, PAny -> - let cont = print_ast next in - Printf.sprintf "(let rec _ = %s in %s)" b cont - | None, NonRec, PAny -> Printf.sprintf "(let _ = %s)" b - | Some next, NonRec, PAny -> - let cont = print_ast next in - Printf.sprintf "(let _ = %s in %s)" b cont | None, Rec, PVar name -> Printf.sprintf "(let rec %s = %s)" name b - | None, Rec, _ -> Printf.sprintf "(let rec _ = %s)" b in res | Fun (var, body) -> diff --git a/Svirukov/test/parser_test.ml b/Svirukov/test/parser_test.ml index af804772..d6372d88 100644 --- a/Svirukov/test/parser_test.ml +++ b/Svirukov/test/parser_test.ml @@ -116,8 +116,8 @@ let%expect_test "unbounded lambda" = ;; let%expect_test "simple application" = - prerr_string (print_ast (parse "let _ = g 4 (f 5)" |> Result.get_ok)); - [%expect {| (let _ = App (App (Var(g), CInt(4)), App (Var(f), CInt(5)))) |}] + prerr_string (print_ast (parse "let k = g 4 (f 5)" |> Result.get_ok)); + [%expect {| (let k = App (App (Var(g), CInt(4)), App (Var(f), CInt(5)))) |}] ;; let%expect_test "nested let with application" = From 292d4753ae696c1e9dda94773178ae2b09acca4d Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 20 Nov 2025 11:52:10 +0300 Subject: [PATCH 15/42] tests: add tests with qcheck for parser and cram for interpret --- Svirukov/Makefile | 2 +- Svirukov/bin/REPL.ml | 2 +- Svirukov/lib/interpret.ml | 6 +- Svirukov/lib/parser.ml | 6 +- Svirukov/lib/print.ml | 56 ++++----- Svirukov/test/dune | 4 +- Svirukov/test/interpret_tests.t | 98 ++++++++++++---- Svirukov/test/parser_gentest.ml | 195 ++++++++++++++++++++++++++++++++ Svirukov/test/parser_test.ml | 151 ++++++------------------- 9 files changed, 340 insertions(+), 180 deletions(-) create mode 100644 Svirukov/test/parser_gentest.ml diff --git a/Svirukov/Makefile b/Svirukov/Makefile index e234db4b..403dcb1f 100644 --- a/Svirukov/Makefile +++ b/Svirukov/Makefile @@ -35,7 +35,7 @@ odig: odig odoc $(ODIG_SWITCHES) Lambda TEST_COV_D = /tmp/cov -COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect tests/ +COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect test/ .PHONY: test_coverage coverage test_coverage: coverage diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 303c1bc7..24c69e8d 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -11,7 +11,7 @@ open Stdio let () = let expr = - match Parser.parse (Stdio.In_channel.(input_all stdin) |> Base.String.rstrip) with + match Parser.parse (In_channel.(input_all stdin) |> Base.String.rstrip) with | Ok expr -> let _ = Printf.printf "%s\n" (Print.print_ast expr) in expr diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index fa20d3ff..ebe268b3 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -160,9 +160,7 @@ let rec eval exp env = match expr with | App (left, arg) -> let* arg = eval arg env in - (match arg with - | Constant (CInt _) -> form_args left (List.append [ arg ] list) - | _ -> ResultM.fail TooManyArgs) + form_args left (List.append [ arg ] list) | _ -> ResultM.return (list, expr) in let* args, body = form_args exp [] in @@ -172,7 +170,7 @@ let rec eval exp env = let* binding = eval body env in ResultM.return (substitute body name binding) | Fun (_, _) -> ResultM.return body - | _ -> ResultM.fail (TypeError "Can only apply args to funcs") + | _ -> ResultM.fail (TypeError "can only apply args to funcs") in application new_body env args | Fun (pat, ex) -> ResultM.return (Fun (pat, ex)) diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index 569a0a07..db881b75 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -42,8 +42,8 @@ let variable_name = token (take_while1 varname) >>= fun s -> match s with - | _ when is_keyword s -> fail "Cannot use keyword for varname" - | _ when String.for_all is_digit s -> fail "Cannot use number as varname" + | _ when is_keyword s -> fail "cannot use keyword for varname" + | _ when String.for_all is_digit s -> fail "cannot use number as varname" | _ -> return s ;; @@ -88,7 +88,7 @@ let cmp_op = | "=" -> return Equals | ">" -> return MoreThan | "<" -> return LessThan - | _ -> fail "Invalid comparison operator" + | _ -> fail "invalid comparison operator" ;; let rec build_curried_function args body = diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index 779b9a1f..b34bb58e 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -2,13 +2,11 @@ open Ast open Interpret let rec print_ast = function - | Constant CUnit -> "CUnit" - | Constant (CInt n) -> Printf.sprintf "CInt(%d)" n - | Var (PVar name) -> Printf.sprintf "Var(%s)" name + | Constant CUnit -> "()" + | Constant (CInt n) -> string_of_int n + | Var (PVar name) -> name | Binop (op, left, right) -> - let l = print_ast left in - let r = print_ast right in - let s = + let op_str = match op with | Plus -> "+" | Minus -> "-" @@ -20,33 +18,25 @@ let rec print_ast = function | EqLess -> "<=" | EqMore -> ">=" in - Printf.sprintf "(%s %s %s)" l s r - | Conditional (cond, main, alt) -> - let cond = print_ast cond in - let main = print_ast main in - let res = - match alt with - | Some ex -> Printf.sprintf "if (%s) then (%s) else (%s)" cond main (print_ast ex) - | None -> Printf.sprintf "if (%s) then (%s)" cond main - in - res - | Let (flag, pat, body, next) -> - let b = print_ast body in - let res = - match next, flag, pat with - | Some next, Rec, PVar name -> - let cont = print_ast next in - Printf.sprintf "(let rec %s = %s in %s)" name b cont - | None, NonRec, PVar name -> Printf.sprintf "(let %s = %s)" name b - | Some next, NonRec, PVar name -> - let cont = print_ast next in - Printf.sprintf "(let %s = %s in %s)" name b cont - | None, Rec, PVar name -> Printf.sprintf "(let rec %s = %s)" name b - in - res - | Fun (var, body) -> - Printf.sprintf "Fun (%s, %s)" (print_ast (Var var)) (print_ast body) - | App (left, right) -> Printf.sprintf "App (%s, %s)" (print_ast left) (print_ast right) + Printf.sprintf "(%s %s %s)" (print_ast left) op_str (print_ast right) + | Conditional (cond, main, None) -> + Printf.sprintf "(if %s then %s)" (print_ast cond) (print_ast main) + | Conditional (cond, main, Some alt) -> + Printf.sprintf + "(if %s then %s else %s)" + (print_ast cond) + (print_ast main) + (print_ast alt) + | Let (NonRec, PVar name, body, None) -> + Printf.sprintf "(let %s = %s)" name (print_ast body) + | Let (NonRec, PVar name, body, Some next) -> + Printf.sprintf "(let %s = %s in %s)" name (print_ast body) (print_ast next) + | Let (Rec, PVar name, body, None) -> + Printf.sprintf "(let rec %s = %s)" name (print_ast body) + | Let (Rec, PVar name, body, Some next) -> + Printf.sprintf "(let rec %s = %s in %s)" name (print_ast body) (print_ast next) + | Fun (PVar arg, body) -> Printf.sprintf "(fun %s -> %s)" arg (print_ast body) + | App (left, right) -> Printf.sprintf "%s %s" (print_ast left) (print_ast right) ;; let print_error = function diff --git a/Svirukov/test/dune b/Svirukov/test/dune index 0136169f..cf2e22b2 100644 --- a/Svirukov/test/dune +++ b/Svirukov/test/dune @@ -1,7 +1,7 @@ (library (name parser_test) - (libraries lambda_lib) - (modules parser_test) + (libraries lambda_lib qcheck) + (modules parser_test parser_gentest) (inline_tests) (preprocess (pps ppx_expect ppx_deriving.show)) diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t index b54f33e7..d68b0faa 100644 --- a/Svirukov/test/interpret_tests.t +++ b/Svirukov/test/interpret_tests.t @@ -11,44 +11,104 @@ in the dune file $ ../bin/REPL.exe < 5 + 5 - (CInt(5) + CInt(5)) - CInt(10) + (5 + 5) + 10 $ ../bin/REPL.exe -dparsetree < let r x y= y+x*8 in r 9 10 - (let r = Fun (Var(x), Fun (Var(y), (Var(y) + (Var(x) * CInt(8))))) in App (App (Var(r), CInt(9)), CInt(10))) - CInt(82) + (let r = (fun x -> (fun y -> (y + (x * 8)))) in r 9 10) + 82 $ ../bin/REPL.exe < (fun s k -> s+k) 5 7 - App (App (Fun (Var(s), Fun (Var(k), (Var(s) + Var(k)))), CInt(5)), CInt(7)) - CInt(12) + (fun s -> (fun k -> (s + k))) 5 7 + 12 $ ../bin/REPL.exe < let r = (fun s k -> s+k) 5 7 in let p = (fun s->s*2) ((fun k -> k*3) 10) in p/2 + r - (let r = App (App (Fun (Var(s), Fun (Var(k), (Var(s) + Var(k)))), CInt(5)), CInt(7)) in (let p = App (Fun (Var(s), (Var(s) * CInt(2))), App (Fun (Var(k), (Var(k) * CInt(3))), CInt(10))) in ((Var(p) / CInt(2)) + Var(r)))) - CInt(42) + (let r = (fun s -> (fun k -> (s + k))) 5 7 in (let p = (fun s -> (s * 2)) (fun k -> (k * 3)) 10 in ((p / 2) + r))) + 42 $ ../bin/REPL.exe < let x = 7*8+9 in (fun x -> x+x) 5 - (let x = ((CInt(7) * CInt(8)) + CInt(9)) in App (Fun (Var(x), (Var(x) + Var(x))), CInt(5))) - CInt(10) + (let x = ((7 * 8) + 9) in (fun x -> (x + x)) 5) + 10 $ ../bin/REPL.exe < let x = 7 in let function a b = if x > 4 then x+b else a-b in function 0 1 - (let x = CInt(7) in (let function = Fun (Var(a), Fun (Var(b), if ((Var(x) > CInt(4))) then ((Var(x) + Var(b))) else ((Var(a) - Var(b))))) in App (App (Var(function), CInt(0)), CInt(1)))) - CInt(8) + (let x = 7 in (let function = (fun a -> (fun b -> (if (x > 4) then (x + b) else (a - b)))) in function 0 1)) + 8 $ ../bin/REPL.exe < let x = 7 in let y = x in x+y+8 - (let x = CInt(7) in (let y = Var(x) in ((Var(x) + Var(y)) + CInt(8)))) - CInt(22) + (let x = 7 in (let y = x in ((x + y) + 8))) + 22 $ ../bin/REPL.exe < let rec fac n = if n < 1 then 1 else (fac (n-1)) * n in fac 63 - (let rec fac = Fun (Var(n), if ((Var(n) < CInt(1))) then (CInt(1)) else ((App (Var(fac), (Var(n) - CInt(1))) * Var(n)))) in App (Var(fac), CInt(63))) - CInt(1585267068834414592) + > let rec fac n = if n < 1 then 1 else (fac (n-1)) * n in fac 5 + (let rec fac = (fun n -> (if (n < 1) then 1 else (fac (n - 1) * n))) in fac 5) + 120 $ ../bin/REPL.exe < let rec fib n = if n < 2 then 1 else (fib (n-1)) + (fib (n-2)) in fib 10 - (let rec fib = Fun (Var(n), if ((Var(n) < CInt(2))) then (CInt(1)) else ((App (Var(fib), (Var(n) - CInt(1))) + App (Var(fib), (Var(n) - CInt(2)))))) in App (Var(fib), CInt(10))) - CInt(89) + (let rec fib = (fun n -> (if (n < 2) then 1 else (fib (n - 1) + fib (n - 2)))) in fib 10) + 89 + + $ ../bin/REPL.exe < let x = 5 in let r y x= x+y*2 in r x + (let x = 5 in (let r = (fun y -> (fun x -> (x + (y * 2)))) in r x)) + (fun x -> (x + (5 * 2))) + + $ ../bin/REPL.exe < let add x y = x + y in let add5 = add 5 in add5 3 + add5 2 + (let add = (fun x -> (fun y -> (x + y))) in (let add5 = add 5 in (add5 3 + add5 2))) + 15 + + $ ../bin/REPL.exe < let apply_twice f x = f (f x) in let inc x = x + 1 in apply_twice (inc 5) 7 + (let apply_twice = (fun f -> (fun x -> f f x)) in (let inc = (fun x -> (x + 1)) in apply_twice inc 5 7)) + can only apply args to funcs + + $ ../bin/REPL.exe < let x = -7 * -8 in let f y = x - y in f 1 + (let x = (-7 * -8) in (let f = (fun y -> (x - y)) in f 1)) + 55 + + $ ../bin/REPL.exe < let f x = x * x in f 5 5 + (let f = (fun x -> (x * x)) in f 5 5) + Too many args for function + + $ ../bin/REPL.exe < if (let s = 5) then 5 + (if (let s = 5) then 5) + not a number in cond evaluation + + $ ../bin/REPL.exe < let r = 4*8 in if r < 0 then 8 + (let r = (4 * 8) in (if (r < 0) then 8)) + () + + $ ../bin/REPL.exe < let r a = a*a in r (let y = 7) + (let r = (fun a -> (a * a)) in r (let y = 7)) + Can do binop only with const int + + $ ../bin/REPL.exe < let t = let r = 8 + (let t = (let r = 8)) + can put only vars and funcs in env + + $ ../bin/REPL.exe < let r = 5 in let rec f n k = if n > k then n + (f (n-1) k) else k in let y = if r > 0 then -1*r+5 else r-5 in f r y + (let r = 5 in (let rec f = (fun n -> (fun k -> (if (n > k) then (n + f (n - 1) k) else k))) in (let y = (if (r > 0) then ((-1 * r) + 5) else (r - 5)) in f r y))) + 15 + + $ ../bin/REPL.exe < let x c = c*2 in x g + (let x = (fun c -> (c * 2)) in x g) + Unbound variable g + + $ ../bin/REPL.exe < let x a b = a + b in let r t = t+t in x (r 10) 7 + (let x = (fun a -> (fun b -> (a + b))) in (let r = (fun t -> (t + t)) in x r 10 7)) + 27 diff --git a/Svirukov/test/parser_gentest.ml b/Svirukov/test/parser_gentest.ml new file mode 100644 index 00000000..07cdb873 --- /dev/null +++ b/Svirukov/test/parser_gentest.ml @@ -0,0 +1,195 @@ +open QCheck +open Lambda_lib.Parser +open Lambda_lib.Print +open Lambda_lib.Ast +open Gen + +let gen_constant = Gen.(map (fun i -> CInt i) small_int) + +let gen_var_name = + Gen.( + oneof + [ pure "x" + ; pure "y" + ; pure "z" + ; pure "a" + ; pure "b" + ; pure "c" + ; pure "f" + ; pure "g" + ; pure "h" + ; pure "n" + ; pure "m" + ; pure "p" + ; pure "q" + ]) +;; + +let gen_pattern = Gen.map (fun name -> PVar name) gen_var_name + +let gen_binop = + Gen.( + oneof + [ pure Plus + ; pure Minus + ; pure Asteriks + ; pure Dash + ; pure Equals + ; pure MoreThan + ; pure LessThan + ; pure EqLess + ; pure EqMore + ]) +;; + +let gen_expr = + let rec aux depth = + let open Gen in + if depth <= 0 + then + oneof [ map (fun c -> Constant c) gen_constant; map (fun p -> Var p) gen_pattern ] + else ( + let subexpr = aux (depth - 1) in + let medium_expr = aux (depth / 2) in + let simple_expr = aux 0 in + let gen_binopr_expr binop_depth = + let rec gen_binop_atom bdepth = + if bdepth <= 0 + then + oneof + [ map (fun c -> Constant c) gen_constant; map (fun p -> Var p) gen_pattern ] + else ( + let sub_binop = gen_binop_atom (bdepth - 1) in + oneof + [ map (fun c -> Constant c) gen_constant + ; map (fun p -> Var p) gen_pattern + ; map + (fun (left, op, right) -> Binop (op, left, right)) + (triple sub_binop gen_binop sub_binop) + ]) + in + gen_binop_atom binop_depth + in + oneof + [ map (fun c -> Constant c) gen_constant + ; map (fun p -> Var p) gen_pattern + ; (let* left = oneof [ map (fun p -> Var p) gen_pattern ] in + let* right = medium_expr in + return (App (left, right))) + ; (let* func = + map (fun (pat, body) -> Fun (pat, body)) (pair gen_pattern subexpr) + in + let* arg = medium_expr in + return (App (func, arg))) + ; (let* func = oneof [ map (fun p -> Var p) gen_pattern ] in + let* arg1 = simple_expr in + let* arg2 = simple_expr in + return (App (App (func, arg1), arg2))) + ; map (fun (pat, body) -> Fun (pat, body)) (pair gen_pattern subexpr) + ; (let* arg1 = gen_pattern in + let* arg2 = gen_pattern in + let* body = subexpr in + return (Fun (arg1, Fun (arg2, body)))) + ; map + (fun (left, op, right) -> Binop (op, left, right)) + (triple (gen_binopr_expr (depth / 2)) gen_binop (gen_binopr_expr (depth / 2))) + ; (let* cond = gen_binopr_expr (depth / 2) in + let* then_expr = subexpr in + let* else_opt = Gen.option subexpr in + return (Conditional (cond, then_expr, else_opt))) + ; (let* rec_flag = oneof [ pure NonRec; pure Rec ] in + let* pat = gen_pattern in + let* e1 = medium_expr in + let* next_opt = Gen.option subexpr in + return (Let (rec_flag, pat, e1, next_opt))) + ]) + in + Gen.sized (fun size -> + let depth = 1 + (size mod 6) in + aux depth) +;; + +let arb_program = make Gen.(map print_expr gen_expr) + +let gen_invalid_program = + make + (oneof + [ map (fun (n1, n2) -> Printf.sprintf "%d %d" n1 n2) (pair small_int small_int) + ; map (fun n -> Printf.sprintf "%d + + %d" n n) small_int + ; map (fun n -> Printf.sprintf "%d * * %d" n n) small_int + ; pure "let x = " + ; pure "if x > 5 then" + ; pure "fun x ->" + ; pure "x +" + ; map (fun n -> Printf.sprintf "(%d + %d" n n) small_int + ; map (fun n -> Printf.sprintf "((%d)))" n) small_int + ; map + (fun kw -> Printf.sprintf "let %s = 5 in x" kw) + (oneof + [ pure "let" + ; pure "in" + ; pure "fun" + ; pure "rec" + ; pure "if" + ; pure "then" + ; pure "else" + ; pure "true" + ; pure "false" + ; pure "rec" + ]) + ; map (fun n -> Printf.sprintf "let %d = 5 in x" n) small_int + ; pure "()" + ; pure "fun x .. -> x" + ; pure "fun x y -> -> x + y" + ; pure "let let x = 5 in x" + ; pure "if if x then 1 else 0" + ]) +;; + +let invalid_programs_fail_parsing = + Test.make + ~name:"Invalid programs should fail parsing" + ~count:100 + gen_invalid_program + (fun program_str -> + match parse program_str with + | Ok _ -> false + | Error _ -> true) +;; + +let invalid_prog = + Test.make + ~name:"Invalid programs return errors" + ~count:1000 + gen_invalid_program + (fun program_str -> + match parse program_str with + | Ok r -> + let _ = Printf.printf "\n%s %s\n" program_str (print_ast r) in + false + | Error _ -> true) +;; + +let round_trip_property = + Test.make ~name:"Parser round-trip property" ~count:1000 arb_program (fun program_str -> + match parse program_str with + | Ok ast -> + let printed = print_expr ast in + (match parse printed with + | Ok ast2 -> ast = ast2 + | Error _ -> false) + | Error _ -> true) +;; + +let parsing_crash = + Test.make + ~name:"Check whether parsing crashes when it shouldn't" + ~count:1000 + arb_program + (fun program_str -> + match parse program_str with + | Ok _ -> true + | Error _ -> false) +;; + +QCheck_runner.run_tests ~verbose:true [ round_trip_property; parsing_crash; invalid_prog ] diff --git a/Svirukov/test/parser_test.ml b/Svirukov/test/parser_test.ml index d6372d88..dc065462 100644 --- a/Svirukov/test/parser_test.ml +++ b/Svirukov/test/parser_test.ml @@ -11,73 +11,73 @@ open Lambda_lib.Parser let%expect_test "parse number" = print_string (print_ast (parse "42" |> Result.get_ok)); - [%expect {| CInt(42) |}] + [%expect {| 42 |}] ;; let%expect_test "parse variable" = print_string (print_ast (parse "x" |> Result.get_ok)); - [%expect {| Var(x) |}] + [%expect {| x |}] ;; let%expect_test "parse addition" = print_string (print_ast (parse "2 + 3" |> Result.get_ok)); - [%expect {| (CInt(2) + CInt(3)) |}] + [%expect {| (2 + 3) |}] ;; let%expect_test "parse multiplication" = print_string (print_ast (parse "2 * 3" |> Result.get_ok)); - [%expect {| (CInt(2) * CInt(3)) |}] + [%expect {| (2 * 3) |}] ;; let%expect_test "parse parentheses" = print_string (print_ast (parse "(2 + 3)" |> Result.get_ok)); - [%expect {| (CInt(2) + CInt(3)) |}] + [%expect {| (2 + 3) |}] ;; let%expect_test "parse comparison" = print_string (print_ast (parse "2 > 3" |> Result.get_ok)); - [%expect {| (CInt(2) > CInt(3)) |}] + [%expect {| (2 > 3) |}] ;; let%expect_test "parse conditional" = print_string (print_ast (parse "if 1 > 0 then 2 else 3" |> Result.get_ok)); - [%expect {| if ((CInt(1) > CInt(0))) then (CInt(2)) else (CInt(3)) |}] + [%expect {| (if (1 > 0) then 2 else 3) |}] ;; let%expect_test "parse let binding" = print_string (print_ast (parse "let x = 5 in x" |> Result.get_ok)); - [%expect {| (let x = CInt(5) in Var(x)) |}] + [%expect {| (let x = 5 in x) |}] ;; let%expect_test "parse application" = print_string (print_ast (parse "f x" |> Result.get_ok)); - [%expect {| App (Var(f), Var(x)) |}] + [%expect {| f x |}] ;; let%expect_test "parse anonymous function" = print_string (print_ast (parse "fun x -> x + 1" |> Result.get_ok)); - [%expect {| Fun (Var(x), (Var(x) + CInt(1))) |}] + [%expect {| (fun x -> (x + 1)) |}] ;; let%expect_test "parse negative number" = print_string (print_ast (parse "-5" |> Result.get_ok)); - [%expect {| CInt(-5) |}] + [%expect {| -5 |}] ;; let%expect_test "parse complex expression" = print_string (print_ast (parse "2 + 3 * 4" |> Result.get_ok)); - [%expect {| (CInt(2) + (CInt(3) * CInt(4))) |}] + [%expect {| (2 + (3 * 4)) |}] ;; let%expect_test "parse function with multiple args" = print_string (print_ast (parse "let add x y = x + y in add 1 2" |> Result.get_ok)); [%expect - {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), CInt(1)), CInt(2))) |}] + {| (let add = (fun x -> (fun y -> (x + y))) in add 1 2) |}] ;; let%expect_test "parse nested application" = print_string (print_ast (parse "f (g x)" |> Result.get_ok)); - [%expect {| App (Var(f), App (Var(g), Var(x))) |}] + [%expect {| f g x |}] ;; let%expect_test "factorial with rec" = @@ -85,7 +85,7 @@ let%expect_test "factorial with rec" = (print_ast (parse "let rec fac n= if n = 1 then 1 else (fac (n-1)) * n" |> Result.get_ok)); [%expect - {| (let rec fac = Fun (Var(n), if ((Var(n) = CInt(1))) then (CInt(1)) else ((App (Var(fac), (Var(n) - CInt(1))) * Var(n))))) |}] + {| (let rec fac = (fun n -> (if (n = 1) then 1 else (fac (n - 1) * n)))) |}] ;; let%expect_test "some skope values" = @@ -97,69 +97,69 @@ let%expect_test "some skope values" = in print_string (print_ast (parse expresion |> Result.get_ok)); [%expect - {| (let result = (let sterter = Fun (Var(x), if (((Var(x) + (CInt(8) * CInt(9))) > CInt(4))) then ((Var(x) * CInt(2))) else ((Var(x) * CInt(5)))) in (let inner = Fun (Var(pp), (App (Var(sterter), Var(pp)) + CInt(8))) in App (Var(inner), CInt(8))))) |}] + {| (let result = (let sterter = (fun x -> (if ((x + (8 * 9)) > 4) then (x * 2) else (x * 5))) in (let inner = (fun pp -> (sterter pp + 8)) in inner 8))) |}] ;; let%expect_test "function annotation via fun" = print_string (print_ast (parse "let function = fun a -> a * a" |> Result.get_ok)); - [%expect {| (let function = Fun (Var(a), (Var(a) * Var(a)))) |}] + [%expect {| (let function = (fun a -> (a * a))) |}] ;; let%expect_test "application with lambda" = print_string (print_ast (parse "let tmp = (fun a -> a * a) 5" |> Result.get_ok)); - [%expect {| (let tmp = App (Fun (Var(a), (Var(a) * Var(a))), CInt(5))) |}] + [%expect {| (let tmp = (fun a -> (a * a)) 5) |}] ;; let%expect_test "unbounded lambda" = print_string (print_ast (parse "(fun a -> a * a)" |> Result.get_ok)); - [%expect {| Fun (Var(a), (Var(a) * Var(a))) |}] + [%expect {| (fun a -> (a * a)) |}] ;; let%expect_test "simple application" = prerr_string (print_ast (parse "let k = g 4 (f 5)" |> Result.get_ok)); - [%expect {| (let k = App (App (Var(g), CInt(4)), App (Var(f), CInt(5)))) |}] + [%expect {| (let k = g 4 f 5) |}] ;; let%expect_test "nested let with application" = print_string (print_ast (parse "let f = fun x -> x + 1 in let y = f 5 in y * 2" |> Result.get_ok)); [%expect - {| (let f = Fun (Var(x), (Var(x) + CInt(1))) in (let y = App (Var(f), CInt(5)) in (Var(y) * CInt(2)))) |}] + {| (let f = (fun x -> (x + 1)) in (let y = f 5 in (y * 2))) |}] ;; let%expect_test "anonymous function in application" = print_string (print_ast (parse "(fun x -> x * 2) 10" |> Result.get_ok)); - [%expect {| App (Fun (Var(x), (Var(x) * CInt(2))), CInt(10)) |}] + [%expect {| (fun x -> (x * 2)) 10 |}] ;; let%expect_test "multiple applications with arithmetic" = print_string (print_ast (parse "f (g x) + h (k y) * 2" |> Result.get_ok)); [%expect - {| (App (Var(f), App (Var(g), Var(x))) + (App (Var(h), App (Var(k), Var(y))) * CInt(2))) |}] + {| (f g x + (h k y * 2)) |}] ;; let%expect_test "conditional with applications" = print_string (print_ast (parse "if f x > 0 then g y else h z" |> Result.get_ok)); [%expect - {| if ((App (Var(f), Var(x)) > CInt(0))) then (App (Var(g), Var(y))) else (App (Var(h), Var(z))) |}] + {| (if (f x > 0) then g y else h z) |}] ;; let%expect_test "nested anonymous functions" = print_string (print_ast (parse "fun x -> fun y -> x + y" |> Result.get_ok)); - [%expect {| Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) |}] + [%expect {| (fun x -> (fun y -> (x + y))) |}] ;; let%expect_test "let with multiple arguments and application" = print_string (print_ast (parse "let add x y = x + y in add (f 1) (g 2)" |> Result.get_ok)); [%expect - {| (let add = Fun (Var(x), Fun (Var(y), (Var(x) + Var(y)))) in App (App (Var(add), App (Var(f), CInt(1))), App (Var(g), CInt(2)))) |}] + {| (let add = (fun x -> (fun y -> (x + y))) in add f 1 g 2) |}] ;; let%expect_test "application chain with comparison" = print_string (print_ast (parse "f a b > g c d + 1" |> Result.get_ok)); [%expect - {| (App (App (Var(f), Var(a)), Var(b)) > (App (App (Var(g), Var(c)), Var(d)) + CInt(1))) |}] + {| (f a b > (g c d + 1)) |}] ;; let%expect_test "nested lets with applications" = @@ -168,14 +168,14 @@ let%expect_test "nested lets with applications" = (parse "let x = 5 in let f = fun y -> x + y in let z = f 10 in z * 2" |> Result.get_ok)); [%expect - {| (let x = CInt(5) in (let f = Fun (Var(y), (Var(x) + Var(y))) in (let z = App (Var(f), CInt(10)) in (Var(z) * CInt(2))))) |}] + {| (let x = 5 in (let f = (fun y -> (x + y)) in (let z = f 10 in (z * 2)))) |}] ;; let%expect_test "application with complex expressions" = print_string (print_ast (parse "f (x + 1) (y * 2) (if z > 0 then a else b)" |> Result.get_ok)); [%expect - {| App (App (App (Var(f), (Var(x) + CInt(1))), (Var(y) * CInt(2))), if ((Var(z) > CInt(0))) then (Var(a)) else (Var(b))) |}] + {| f (x + 1) (y * 2) (if (z > 0) then a else b) |}] ;; let%expect_test "recursive function with application" = @@ -184,12 +184,12 @@ let%expect_test "recursive function with application" = (parse "let rec fact n = if n = 0 then 1 else n * fact (n - 1) in fact 5" |> Result.get_ok)); [%expect - {| (let rec fact = Fun (Var(n), if ((Var(n) = CInt(0))) then (CInt(1)) else ((Var(n) * App (Var(fact), (Var(n) - CInt(1)))))) in App (Var(fact), CInt(5))) |}] + {| (let rec fact = (fun n -> (if (n = 0) then 1 else (n * fact (n - 1)))) in fact 5) |}] ;; let%expect_test "right application" = print_string (print_ast (parse "g (f (q 5))" |> Result.get_ok)); - [%expect {| App (Var(g), App (Var(f), App (Var(q), CInt(5)))) |}] + [%expect {| g f q 5 |}] ;; let%expect_test "nested if-then-else" = @@ -197,95 +197,12 @@ let%expect_test "nested if-then-else" = (print_ast (parse "if 4>8 then if 7>9 then 7 else g 7 else g (k 4) 7" |> Result.get_ok)); [%expect - {| if ((CInt(4) > CInt(8))) then (if ((CInt(7) > CInt(9))) then (CInt(7)) else (App (Var(g), CInt(7)))) else (App (App (Var(g), App (Var(k), CInt(4))), CInt(7))) |}] + {| (if (4 > 8) then (if (7 > 9) then 7 else g 7) else g k 4 7) |}] ;; let%expect_test "test else if" = print_string (print_ast (parse "if 4>8 then g 7 4 h else if 7>9 then 7 else g 7" |> Result.get_ok)); [%expect - {| if ((CInt(4) > CInt(8))) then (App (App (App (Var(g), CInt(7)), CInt(4)), Var(h))) else (if ((CInt(7) > CInt(9))) then (CInt(7)) else (App (Var(g), CInt(7)))) |}] -;; - -(*--------------incorrect------------------ - let%expect_test "let in application" = - assert ( - match parse "(let r = 4) 5" with - | Ok _ -> false - | Error _ -> true) - ;; - - let%expect_test "let inside let" = - assert ( - match parse "let = (let r = 4 + 5) 5" with - | Ok _ -> false - | Error _ -> true) - ;; - - let%expect_test "let inside if" = - assert ( - match parse "if let x = 5 in x > 0 then 1 else 0" with - | Ok _ -> false - | Error _ -> true) - ;; - - let%expect_test "double let" = - assert ( - match parse "let r = let x u= u + 7 in let q =7" with - | Ok p -> - let _ = Printf.printf "%s\n" (print_ast p) in - false - | Error _ -> true) - ;; - - (*apparently check, whether it is an expression or not, is something that should be done in interpreter*) - let%expect_test "if without else as app arg" = - assert ( - match parse "r 5 (let f = 7 in 8)" with - | Ok p -> - let _ = Printf.printf "%s\n" (print_ast p) in - false - | Error _ -> true) - ;; - - let%expect_test "let binding as app arg" = - assert ( - match parse "r 5 (let r = 7)" with - | Ok p -> - let _ = Printf.printf "%s\n" (print_ast p) in - false - | Error _ -> true) - ;; - let _ = - let r = fun s a -> s*a in - r 5 (fun d -> d*d) - - let%expect_test "lambda as app arg" = - assert ( - match parse "r 5 (fun r -> r*r)" with - | Ok p -> - let _ = Printf.printf "%s\n" (print_ast p) in - false - | Error _ -> true) - ;; - - let%expect_test "if in binop" = - assert ( - match parse "5 + (fun r -> r*r)" with - | Ok p -> - let _ = Printf.printf "%s\n" (print_ast p) in - false - | Error _ -> true) - ;; - - else is obligatory now*) -(*how to deal with in after let - there is either in or ;;*) - -(*okay, i should allow /\ (above) and check, whether is is an - expression (return some value) inside interpreter - but let = ... in let = g ;; - not allowed!!! - /\ - || ???? - || - \/ - separate cases for expressions and statements?*) + {| (if (4 > 8) then g 7 4 h else (if (7 > 9) then 7 else g 7)) |}] +;; From ab72061e1524e79cd5c3e590a07d36ea05f7c0af Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 20 Nov 2025 12:30:53 +0300 Subject: [PATCH 16/42] feat: add cmd args --- Svirukov/bin/REPL.ml | 17 ++- Svirukov/lib/interpret.ml | 180 ++++++++++++++++---------------- Svirukov/lib/interpret.mli | 3 +- Svirukov/lib/print.ml | 2 + Svirukov/test/interpret_tests.t | 14 ++- Svirukov/test/parser_gentest.ml | 4 +- Svirukov/test/parser_test.ml | 33 ++---- 7 files changed, 134 insertions(+), 119 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 24c69e8d..39a738fd 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -9,15 +9,28 @@ open Lambda_lib open Stdio +type args = + { mutable ast : bool + ; mutable steps : int + } + let () = + let pr_args = { ast = true; steps = max_int } in + let arg_list = + [ "--ast", Arg.Unit (fun () -> pr_args.ast <- false), "" + ; "--steps", Arg.Int (fun n -> pr_args.steps <- n), "" + ] + in + let usage_msg = "miniMl starts...\n" in + Arg.parse arg_list (fun _ -> ()) usage_msg; let expr = match Parser.parse (In_channel.(input_all stdin) |> Base.String.rstrip) with | Ok expr -> - let _ = Printf.printf "%s\n" (Print.print_ast expr) in + let _ = if pr_args.ast then Printf.printf "%s\n" (Print.print_ast expr) in expr | Error (`Parsing_error msg) -> failwith msg in - match Interpret.run_interpret expr with + match Interpret.run_interpret expr pr_args.steps with | Ok expr -> Printf.printf "%s\n" (Print.print_ast expr) | Error er -> Printf.printf "%s\n" (Print.print_error er) ;; diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index ebe268b3..17477866 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -13,6 +13,7 @@ type error = | DivisionByZero | ParttialApplication | TooManyArgs + | ExceedNumberOfSteps of expr | Unimplemented module type MONAD = sig @@ -88,96 +89,99 @@ let rec substitute expr varname value = | App (func, arg) -> App (substitute func varname value, substitute arg varname value) ;; -let rec eval exp env = - match exp with - | Constant CUnit -> ResultM.return (Constant CUnit) - | Constant (CInt n) -> ResultM.return (Constant (CInt n)) - | Var (PVar name) -> - let* binding = Env.ok_or_novar env name in - (match binding with - | VInt n -> ResultM.return (Constant (CInt n)) - | VClosure (pat, body) -> ResultM.return (Fun (pat, body))) - | Binop (op, left, right) -> - let eval_binop expr = - match eval expr env with - | Ok (Constant (CInt n)) -> ResultM.return n - | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") - | Error er -> ResultM.fail er - in - let* l = eval_binop left in - let* r = eval_binop right in - (match op with - | Plus -> ResultM.return (Constant (CInt (l + r))) - | Minus -> ResultM.return (Constant (CInt (l - r))) - | Asteriks -> ResultM.return (Constant (CInt (l * r))) - | Dash -> ResultM.return (Constant (CInt (l / r))) - | Equals -> ResultM.return (Constant (CInt (if l = r then 1 else 0))) - | MoreThan -> ResultM.return (Constant (CInt (if l > r then 1 else 0))) - | LessThan -> ResultM.return (Constant (CInt (if l < r then 1 else 0))) - | EqLess -> ResultM.return (Constant (CInt (if l <= r then 1 else 0))) - | EqMore -> ResultM.return (Constant (CInt (if l >= r then 1 else 0)))) - | Let (NonRec, PVar name, body, cont) -> - let* body = eval body env in - let* letval = - match body with - | Constant (CInt n) -> ResultM.return (VInt n) - | Fun (pat, inner) -> ResultM.return (VClosure (pat, inner)) - | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") - in - let new_env = Env.add_val env name letval in - (match cont with - | Some exp -> eval exp new_env - | None -> ResultM.return (Constant CUnit)) - | Let (Rec, PVar name, body, cont) -> - let* new_env = - match body with - | Fun (PVar var, func) -> - ResultM.return (Env.add_val env name (VClosure (PVar var, func))) - | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") - in - (match cont with - | Some e -> eval e new_env - | None -> ResultM.return (Constant CUnit)) - | Conditional (cond, ifbr, elsebr) -> - let* cond = eval cond env in - (match cond with - | Constant (CInt n) when n = 1 -> eval ifbr env - | Constant (CInt n) when n = 0 -> - (match elsebr with - | Some e -> eval e env - | None -> ResultM.return (Constant CUnit)) - | _ -> ResultM.fail (TypeError "not a number in cond evaluation")) - | App (_, _) -> - let rec application core env args = - match args, core with - | [], expr -> eval expr env - | arg :: tail, Fun (PVar name, body) -> - let new_body = substitute body name arg in - application new_body env tail - | _ :: _, _ -> ResultM.fail TooManyArgs - in - let rec form_args expr list = - match expr with - | App (left, arg) -> - let* arg = eval arg env in - form_args left (List.append [ arg ] list) - | _ -> ResultM.return (list, expr) - in - let* args, body = form_args exp [] in - let* new_body = - match body with - | Var (PVar name) -> - let* binding = eval body env in - ResultM.return (substitute body name binding) - | Fun (_, _) -> ResultM.return body - | _ -> ResultM.fail (TypeError "can only apply args to funcs") - in - application new_body env args - | Fun (pat, ex) -> ResultM.return (Fun (pat, ex)) +let rec eval exp env step = + if step = 0 + then ResultM.fail (ExceedNumberOfSteps exp) + else ( + match exp with + | Constant CUnit -> ResultM.return (Constant CUnit) + | Constant (CInt n) -> ResultM.return (Constant (CInt n)) + | Var (PVar name) -> + let* binding = Env.ok_or_novar env name in + (match binding with + | VInt n -> ResultM.return (Constant (CInt n)) + | VClosure (pat, body) -> ResultM.return (Fun (pat, body))) + | Binop (op, left, right) -> + let eval_binop expr = + match eval expr env (step - 1) with + | Ok (Constant (CInt n)) -> ResultM.return n + | Ok _ -> ResultM.fail (TypeError "Can do binop only with const int") + | Error er -> ResultM.fail er + in + let* l = eval_binop left in + let* r = eval_binop right in + (match op with + | Plus -> ResultM.return (Constant (CInt (l + r))) + | Minus -> ResultM.return (Constant (CInt (l - r))) + | Asteriks -> ResultM.return (Constant (CInt (l * r))) + | Dash -> ResultM.return (Constant (CInt (l / r))) + | Equals -> ResultM.return (Constant (CInt (if l = r then 1 else 0))) + | MoreThan -> ResultM.return (Constant (CInt (if l > r then 1 else 0))) + | LessThan -> ResultM.return (Constant (CInt (if l < r then 1 else 0))) + | EqLess -> ResultM.return (Constant (CInt (if l <= r then 1 else 0))) + | EqMore -> ResultM.return (Constant (CInt (if l >= r then 1 else 0)))) + | Let (NonRec, PVar name, body, cont) -> + let* body = eval body env (step - 1) in + let* letval = + match body with + | Constant (CInt n) -> ResultM.return (VInt n) + | Fun (pat, inner) -> ResultM.return (VClosure (pat, inner)) + | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") + in + let new_env = Env.add_val env name letval in + (match cont with + | Some exp -> eval exp new_env (step - 1) + | None -> ResultM.return (Constant CUnit)) + | Let (Rec, PVar name, body, cont) -> + let* new_env = + match body with + | Fun (PVar var, func) -> + ResultM.return (Env.add_val env name (VClosure (PVar var, func))) + | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") + in + (match cont with + | Some e -> eval e new_env (step - 1) + | None -> ResultM.return (Constant CUnit)) + | Conditional (cond, ifbr, elsebr) -> + let* cond = eval cond env (step - 1) in + (match cond with + | Constant (CInt n) when n = 1 -> eval ifbr env (step - 1) + | Constant (CInt n) when n = 0 -> + (match elsebr with + | Some e -> eval e env (step - 1) + | None -> ResultM.return (Constant CUnit)) + | _ -> ResultM.fail (TypeError "not a number in cond evaluation")) + | App (_, _) -> + let rec application core env args = + match args, core with + | [], expr -> eval expr env (step - 1) + | arg :: tail, Fun (PVar name, body) -> + let new_body = substitute body name arg in + application new_body env tail + | _ :: _, _ -> ResultM.fail TooManyArgs + in + let rec form_args expr list = + match expr with + | App (left, arg) -> + let* arg = eval arg env (step - 1) in + form_args left (List.append [ arg ] list) + | _ -> ResultM.return (list, expr) + in + let* args, body = form_args exp [] in + let* new_body = + match body with + | Var (PVar name) -> + let* binding = eval body env (step - 1) in + ResultM.return (substitute body name binding) + | Fun (_, _) -> ResultM.return body + | _ -> ResultM.fail (TypeError "can only apply args to funcs") + in + application new_body env args + | Fun (pat, ex) -> ResultM.return (Fun (pat, ex))) ;; -let run_interpret expr = - match eval expr Env.init with +let run_interpret expr steps = + match eval expr Env.init steps with | Ok exp -> Ok exp | Error er -> Error er ;; diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index 7d670f2f..faae3fd5 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -14,6 +14,7 @@ type error = | DivisionByZero | ParttialApplication | TooManyArgs + | ExceedNumberOfSteps of expr | Unimplemented type value = @@ -31,4 +32,4 @@ module type MONAD = sig val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end -val run_interpret : expr -> (expr, error) result +val run_interpret : expr -> int -> (expr, error) result diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index b34bb58e..783c7799 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -46,4 +46,6 @@ let print_error = function | Unimplemented -> "Not implemented yet..." | TooManyArgs -> "Too many args for function" | ParttialApplication -> "Not enought args to calculate function" + | ExceedNumberOfSteps expr -> + Printf.sprintf "Exceed number of redunction posssible: \n%s" (print_ast expr) ;; diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/test/interpret_tests.t index d68b0faa..40aaccda 100644 --- a/Svirukov/test/interpret_tests.t +++ b/Svirukov/test/interpret_tests.t @@ -13,7 +13,7 @@ in the dune file > 5 + 5 (5 + 5) 10 - $ ../bin/REPL.exe -dparsetree < let r x y= y+x*8 in r 9 10 (let r = (fun x -> (fun y -> (y + (x * 8)))) in r 9 10) 82 @@ -103,12 +103,18 @@ in the dune file (let r = 5 in (let rec f = (fun n -> (fun k -> (if (n > k) then (n + f (n - 1) k) else k))) in (let y = (if (r > 0) then ((-1 * r) + 5) else (r - 5)) in f r y))) 15 - $ ../bin/REPL.exe < let x c = c*2 in x g - (let x = (fun c -> (c * 2)) in x g) - Unbound variable g + Exceed number of redunction posssible: + (fun c -> (c * 2)) $ ../bin/REPL.exe < let x a b = a + b in let r t = t+t in x (r 10) 7 (let x = (fun a -> (fun b -> (a + b))) in (let r = (fun t -> (t + t)) in x r 10 7)) 27 + + $ ../bin/REPL.exe --steps 100 < let rec t n= t (n+1) in t 4 + (let rec t = (fun n -> t (n + 1)) in t 4) + Exceed number of redunction posssible: + 100 diff --git a/Svirukov/test/parser_gentest.ml b/Svirukov/test/parser_gentest.ml index 07cdb873..76a26f23 100644 --- a/Svirukov/test/parser_gentest.ml +++ b/Svirukov/test/parser_gentest.ml @@ -109,7 +109,7 @@ let gen_expr = aux depth) ;; -let arb_program = make Gen.(map print_expr gen_expr) +let arb_program = make Gen.(map print_ast gen_expr) let gen_invalid_program = make @@ -174,7 +174,7 @@ let round_trip_property = Test.make ~name:"Parser round-trip property" ~count:1000 arb_program (fun program_str -> match parse program_str with | Ok ast -> - let printed = print_expr ast in + let printed = print_ast ast in (match parse printed with | Ok ast2 -> ast = ast2 | Error _ -> false) diff --git a/Svirukov/test/parser_test.ml b/Svirukov/test/parser_test.ml index dc065462..07bc0c89 100644 --- a/Svirukov/test/parser_test.ml +++ b/Svirukov/test/parser_test.ml @@ -71,8 +71,7 @@ let%expect_test "parse complex expression" = let%expect_test "parse function with multiple args" = print_string (print_ast (parse "let add x y = x + y in add 1 2" |> Result.get_ok)); - [%expect - {| (let add = (fun x -> (fun y -> (x + y))) in add 1 2) |}] + [%expect {| (let add = (fun x -> (fun y -> (x + y))) in add 1 2) |}] ;; let%expect_test "parse nested application" = @@ -84,8 +83,7 @@ let%expect_test "factorial with rec" = print_string (print_ast (parse "let rec fac n= if n = 1 then 1 else (fac (n-1)) * n" |> Result.get_ok)); - [%expect - {| (let rec fac = (fun n -> (if (n = 1) then 1 else (fac (n - 1) * n)))) |}] + [%expect {| (let rec fac = (fun n -> (if (n = 1) then 1 else (fac (n - 1) * n)))) |}] ;; let%expect_test "some skope values" = @@ -123,8 +121,7 @@ let%expect_test "simple application" = let%expect_test "nested let with application" = print_string (print_ast (parse "let f = fun x -> x + 1 in let y = f 5 in y * 2" |> Result.get_ok)); - [%expect - {| (let f = (fun x -> (x + 1)) in (let y = f 5 in (y * 2))) |}] + [%expect {| (let f = (fun x -> (x + 1)) in (let y = f 5 in (y * 2))) |}] ;; let%expect_test "anonymous function in application" = @@ -134,14 +131,12 @@ let%expect_test "anonymous function in application" = let%expect_test "multiple applications with arithmetic" = print_string (print_ast (parse "f (g x) + h (k y) * 2" |> Result.get_ok)); - [%expect - {| (f g x + (h k y * 2)) |}] + [%expect {| (f g x + (h k y * 2)) |}] ;; let%expect_test "conditional with applications" = print_string (print_ast (parse "if f x > 0 then g y else h z" |> Result.get_ok)); - [%expect - {| (if (f x > 0) then g y else h z) |}] + [%expect {| (if (f x > 0) then g y else h z) |}] ;; let%expect_test "nested anonymous functions" = @@ -152,14 +147,12 @@ let%expect_test "nested anonymous functions" = let%expect_test "let with multiple arguments and application" = print_string (print_ast (parse "let add x y = x + y in add (f 1) (g 2)" |> Result.get_ok)); - [%expect - {| (let add = (fun x -> (fun y -> (x + y))) in add f 1 g 2) |}] + [%expect {| (let add = (fun x -> (fun y -> (x + y))) in add f 1 g 2) |}] ;; let%expect_test "application chain with comparison" = print_string (print_ast (parse "f a b > g c d + 1" |> Result.get_ok)); - [%expect - {| (f a b > (g c d + 1)) |}] + [%expect {| (f a b > (g c d + 1)) |}] ;; let%expect_test "nested lets with applications" = @@ -167,15 +160,13 @@ let%expect_test "nested lets with applications" = (print_ast (parse "let x = 5 in let f = fun y -> x + y in let z = f 10 in z * 2" |> Result.get_ok)); - [%expect - {| (let x = 5 in (let f = (fun y -> (x + y)) in (let z = f 10 in (z * 2)))) |}] + [%expect {| (let x = 5 in (let f = (fun y -> (x + y)) in (let z = f 10 in (z * 2)))) |}] ;; let%expect_test "application with complex expressions" = print_string (print_ast (parse "f (x + 1) (y * 2) (if z > 0 then a else b)" |> Result.get_ok)); - [%expect - {| f (x + 1) (y * 2) (if (z > 0) then a else b) |}] + [%expect {| f (x + 1) (y * 2) (if (z > 0) then a else b) |}] ;; let%expect_test "recursive function with application" = @@ -196,13 +187,11 @@ let%expect_test "nested if-then-else" = print_string (print_ast (parse "if 4>8 then if 7>9 then 7 else g 7 else g (k 4) 7" |> Result.get_ok)); - [%expect - {| (if (4 > 8) then (if (7 > 9) then 7 else g 7) else g k 4 7) |}] + [%expect {| (if (4 > 8) then (if (7 > 9) then 7 else g 7) else g k 4 7) |}] ;; let%expect_test "test else if" = print_string (print_ast (parse "if 4>8 then g 7 4 h else if 7>9 then 7 else g 7" |> Result.get_ok)); - [%expect - {| (if (4 > 8) then g 7 4 h else (if (7 > 9) then 7 else g 7)) |}] + [%expect {| (if (4 > 8) then g 7 4 h else (if (7 > 9) then 7 else g 7)) |}] ;; From caffcf5db3ca9081256e424464e4586b4b647a47 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sun, 23 Nov 2025 17:22:33 +0300 Subject: [PATCH 17/42] tests: add parser tests with qcheck --- Svirukov/Makefile | 4 ++-- Svirukov/{test => tests}/dune | 4 ++++ Svirukov/{test => tests}/interpret_tests.t | 0 Svirukov/{test => tests}/parser_gentest.ml | 0 Svirukov/{test => tests}/parser_test.ml | 0 5 files changed, 6 insertions(+), 2 deletions(-) rename Svirukov/{test => tests}/dune (80%) rename Svirukov/{test => tests}/interpret_tests.t (100%) rename Svirukov/{test => tests}/parser_gentest.ml (100%) rename Svirukov/{test => tests}/parser_test.ml (100%) diff --git a/Svirukov/Makefile b/Svirukov/Makefile index 403dcb1f..69c32f67 100644 --- a/Svirukov/Makefile +++ b/Svirukov/Makefile @@ -4,7 +4,7 @@ all: dune build repl: - dune build ./REPL.exe && rlwrap _build/default/REPL.exe + dune build ./bin/REPL.exe && rlwrap _build/default/bin/REPL.exe tests: test test: @@ -35,7 +35,7 @@ odig: odig odoc $(ODIG_SWITCHES) Lambda TEST_COV_D = /tmp/cov -COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect test/ +COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect tests/ .PHONY: test_coverage coverage test_coverage: coverage diff --git a/Svirukov/test/dune b/Svirukov/tests/dune similarity index 80% rename from Svirukov/test/dune rename to Svirukov/tests/dune index cf2e22b2..f9bb1c46 100644 --- a/Svirukov/test/dune +++ b/Svirukov/tests/dune @@ -11,3 +11,7 @@ (cram (applies_to interpret_tests) (deps ../bin/REPL.exe)) + +(cram + (applies_to inference) + (deps ../bin/inference_test.exe)) diff --git a/Svirukov/test/interpret_tests.t b/Svirukov/tests/interpret_tests.t similarity index 100% rename from Svirukov/test/interpret_tests.t rename to Svirukov/tests/interpret_tests.t diff --git a/Svirukov/test/parser_gentest.ml b/Svirukov/tests/parser_gentest.ml similarity index 100% rename from Svirukov/test/parser_gentest.ml rename to Svirukov/tests/parser_gentest.ml diff --git a/Svirukov/test/parser_test.ml b/Svirukov/tests/parser_test.ml similarity index 100% rename from Svirukov/test/parser_test.ml rename to Svirukov/tests/parser_test.ml From 3be5f09bc294bac431e19c395490f52b7aea6bac Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sun, 23 Nov 2025 19:12:53 +0300 Subject: [PATCH 18/42] feat: add inferencer --- Svirukov/bin/REPL.ml | 21 ++++- Svirukov/bin/dune | 11 +++ Svirukov/bin/inference_test.ml | 19 ++++ Svirukov/lib/dune | 2 +- Svirukov/lib/inferencer.ml | 166 +++++++++++++++++++++++++++++++++ Svirukov/lib/inferencer.mli | 19 ++++ Svirukov/tests/inference.t | 76 +++++++++++++++ 7 files changed, 309 insertions(+), 5 deletions(-) create mode 100644 Svirukov/bin/inference_test.ml create mode 100644 Svirukov/lib/inferencer.ml create mode 100644 Svirukov/lib/inferencer.mli create mode 100644 Svirukov/tests/inference.t diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 39a738fd..5df2e122 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -12,13 +12,15 @@ open Stdio type args = { mutable ast : bool ; mutable steps : int + ; mutable typecheck : bool } let () = - let pr_args = { ast = true; steps = max_int } in + let pr_args = { ast = true; steps = max_int; typecheck = false } in let arg_list = [ "--ast", Arg.Unit (fun () -> pr_args.ast <- false), "" ; "--steps", Arg.Int (fun n -> pr_args.steps <- n), "" + ; "--typecheck", Arg.Unit (fun () -> pr_args.typecheck <- true), "" ] in let usage_msg = "miniMl starts...\n" in @@ -30,7 +32,18 @@ let () = expr | Error (`Parsing_error msg) -> failwith msg in - match Interpret.run_interpret expr pr_args.steps with - | Ok expr -> Printf.printf "%s\n" (Print.print_ast expr) - | Error er -> Printf.printf "%s\n" (Print.print_error er) + let typecheck = + match pr_args.typecheck with + | true -> + (match Inferencer.typecheck_program expr with + | Ok _ -> None + | Error er -> Some (Inferencer.show_type_error er)) + | false -> None + in + match typecheck with + | None -> + (match Interpret.run_interpret expr pr_args.steps with + | Ok expr -> Printf.printf "%s\n" (Print.print_ast expr) + | Error er -> Printf.printf "%s\n" (Print.print_error er)) + | Some er -> Printf.printf "%s\n" er ;; diff --git a/Svirukov/bin/dune b/Svirukov/bin/dune index c1e593d1..e1b2c87f 100644 --- a/Svirukov/bin/dune +++ b/Svirukov/bin/dune @@ -6,5 +6,16 @@ (instrumentation (backend bisect_ppx))) +(executable + (name inference_test) + (public_name inference_test) + (modules inference_test) + (libraries lambda_lib stdio) + (instrumentation + (backend bisect_ppx))) + (cram (deps ./REPL.exe %{bin:REPL})) + +(cram + (deps ./inference_test.exe %{bin:inference_test})) diff --git a/Svirukov/bin/inference_test.ml b/Svirukov/bin/inference_test.ml new file mode 100644 index 00000000..69675115 --- /dev/null +++ b/Svirukov/bin/inference_test.ml @@ -0,0 +1,19 @@ +open Lambda_lib.Parser +open Lambda_lib.Print +open Lambda_lib.Inferencer + +let () = + let expr = + match parse (In_channel.(input_all stdin) |> Base.String.rstrip) with + | Ok expr -> + let _ = Printf.printf "%s\n" (print_ast expr) in + Ok expr + | Error (`Parsing_error msg) -> Error msg + in + match expr with + | Ok expr -> + (match typecheck_program expr with + | Ok ty -> Printf.printf "%s\n" (print_typ ty) + | Error er -> Printf.printf "%s\n" (show_type_error er)) + | Error er -> Printf.printf "%s\n" er +;; diff --git a/Svirukov/lib/dune b/Svirukov/lib/dune index 98385516..a32e7ad5 100644 --- a/Svirukov/lib/dune +++ b/Svirukov/lib/dune @@ -1,7 +1,7 @@ (library (name lambda_lib) (public_name Svirukov.Lib) - (modules Ast Interpret Parser Print) + (modules Ast Interpret Parser Print Inferencer) (modules_without_implementation ast) (libraries base angstrom) (preprocess diff --git a/Svirukov/lib/inferencer.ml b/Svirukov/lib/inferencer.ml new file mode 100644 index 00000000..e75e6753 --- /dev/null +++ b/Svirukov/lib/inferencer.ml @@ -0,0 +1,166 @@ +open Ast +open Base + +type typ = + | TInt + | TFun of typ * typ + | TUnit + | TVar of string + +let rec print_typ = function + | TInt -> "TInt" + | TFun (l, r) -> Printf.sprintf "TFun(%s, %s)" (print_typ l) (print_typ r) + | TUnit -> "TUnit" + | TVar s -> Printf.sprintf "TVar(%s)" s +;; + +type type_env = (string, typ, String.comparator_witness) Map.t + +type type_error = + | UnboundVariable of string + | TypeMismatch of typ * typ + | RecursiveFunctionError of string + | InvalidCondition + | ApplicationError + | NotExpression + +module TypeMonad = struct + type 'a t = ('a, type_error) result + + let return x = Ok x + let fail msg = Error msg + + let ( >>= ) m f = + match m with + | Ok x -> f x + | Error e -> Error e + ;; + + let ( let* ) = ( >>= ) +end + +let return = TypeMonad.return +let fail = TypeMonad.fail +let ( let* ) = TypeMonad.( let* ) + +let rec occurs_check var_name = function + | TVar name when String.( = ) name var_name -> true + | TFun (var, return_type) -> + occurs_check var_name return_type || occurs_check var_name var + | _ -> false +;; + +let rec unify t1 t2 = + match t1, t2 with + | TInt, TInt -> return () + | TUnit, TUnit -> return () + | TVar name1, TVar name2 when String.( = ) name1 name2 -> return () + | TVar name, t | t, TVar name -> + if occurs_check name t then fail (TypeMismatch (TVar name, t)) else return () + | TFun (arg1, ret1), TFun (arg2, ret2) -> + let* () = unify arg1 arg2 in + unify ret1 ret2 + | _ -> fail (TypeMismatch (t1, t2)) +;; + +type check_mode = + | Expression + | Statement + +let typecheck_program expr = + let rec check expr env counter mode = + let fresh_var counter = + let new_counter = counter + 1 in + TVar (string_of_int new_counter), new_counter + in + match expr with + | Constant CUnit -> return (TUnit, counter) + | Constant (CInt _) -> return (TInt, counter) + | Var (PVar name) -> + (match Map.find env name with + | Some typ -> return (typ, counter) + | None -> fail (UnboundVariable name)) + | Binop (_, left, right) -> + let* left_type, counter1 = check left env counter Expression in + let* right_type, counter2 = check right env counter1 Expression in + let* () = unify left_type TInt in + let* () = unify right_type TInt in + return (TInt, counter2) + | Conditional (cond, then_expr, else_expr) -> + let* cond_type, counter1 = check cond env counter Expression in + let* () = unify cond_type TInt in + let* then_type, counter2 = check then_expr env counter1 mode in + (match else_expr with + | Some else_expr -> + let* else_type, counter3 = check else_expr env counter2 mode in + let* () = unify then_type else_type in + return (then_type, counter3) + | None -> + (match mode with + | Expression -> + let* () = unify then_type TUnit in + return (TUnit, counter2) + | Statement -> return (then_type, counter2))) + | Fun (PVar param, body) -> + let param_type, counter1 = fresh_var counter in + let new_env = Map.set env ~key:param ~data:param_type in + let* body_type, counter2 = check body new_env counter1 Expression in + return (TFun (param_type, body_type), counter2) + | App (func, arg) -> + let* func_type, counter1 = check func env counter Expression in + let* arg_type, counter2 = check arg env counter1 Expression in + let return_type, counter3 = fresh_var counter2 in + let* () = unify func_type (TFun (arg_type, return_type)) in + return (return_type, counter3) + | Let (NonRec, PVar name, value_expr, body_opt) -> + let* value_type, counter1 = check value_expr env counter Expression in + let new_env = Map.set env ~key:name ~data:value_type in + (match body_opt with + | Some body -> check body new_env counter1 mode + | None -> + (match mode with + | Expression -> fail NotExpression + | Statement -> return (TUnit, counter1))) + | Let (Rec, PVar name, value_expr, body_opt) -> + let func_type, counter1 = fresh_var counter in + let temp_env = Map.set env ~key:name ~data:func_type in + let* actual_type, counter2 = check value_expr temp_env counter1 Expression in + (match occurs_check (string_of_int counter2) actual_type with + | true -> fail (RecursiveFunctionError name) + | false -> + let* () = unify func_type actual_type in + let final_env = Map.set env ~key:name ~data:actual_type in + (match body_opt with + | Some body -> check body final_env counter2 mode + | None -> + (match mode with + | Expression -> fail NotExpression + | Statement -> return (TUnit, counter2)))) + in + let empty_env = Map.empty (module String) in + match check expr empty_env 0 Statement with + | Ok (typ, _) -> Ok typ + | Error e -> Error e +;; + +let show_type_error = function + | UnboundVariable name -> Printf.sprintf "Unbound variable: %s" name + | TypeMismatch (t1, t2) -> + Printf.sprintf + "Type mismatch: expected %s but got %s" + (match t1 with + | TInt -> "int" + | TUnit -> "unit" + | TFun _ -> "function" + | TVar s -> Printf.sprintf "Var(%s)" s) + (match t2 with + | TInt -> "int" + | TUnit -> "unit" + | TFun _ -> "function" + | TVar s -> s) + | RecursiveFunctionError name -> + Printf.sprintf "Recursive function %s has infinite type" name + | InvalidCondition -> "Condition must be of type int" + | ApplicationError -> "Cannot apply non-function" + | NotExpression -> "Not an expression" +;; diff --git a/Svirukov/lib/inferencer.mli b/Svirukov/lib/inferencer.mli new file mode 100644 index 00000000..04f5e3f0 --- /dev/null +++ b/Svirukov/lib/inferencer.mli @@ -0,0 +1,19 @@ +type typ = + | TInt + | TFun of typ * typ + | TUnit + | TVar of string + +type type_env = (string, typ, Base.String.comparator_witness) Base.Map.t + +type type_error = + | UnboundVariable of string + | TypeMismatch of typ * typ + | RecursiveFunctionError of string + | InvalidCondition + | ApplicationError + | NotExpression + +val show_type_error : type_error -> string +val typecheck_program : Ast.expr -> (typ, type_error) result +val print_typ : typ -> string diff --git a/Svirukov/tests/inference.t b/Svirukov/tests/inference.t new file mode 100644 index 00000000..9bc1d9ed --- /dev/null +++ b/Svirukov/tests/inference.t @@ -0,0 +1,76 @@ +Copyright 2021-2024, Kakadu and contributors +SPDX-License-Identifier: CC0-1.0 + +Cram tests here. They run and compare program output to the expected output +https://dune.readthedocs.io/en/stable/tests.html#cram-tests +Use `dune promote` after you change things that should runned + +If you need to put sample program and use it both in your interpreter and preinstalled one, +you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` +in the dune file + + + $ ../bin/inference_test.exe< 5 + 5 + (5 + 5) + TInt + + $ ../bin/inference_test.exe< let r = 5 + (let r = 5) + TUnit + + $ ../bin/inference_test.exe< let r = let t = 5 + (let r = (let t = 5)) + Not an expression + + $ ../bin/inference_test.exe< let a x = x + x + (let a = (fun x -> (x + x))) + TUnit + + $ ../bin/inference_test.exe< 5 + (fun a -> a+2) 5 + (5 + (fun a -> (a + 2)) 5) + TInt + + $ ../bin/inference_test.exe< 5 + (let r = 8) + (5 + (let r = 8)) + Not an expression + + $ ../bin/inference_test.exe< let r = 5 in let t = 89 + (let r = 5 in (let t = 89)) + TUnit + + $ ../bin/inference_test.exe< let rec fib n = if n < 2 then 1 else (fib (n-1)) * (fib (n-2)) in fib 10 + (let rec fib = (fun n -> (if (n < 2) then 1 else (fib (n - 1) * fib (n - 2)))) in fib 10) + TVar(5) + + $ ../bin/inference_test.exe< let rec fib n = if n > 2 then (fib (n-1)) * (fib (n-2)) else 1 in fib 10 + (let rec fib = (fun n -> (if (n > 2) then (fib (n - 1) * fib (n - 2)) else 1)) in fib 10) + TVar(5) + + $ ../bin/inference_test.exe< 5 + (let rec r n = if n =0 then n * (r (n+1)) else 1 in r 10) + (5 + (let rec r = (fun n -> (if (n = 0) then (n * r (n + 1)) else 1)) in r 10)) + TInt + + $ ../bin/inference_test.exe< let rec f n = f n + (let rec f = (fun n -> f n)) + Recursive function f has infinite type + + $ ../bin/inference_test.exe< let f n = if n> 0 then n + (let f = (fun n -> (if (n > 0) then n))) + TUnit + + $ ../bin/inference_test.exe< let rec f n= f (n+1) + (let rec f = (fun n -> f (n + 1))) + Recursive function f has infinite type From 4f7a5f34369feb5cca13824e868c56bfa10208f4 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 24 Nov 2025 19:08:12 +0300 Subject: [PATCH 19/42] refactor: add test with fix recursion --- Svirukov/lib/inferencer.ml | 11 +++++------ Svirukov/lib/inferencer.mli | 2 +- Svirukov/tests/inference.t | 13 +++++++++---- Svirukov/tests/interpret_tests.t | 5 +++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Svirukov/lib/inferencer.ml b/Svirukov/lib/inferencer.ml index e75e6753..9b48e941 100644 --- a/Svirukov/lib/inferencer.ml +++ b/Svirukov/lib/inferencer.ml @@ -19,7 +19,7 @@ type type_env = (string, typ, String.comparator_witness) Map.t type type_error = | UnboundVariable of string | TypeMismatch of typ * typ - | RecursiveFunctionError of string + | OccursCheckError | InvalidCondition | ApplicationError | NotExpression @@ -56,7 +56,7 @@ let rec unify t1 t2 = | TUnit, TUnit -> return () | TVar name1, TVar name2 when String.( = ) name1 name2 -> return () | TVar name, t | t, TVar name -> - if occurs_check name t then fail (TypeMismatch (TVar name, t)) else return () + if occurs_check name t then fail OccursCheckError else return () | TFun (arg1, ret1), TFun (arg2, ret2) -> let* () = unify arg1 arg2 in unify ret1 ret2 @@ -126,7 +126,7 @@ let typecheck_program expr = let temp_env = Map.set env ~key:name ~data:func_type in let* actual_type, counter2 = check value_expr temp_env counter1 Expression in (match occurs_check (string_of_int counter2) actual_type with - | true -> fail (RecursiveFunctionError name) + | true -> fail OccursCheckError | false -> let* () = unify func_type actual_type in let final_env = Map.set env ~key:name ~data:actual_type in @@ -157,9 +157,8 @@ let show_type_error = function | TInt -> "int" | TUnit -> "unit" | TFun _ -> "function" - | TVar s -> s) - | RecursiveFunctionError name -> - Printf.sprintf "Recursive function %s has infinite type" name + | TVar s -> Printf.sprintf "Var(%s)" s) + | OccursCheckError -> "Recursive function has infinite type" | InvalidCondition -> "Condition must be of type int" | ApplicationError -> "Cannot apply non-function" | NotExpression -> "Not an expression" diff --git a/Svirukov/lib/inferencer.mli b/Svirukov/lib/inferencer.mli index 04f5e3f0..66154768 100644 --- a/Svirukov/lib/inferencer.mli +++ b/Svirukov/lib/inferencer.mli @@ -9,7 +9,7 @@ type type_env = (string, typ, Base.String.comparator_witness) Base.Map.t type type_error = | UnboundVariable of string | TypeMismatch of typ * typ - | RecursiveFunctionError of string + | OccursCheckError | InvalidCondition | ApplicationError | NotExpression diff --git a/Svirukov/tests/inference.t b/Svirukov/tests/inference.t index 9bc1d9ed..d5310d35 100644 --- a/Svirukov/tests/inference.t +++ b/Svirukov/tests/inference.t @@ -40,6 +40,11 @@ in the dune file (5 + (let r = 8)) Not an expression + $ ../bin/inference_test.exe< let x n= n+ 1 in x (let r = 555) + (let x = (fun n -> (n + 1)) in x (let r = 555)) + Not an expression + $ ../bin/inference_test.exe< let r = 5 in let t = 89 (let r = 5 in (let t = 89)) @@ -63,7 +68,7 @@ in the dune file $ ../bin/inference_test.exe< let rec f n = f n (let rec f = (fun n -> f n)) - Recursive function f has infinite type + Recursive function has infinite type $ ../bin/inference_test.exe< let f n = if n> 0 then n @@ -71,6 +76,6 @@ in the dune file TUnit $ ../bin/inference_test.exe< let rec f n= f (n+1) - (let rec f = (fun n -> f (n + 1))) - Recursive function f has infinite type + > let rec fix f eta = f (fix f) eta in let fact_gen = fun fact -> fun n -> if n = 0 then 1 else n * fact (n - 1) in let fact = fix fact_gen in fact 5 + (let rec fix = (fun f -> (fun eta -> f fix f eta)) in (let fact_gen = (fun fact -> (fun n -> (if (n = 0) then 1 else (n * fact (n - 1))))) in (let fact = fix fact_gen in fact 5))) + Recursive function has infinite type diff --git a/Svirukov/tests/interpret_tests.t b/Svirukov/tests/interpret_tests.t index 40aaccda..988573f3 100644 --- a/Svirukov/tests/interpret_tests.t +++ b/Svirukov/tests/interpret_tests.t @@ -118,3 +118,8 @@ in the dune file (let rec t = (fun n -> t (n + 1)) in t 4) Exceed number of redunction posssible: 100 + + $ ../bin/REPL.exe < let rec fix f eta = f (fix f) eta in let fact_gen = fun fact -> fun n -> if n = 0 then 1 else n * fact (n - 1) in let fact = fix fact_gen in fact 5 + (let rec fix = (fun f -> (fun eta -> f fix f eta)) in (let fact_gen = (fun fact -> (fun n -> (if (n = 0) then 1 else (n * fact (n - 1))))) in (let fact = fix fact_gen in fact 5))) + 120 From 89195350dbbc70b628acf10eb3e36fc45403f2c6 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 24 Nov 2025 19:14:06 +0300 Subject: [PATCH 20/42] feat: add project files --- Svirukov/.gitignore | 6 ++++ Svirukov/.ocamlformat | 2 ++ Svirukov/.zanuda | 1 + Svirukov/Svirukov.opam | 12 +++---- Svirukov/dune-project | 5 ++- Svirukov/lib/ast.mli | 74 ++++++++++++++++++++++++++------------- Svirukov/tests/.gitignore | 1 + 7 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 Svirukov/.gitignore create mode 100644 Svirukov/.ocamlformat create mode 100644 Svirukov/.zanuda create mode 100644 Svirukov/tests/.gitignore diff --git a/Svirukov/.gitignore b/Svirukov/.gitignore new file mode 100644 index 00000000..7102a822 --- /dev/null +++ b/Svirukov/.gitignore @@ -0,0 +1,6 @@ +_build +_coverage +/_esy +/node_modules +/esy.lock +/.melange.eobjs diff --git a/Svirukov/.ocamlformat b/Svirukov/.ocamlformat new file mode 100644 index 00000000..97f97080 --- /dev/null +++ b/Svirukov/.ocamlformat @@ -0,0 +1,2 @@ +profile=janestreet +version=0.26.2 diff --git a/Svirukov/.zanuda b/Svirukov/.zanuda new file mode 100644 index 00000000..0f09b19b --- /dev/null +++ b/Svirukov/.zanuda @@ -0,0 +1 @@ +forward mutability_check ignore REPL.ml diff --git a/Svirukov/Svirukov.opam b/Svirukov/Svirukov.opam index 68ca103d..518b20c4 100644 --- a/Svirukov/Svirukov.opam +++ b/Svirukov/Svirukov.opam @@ -1,14 +1,10 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" version: "0.1" -synopsis: "FIXME An interpreter for language" -description: - "FIXME. A longer description, for example, which are the most interesing features being supported, etc." -maintainer: ["FIXME Vasya Pupkin "] -authors: [ - "FIXME Vasya Pupkin " - "FIXME Pupkin Vasya " -] +synopsis: "An interpreter for miniML" +description: "Interpreter does not have typechecker" +maintainer: ["Svirukov Mikhail "] +authors: ["Svirukov Mikhail "] license: "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception" homepage: "https://github.com/Kakadu/fp25" doc: "https://kakadu.github.io/fp25/docs/Lambda" diff --git a/Svirukov/dune-project b/Svirukov/dune-project index cce98b8b..ba688fa7 100644 --- a/Svirukov/dune-project +++ b/Svirukov/dune-project @@ -16,9 +16,8 @@ (package (name Svirukov) ; - (synopsis "FIXME An interpreter for language") - (description - "FIXME. A longer description, for example, which are the most interesing features being supported, etc.") + (synopsis "An interpreter for miniML") + (description "Very simple interpreter of subset of Ocaml") (documentation "https://kakadu.github.io/fp25/docs/Lambda") (version 0.1) (depends diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index 95175dad..e30c16ea 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -1,37 +1,63 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] +(* Abstract Syntax Tree for miniML language *) +(** Constant values in the language *) type constant = - | CInt of int - | CUnit + | CInt of int (** Integer literals *) + | CUnit (** Unit value - returned by statements *) -type pattern = PVar of string +(** Patterns for variable binding *) +type pattern = PVar of string (** Variable pattern - binds to a name *) +(** Recursion flag for let bindings *) type rec_flag = - | NonRec - | Rec + | NonRec (** Non-recursive binding *) + | Rec (** Recursive binding *) +(** Binary operators *) type binop = - | Plus - | Minus - | Asteriks - | Dash - | Equals - | MoreThan - | LessThan - | EqLess - | EqMore - + | Plus (** Integer addition: + *) + | Minus (** Integer subtraction: - *) + | Asteriks (** Integer multiplication: * *) + | Dash (** Integer division: / *) + | Equals (** Integer equality: = *) + | MoreThan (** Integer greater than: > *) + | LessThan (** Integer less than: < *) + | EqLess (** Integer less than or equal: <= *) + | EqMore (** Integer greater than or equal: >= *) + +(** Expressions in miniML language *) type expr = - | Constant of constant - | Var of pattern + | Constant of constant (** Constant values - integers and unit *) + | Var of pattern (** Variable reference - looks up a bound name *) | Let of rec_flag * pattern * expr * expr option + (** Let binding: + - rec_flag: whether binding is recursive + - pattern: variable name to bind + - expr: value to bind + - expr option: optional body expression (if None, it's a statement) *) | Fun of pattern * expr + (** Lambda abstraction: + - pattern: parameter name + - expr: function body *) | App of expr * expr + (** Function application: + - expr: function expression + - expr: argument expression *) | Binop of binop * expr * expr + (** Binary operation: + - binop: operator + - expr: left operand + - expr: right operand *) | Conditional of expr * expr * expr option + (** Conditional expression: + - expr: condition (must evaluate to int, 0=false, non-zero=true) + - expr: then branch + - expr option: optional else branch *) + +(** Notes: + - Evaluation strategy: Call-by-value (CBV) + - All binary operators work only on integers + - Conditionals use integers as booleans (0 = false, non-zero = true) + - Functions are curried: fun x y -> ... desugars to fun x -> fun y -> ... + - Let bindings without 'in' are statements, with 'in' are expressions + - Type system supports integers, functions, and unit *) diff --git a/Svirukov/tests/.gitignore b/Svirukov/tests/.gitignore new file mode 100644 index 00000000..26685e79 --- /dev/null +++ b/Svirukov/tests/.gitignore @@ -0,0 +1 @@ +lam*.txt \ No newline at end of file From 2ed68e5926f86e4fa04cc86aaf2bc9bb1a479046 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 25 Nov 2025 17:38:19 +0300 Subject: [PATCH 21/42] fix: linter warnings --- Svirukov/lib/interpret.ml | 8 +++----- Svirukov/tests/parser_gentest.ml | 10 +++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index 17477866..d430c4c6 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -25,8 +25,8 @@ module type MONAD = sig val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end -module ResultM : MONAD with type 'a t = ('a, error) result = struct - type 'a t = ('a, error) result +module ResultM : MONAD with type 'a t = ('a, error) Base.result = struct + type 'a t = ('a, error) Base.result let return x = Ok x let fail msg = Error msg @@ -43,17 +43,15 @@ end let ( let* ) = ResultM.( >>= ) module Env : sig - val find : env -> string -> value option val init : env val add_val : env -> string -> value -> env val ok_or_novar : env -> string -> value ResultM.t end = struct let init = Map.empty (module String) - let find env key = Map.find env key let add_val env key value = Map.set env ~key ~data:value let ok_or_novar env name = - match find env name with + match Map.find env name with | Some v -> ResultM.return v | None -> ResultM.fail (UnboundVariable name) ;; diff --git a/Svirukov/tests/parser_gentest.ml b/Svirukov/tests/parser_gentest.ml index 76a26f23..43193279 100644 --- a/Svirukov/tests/parser_gentest.ml +++ b/Svirukov/tests/parser_gentest.ml @@ -77,7 +77,9 @@ let gen_expr = let* right = medium_expr in return (App (left, right))) ; (let* func = - map (fun (pat, body) -> Fun (pat, body)) (pair gen_pattern subexpr) + map + (fun (pat, body) -> Lambda_lib.Ast.Fun (pat, body)) + (pair gen_pattern subexpr) in let* arg = medium_expr in return (App (func, arg))) @@ -85,11 +87,13 @@ let gen_expr = let* arg1 = simple_expr in let* arg2 = simple_expr in return (App (App (func, arg1), arg2))) - ; map (fun (pat, body) -> Fun (pat, body)) (pair gen_pattern subexpr) + ; map + (fun (pat, body) -> Lambda_lib.Ast.Fun (pat, body)) + (pair gen_pattern subexpr) ; (let* arg1 = gen_pattern in let* arg2 = gen_pattern in let* body = subexpr in - return (Fun (arg1, Fun (arg2, body)))) + return (Lambda_lib.Ast.Fun (arg1, Fun (arg2, body)))) ; map (fun (left, op, right) -> Binop (op, left, right)) (triple (gen_binopr_expr (depth / 2)) gen_binop (gen_binopr_expr (depth / 2))) From a0b47f36c38ce189121e47792608f361033630ca Mon Sep 17 00:00:00 2001 From: MikhailSvirukov Date: Fri, 28 Nov 2025 21:45:24 +0300 Subject: [PATCH 22/42] fix: fix linter warnings --- Svirukov/Svirukov.opam | 2 +- Svirukov/lib/ast.mli | 60 +++++++++++++++++--------------- Svirukov/lib/inferencer.ml | 32 +++++++++-------- Svirukov/lib/inferencer.mli | 4 +++ Svirukov/lib/interpret.ml | 26 ++++++++------ Svirukov/lib/interpret.mli | 8 ++--- Svirukov/lib/parser.ml | 7 ++-- Svirukov/lib/parser.mli | 8 ++--- Svirukov/lib/print.ml | 6 +++- Svirukov/lib/print.mli | 4 +++ Svirukov/tests/parser_gentest.ml | 14 ++++---- Svirukov/tests/parser_test.ml | 6 +--- 12 files changed, 92 insertions(+), 85 deletions(-) diff --git a/Svirukov/Svirukov.opam b/Svirukov/Svirukov.opam index 518b20c4..8254bfa6 100644 --- a/Svirukov/Svirukov.opam +++ b/Svirukov/Svirukov.opam @@ -2,7 +2,7 @@ opam-version: "2.0" version: "0.1" synopsis: "An interpreter for miniML" -description: "Interpreter does not have typechecker" +description: "Very simple interpreter of subset of Ocaml" maintainer: ["Svirukov Mikhail "] authors: ["Svirukov Mikhail "] license: "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception" diff --git a/Svirukov/lib/ast.mli b/Svirukov/lib/ast.mli index e30c16ea..4c50ea49 100644 --- a/Svirukov/lib/ast.mli +++ b/Svirukov/lib/ast.mli @@ -1,58 +1,60 @@ -(* Abstract Syntax Tree for miniML language *) +(** Copyright 2021-2025, Kakadu and contributors *) -(** Constant values in the language *) +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +(** Constant values in the language **) type constant = - | CInt of int (** Integer literals *) - | CUnit (** Unit value - returned by statements *) + | CInt of int (** Integer literals **) + | CUnit (** Unit value - returned by statements **) -(** Patterns for variable binding *) -type pattern = PVar of string (** Variable pattern - binds to a name *) +(** Patterns for variable binding **) +type pattern = PVar of string (** Variable pattern - binds to a name **) -(** Recursion flag for let bindings *) +(** Recursion flag for let bindings **) type rec_flag = - | NonRec (** Non-recursive binding *) - | Rec (** Recursive binding *) + | NonRec (** Non-recursive binding ***) + | Rec (** Recursive binding ***) -(** Binary operators *) +(** Binary operators **) type binop = - | Plus (** Integer addition: + *) - | Minus (** Integer subtraction: - *) - | Asteriks (** Integer multiplication: * *) - | Dash (** Integer division: / *) - | Equals (** Integer equality: = *) - | MoreThan (** Integer greater than: > *) - | LessThan (** Integer less than: < *) - | EqLess (** Integer less than or equal: <= *) - | EqMore (** Integer greater than or equal: >= *) + | Plus (** Integer addition: + **) + | Minus (** Integer subtraction: - **) + | Asteriks (** Integer multiplication: * **) + | Dash (** Integer division: / **) + | Equals (** Integer equality: = **) + | MoreThan (** Integer greater than: > **) + | LessThan (** Integer less than: < **) + | EqLess (** Integer less than or equal: <= **) + | EqMore (** Integer greater than or equal: >= **) -(** Expressions in miniML language *) +(** Expressions in miniML language **) type expr = - | Constant of constant (** Constant values - integers and unit *) - | Var of pattern (** Variable reference - looks up a bound name *) + | Constant of constant (** Constant values - integers and unit **) + | Var of pattern (** Variable reference - looks up a bound name **) | Let of rec_flag * pattern * expr * expr option (** Let binding: - rec_flag: whether binding is recursive - pattern: variable name to bind - expr: value to bind - - expr option: optional body expression (if None, it's a statement) *) - | Fun of pattern * expr + - expr option: optional body expression (if None, it's a statement) **) + | Func of pattern * expr (** Lambda abstraction: - pattern: parameter name - - expr: function body *) + - expr: function body **) | App of expr * expr (** Function application: - expr: function expression - - expr: argument expression *) + - expr: argument expression **) | Binop of binop * expr * expr (** Binary operation: - binop: operator - expr: left operand - - expr: right operand *) + - expr: right operand **) | Conditional of expr * expr * expr option (** Conditional expression: - expr: condition (must evaluate to int, 0=false, non-zero=true) - expr: then branch - - expr option: optional else branch *) + - expr option: optional else branch **) (** Notes: - Evaluation strategy: Call-by-value (CBV) @@ -60,4 +62,4 @@ type expr = - Conditionals use integers as booleans (0 = false, non-zero = true) - Functions are curried: fun x y -> ... desugars to fun x -> fun y -> ... - Let bindings without 'in' are statements, with 'in' are expressions - - Type system supports integers, functions, and unit *) + - Type system supports integers, functions, and unit **) diff --git a/Svirukov/lib/inferencer.ml b/Svirukov/lib/inferencer.ml index 9b48e941..f9348137 100644 --- a/Svirukov/lib/inferencer.ml +++ b/Svirukov/lib/inferencer.ml @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + open Ast open Base @@ -25,8 +29,6 @@ type type_error = | NotExpression module TypeMonad = struct - type 'a t = ('a, type_error) result - let return x = Ok x let fail msg = Error msg @@ -71,7 +73,7 @@ let typecheck_program expr = let rec check expr env counter mode = let fresh_var counter = let new_counter = counter + 1 in - TVar (string_of_int new_counter), new_counter + TVar (Int.to_string new_counter), new_counter in match expr with | Constant CUnit -> return (TUnit, counter) @@ -101,7 +103,7 @@ let typecheck_program expr = let* () = unify then_type TUnit in return (TUnit, counter2) | Statement -> return (then_type, counter2))) - | Fun (PVar param, body) -> + | Func (PVar param, body) -> let param_type, counter1 = fresh_var counter in let new_env = Map.set env ~key:param ~data:param_type in let* body_type, counter2 = check body new_env counter1 Expression in @@ -125,17 +127,17 @@ let typecheck_program expr = let func_type, counter1 = fresh_var counter in let temp_env = Map.set env ~key:name ~data:func_type in let* actual_type, counter2 = check value_expr temp_env counter1 Expression in - (match occurs_check (string_of_int counter2) actual_type with - | true -> fail OccursCheckError - | false -> - let* () = unify func_type actual_type in - let final_env = Map.set env ~key:name ~data:actual_type in - (match body_opt with - | Some body -> check body final_env counter2 mode - | None -> - (match mode with - | Expression -> fail NotExpression - | Statement -> return (TUnit, counter2)))) + if occurs_check (Int.to_string counter2) actual_type + then fail OccursCheckError + else + let* () = unify func_type actual_type in + let final_env = Map.set env ~key:name ~data:actual_type in + (match body_opt with + | Some body -> check body final_env counter2 mode + | None -> + (match mode with + | Expression -> fail NotExpression + | Statement -> return (TUnit, counter2))) in let empty_env = Map.empty (module String) in match check expr empty_env 0 Statement with diff --git a/Svirukov/lib/inferencer.mli b/Svirukov/lib/inferencer.mli index 66154768..5b16307c 100644 --- a/Svirukov/lib/inferencer.mli +++ b/Svirukov/lib/inferencer.mli @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + type typ = | TInt | TFun of typ * typ diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index d430c4c6..a20c9f1d 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + open Ast open Base @@ -5,7 +9,7 @@ type value = | VInt of int | VClosure of pattern * expr -and env = (string, value, Base.String.comparator_witness) Base.Map.t +type env = (string, value, Base.String.comparator_witness) Base.Map.t type error = | UnboundVariable of string @@ -25,8 +29,8 @@ module type MONAD = sig val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end -module ResultM : MONAD with type 'a t = ('a, error) Base.result = struct - type 'a t = ('a, error) Base.result +module ResultM : MONAD with type 'a t = ('a, error) Result.t = struct + type 'a t = ('a, error) Result.t let return x = Ok x let fail msg = Error msg @@ -82,8 +86,8 @@ let rec substitute expr varname value = , match body_expr with | Some e -> Some (substitute e varname value) | None -> None )) - | Fun (PVar param, _) when Base.String.( = ) param varname -> expr - | Fun (param, body) -> Fun (param, substitute body varname value) + | Func (PVar param, _) when Base.String.( = ) param varname -> expr + | Func (param, body) -> Func (param, substitute body varname value) | App (func, arg) -> App (substitute func varname value, substitute arg varname value) ;; @@ -98,7 +102,7 @@ let rec eval exp env step = let* binding = Env.ok_or_novar env name in (match binding with | VInt n -> ResultM.return (Constant (CInt n)) - | VClosure (pat, body) -> ResultM.return (Fun (pat, body))) + | VClosure (pat, body) -> ResultM.return (Func (pat, body))) | Binop (op, left, right) -> let eval_binop expr = match eval expr env (step - 1) with @@ -123,7 +127,7 @@ let rec eval exp env step = let* letval = match body with | Constant (CInt n) -> ResultM.return (VInt n) - | Fun (pat, inner) -> ResultM.return (VClosure (pat, inner)) + | Func (pat, inner) -> ResultM.return (VClosure (pat, inner)) | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") in let new_env = Env.add_val env name letval in @@ -133,7 +137,7 @@ let rec eval exp env step = | Let (Rec, PVar name, body, cont) -> let* new_env = match body with - | Fun (PVar var, func) -> + | Func (PVar var, func) -> ResultM.return (Env.add_val env name (VClosure (PVar var, func))) | _ -> ResultM.fail (TypeError "can put only vars and funcs in env") in @@ -153,7 +157,7 @@ let rec eval exp env step = let rec application core env args = match args, core with | [], expr -> eval expr env (step - 1) - | arg :: tail, Fun (PVar name, body) -> + | arg :: tail, Func (PVar name, body) -> let new_body = substitute body name arg in application new_body env tail | _ :: _, _ -> ResultM.fail TooManyArgs @@ -171,11 +175,11 @@ let rec eval exp env step = | Var (PVar name) -> let* binding = eval body env (step - 1) in ResultM.return (substitute body name binding) - | Fun (_, _) -> ResultM.return body + | Func (_, _) -> ResultM.return body | _ -> ResultM.fail (TypeError "can only apply args to funcs") in application new_body env args - | Fun (pat, ex) -> ResultM.return (Fun (pat, ex))) + | Func (pat, ex) -> ResultM.return (Func (pat, ex))) ;; let run_interpret expr steps = diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index faae3fd5..05b272e6 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -1,11 +1,7 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) +(** Copyright 2021-2025, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) -[@@@ocaml.text "/*"] - open Ast type error = @@ -21,7 +17,7 @@ type value = | VInt of int | VClosure of pattern * expr -and env = (string, value, Base.String.comparator_witness) Base.Map.t +type env = (string, value, Base.String.comparator_witness) Base.Map.t module type MONAD = sig type 'a t diff --git a/Svirukov/lib/parser.ml b/Svirukov/lib/parser.ml index db881b75..c0cf5ef3 100644 --- a/Svirukov/lib/parser.ml +++ b/Svirukov/lib/parser.ml @@ -1,4 +1,4 @@ -(** Copyright 2021-2023, Kakadu and contributors *) +(** Copyright 2021-2025, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) @@ -49,7 +49,6 @@ let variable_name = let var = variable_name >>| fun s -> PVar s let var_expr = var >>| fun p -> Var p -let parse_bool = token (string "true") <|> token (string "false") >>| bool_of_string let skip_parens p = token (char '(') *> p <* token (char ')') let cmp = @@ -94,7 +93,7 @@ let cmp_op = let rec build_curried_function args body = match args with | [] -> body - | arg :: rest_args -> Fun (arg, build_curried_function rest_args body) + | arg :: rest_args -> Func (arg, build_curried_function rest_args body) ;; let expr = @@ -157,7 +156,7 @@ let expr = >>= fun args -> token (char '=') *> expr >>= fun ex -> - let body = if args = [] then ex else build_curried_function args ex in + let body = build_curried_function args ex in option None (token (string "in") *> expr >>| fun cont -> Some cont) >>= fun skope -> return (Let (recurs, name, body, skope)) in diff --git a/Svirukov/lib/parser.mli b/Svirukov/lib/parser.mli index eba61f57..8332cbd6 100644 --- a/Svirukov/lib/parser.mli +++ b/Svirukov/lib/parser.mli @@ -1,12 +1,8 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) +(** Copyright 2021-2025, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) -[@@@ocaml.text "/*"] - type error = [ `Parsing_error of string ] -(** Main entry of parser *) +(* Main entry of parser *) val parse : string -> (Ast.expr, error) result diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index 783c7799..ec5d023b 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + open Ast open Interpret @@ -35,7 +39,7 @@ let rec print_ast = function Printf.sprintf "(let rec %s = %s)" name (print_ast body) | Let (Rec, PVar name, body, Some next) -> Printf.sprintf "(let rec %s = %s in %s)" name (print_ast body) (print_ast next) - | Fun (PVar arg, body) -> Printf.sprintf "(fun %s -> %s)" arg (print_ast body) + | Func (PVar arg, body) -> Printf.sprintf "(fun %s -> %s)" arg (print_ast body) | App (left, right) -> Printf.sprintf "%s %s" (print_ast left) (print_ast right) ;; diff --git a/Svirukov/lib/print.mli b/Svirukov/lib/print.mli index 926225ef..a6e228de 100644 --- a/Svirukov/lib/print.mli +++ b/Svirukov/lib/print.mli @@ -1,2 +1,6 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + val print_ast : Ast.expr -> string val print_error : Interpret.error -> string diff --git a/Svirukov/tests/parser_gentest.ml b/Svirukov/tests/parser_gentest.ml index 43193279..ef03ee49 100644 --- a/Svirukov/tests/parser_gentest.ml +++ b/Svirukov/tests/parser_gentest.ml @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + open QCheck open Lambda_lib.Parser open Lambda_lib.Print @@ -77,9 +81,7 @@ let gen_expr = let* right = medium_expr in return (App (left, right))) ; (let* func = - map - (fun (pat, body) -> Lambda_lib.Ast.Fun (pat, body)) - (pair gen_pattern subexpr) + map (fun (pat, body) -> Func (pat, body)) (pair gen_pattern subexpr) in let* arg = medium_expr in return (App (func, arg))) @@ -87,13 +89,11 @@ let gen_expr = let* arg1 = simple_expr in let* arg2 = simple_expr in return (App (App (func, arg1), arg2))) - ; map - (fun (pat, body) -> Lambda_lib.Ast.Fun (pat, body)) - (pair gen_pattern subexpr) + ; map (fun (pat, body) -> Func (pat, body)) (pair gen_pattern subexpr) ; (let* arg1 = gen_pattern in let* arg2 = gen_pattern in let* body = subexpr in - return (Lambda_lib.Ast.Fun (arg1, Fun (arg2, body)))) + return (Func (arg1, Func (arg2, body)))) ; map (fun (left, op, right) -> Binop (op, left, right)) (triple (gen_binopr_expr (depth / 2)) gen_binop (gen_binopr_expr (depth / 2))) diff --git a/Svirukov/tests/parser_test.ml b/Svirukov/tests/parser_test.ml index 07bc0c89..1edb36a5 100644 --- a/Svirukov/tests/parser_test.ml +++ b/Svirukov/tests/parser_test.ml @@ -1,11 +1,7 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) +(** Copyright 2021-2025, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) -[@@@ocaml.text "/*"] - open Lambda_lib.Print open Lambda_lib.Parser From b078c10ebb8eb78b51afcc6618d476d42c6c0633 Mon Sep 17 00:00:00 2001 From: MikhailSvirukov Date: Sat, 29 Nov 2025 20:41:32 +0300 Subject: [PATCH 23/42] fix: move print functions to corresponding mod --- Svirukov/bin/REPL.ml | 2 +- Svirukov/bin/REPL.mli | 2 +- Svirukov/lib/inferencer.ml | 32 ++------------------------------ Svirukov/lib/inferencer.mli | 4 +--- Svirukov/lib/print.ml | 29 +++++++++++++++++++++++++++++ Svirukov/lib/print.mli | 2 ++ 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 5df2e122..68863782 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -37,7 +37,7 @@ let () = | true -> (match Inferencer.typecheck_program expr with | Ok _ -> None - | Error er -> Some (Inferencer.show_type_error er)) + | Error er -> Some (Print.show_type_error er)) | false -> None in match typecheck with diff --git a/Svirukov/bin/REPL.mli b/Svirukov/bin/REPL.mli index c1135e06..633772c3 100644 --- a/Svirukov/bin/REPL.mli +++ b/Svirukov/bin/REPL.mli @@ -1,6 +1,6 @@ [@@@ocaml.text "/*"] -(** Copyright 2021-2024, Kakadu and contributors *) +(** Copyright 2021-2025, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) diff --git a/Svirukov/lib/inferencer.ml b/Svirukov/lib/inferencer.ml index f9348137..d92aeeba 100644 --- a/Svirukov/lib/inferencer.ml +++ b/Svirukov/lib/inferencer.ml @@ -11,17 +11,10 @@ type typ = | TUnit | TVar of string -let rec print_typ = function - | TInt -> "TInt" - | TFun (l, r) -> Printf.sprintf "TFun(%s, %s)" (print_typ l) (print_typ r) - | TUnit -> "TUnit" - | TVar s -> Printf.sprintf "TVar(%s)" s -;; - type type_env = (string, typ, String.comparator_witness) Map.t type type_error = - | UnboundVariable of string + | UnboundVar of string | TypeMismatch of typ * typ | OccursCheckError | InvalidCondition @@ -81,7 +74,7 @@ let typecheck_program expr = | Var (PVar name) -> (match Map.find env name with | Some typ -> return (typ, counter) - | None -> fail (UnboundVariable name)) + | None -> fail (UnboundVar name)) | Binop (_, left, right) -> let* left_type, counter1 = check left env counter Expression in let* right_type, counter2 = check right env counter1 Expression in @@ -144,24 +137,3 @@ let typecheck_program expr = | Ok (typ, _) -> Ok typ | Error e -> Error e ;; - -let show_type_error = function - | UnboundVariable name -> Printf.sprintf "Unbound variable: %s" name - | TypeMismatch (t1, t2) -> - Printf.sprintf - "Type mismatch: expected %s but got %s" - (match t1 with - | TInt -> "int" - | TUnit -> "unit" - | TFun _ -> "function" - | TVar s -> Printf.sprintf "Var(%s)" s) - (match t2 with - | TInt -> "int" - | TUnit -> "unit" - | TFun _ -> "function" - | TVar s -> Printf.sprintf "Var(%s)" s) - | OccursCheckError -> "Recursive function has infinite type" - | InvalidCondition -> "Condition must be of type int" - | ApplicationError -> "Cannot apply non-function" - | NotExpression -> "Not an expression" -;; diff --git a/Svirukov/lib/inferencer.mli b/Svirukov/lib/inferencer.mli index 5b16307c..552add06 100644 --- a/Svirukov/lib/inferencer.mli +++ b/Svirukov/lib/inferencer.mli @@ -11,13 +11,11 @@ type typ = type type_env = (string, typ, Base.String.comparator_witness) Base.Map.t type type_error = - | UnboundVariable of string + | UnboundVar of string | TypeMismatch of typ * typ | OccursCheckError | InvalidCondition | ApplicationError | NotExpression -val show_type_error : type_error -> string val typecheck_program : Ast.expr -> (typ, type_error) result -val print_typ : typ -> string diff --git a/Svirukov/lib/print.ml b/Svirukov/lib/print.ml index ec5d023b..2f32b9f2 100644 --- a/Svirukov/lib/print.ml +++ b/Svirukov/lib/print.ml @@ -3,6 +3,7 @@ (** SPDX-License-Identifier: LGPL-3.0-or-later *) open Ast +open Inferencer open Interpret let rec print_ast = function @@ -53,3 +54,31 @@ let print_error = function | ExceedNumberOfSteps expr -> Printf.sprintf "Exceed number of redunction posssible: \n%s" (print_ast expr) ;; + +let show_type_error = function + | NotExpression -> "Not an expression" + | UnboundVar name -> Printf.sprintf "Unbound variable: %s" name + | TypeMismatch (t1, t2) -> + Printf.sprintf + "Type mismatch: expected %s but got %s" + (match t1 with + | TInt -> "int" + | TUnit -> "unit" + | TFun _ -> "function" + | TVar s -> Printf.sprintf "Var(%s)" s) + (match t2 with + | TInt -> "int" + | TUnit -> "unit" + | TFun _ -> "function" + | TVar s -> Printf.sprintf "Var(%s)" s) + | OccursCheckError -> "Recursive function has infinite type" + | InvalidCondition -> "Condition must be of type int" + | ApplicationError -> "Cannot apply non-function" +;; + +let rec print_typ = function + | TInt -> "TInt" + | TFun (l, r) -> Printf.sprintf "TFun(%s, %s)" (print_typ l) (print_typ r) + | TUnit -> "TUnit" + | TVar s -> Printf.sprintf "TVar(%s)" s +;; diff --git a/Svirukov/lib/print.mli b/Svirukov/lib/print.mli index a6e228de..dce7da2f 100644 --- a/Svirukov/lib/print.mli +++ b/Svirukov/lib/print.mli @@ -4,3 +4,5 @@ val print_ast : Ast.expr -> string val print_error : Interpret.error -> string +val print_typ : Inferencer.typ -> string +val show_type_error : Inferencer.type_error -> string From f8910b7ad43dd5e6e7be8c78c85a6bc4305a22d1 Mon Sep 17 00:00:00 2001 From: MikhailSvirukov Date: Mon, 1 Dec 2025 20:40:06 +0300 Subject: [PATCH 24/42] fix: add .mli and change REPL with monad --- Svirukov/bin/REPL.ml | 71 ++++++++++++++++++++++--------- Svirukov/bin/inference_test.ml | 4 ++ Svirukov/bin/inference_test.mli | 3 ++ Svirukov/tests/parser_gentest.mli | 3 ++ Svirukov/tests/parser_test.mli | 3 ++ 5 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 Svirukov/bin/inference_test.mli create mode 100644 Svirukov/tests/parser_gentest.mli create mode 100644 Svirukov/tests/parser_test.mli diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 68863782..eede86cc 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -8,6 +8,7 @@ open Lambda_lib open Stdio +open Base type args = { mutable ast : bool @@ -15,6 +16,34 @@ type args = ; mutable typecheck : bool } +open Base + +type error = string + +module UnResult : sig + type 'a t = ('a, error) Result.t + + val return : 'a -> 'a t + val fail : error -> 'a t + val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t + val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t +end = struct + type 'a t = ('a, error) Result.t + + let return x = Ok x + let fail e = Error e + + let ( >>= ) m f = + match m with + | Ok x -> f x + | Error e -> Error e + ;; + + let ( let* ) = ( >>= ) +end + +open UnResult + let () = let pr_args = { ast = true; steps = max_int; typecheck = false } in let arg_list = @@ -25,25 +54,27 @@ let () = in let usage_msg = "miniMl starts...\n" in Arg.parse arg_list (fun _ -> ()) usage_msg; - let expr = - match Parser.parse (In_channel.(input_all stdin) |> Base.String.rstrip) with - | Ok expr -> - let _ = if pr_args.ast then Printf.printf "%s\n" (Print.print_ast expr) in - expr - | Error (`Parsing_error msg) -> failwith msg - in - let typecheck = - match pr_args.typecheck with - | true -> - (match Inferencer.typecheck_program expr with - | Ok _ -> None - | Error er -> Some (Print.show_type_error er)) - | false -> None + let result = + let* expr = + let input = In_channel.(input_all stdin) |> Base.String.rstrip in + match Parser.parse input with + | Ok expr -> return expr + | Error (`Parsing_error msg) -> fail msg + in + let _ = if pr_args.ast then Format.printf "%s\n" (Print.print_ast expr) in + let* expr = + if pr_args.typecheck + then ( + match Inferencer.typecheck_program expr with + | Ok _ -> return expr + | Error er -> fail (Print.show_type_error er)) + else return expr + in + match Interpret.run_interpret expr pr_args.steps with + | Ok expr' -> return expr' + | Error er -> fail (Print.print_error er) in - match typecheck with - | None -> - (match Interpret.run_interpret expr pr_args.steps with - | Ok expr -> Printf.printf "%s\n" (Print.print_ast expr) - | Error er -> Printf.printf "%s\n" (Print.print_error er)) - | Some er -> Printf.printf "%s\n" er + match result with + | Ok expr -> Format.printf "%s\n" (Print.print_ast expr) + | Error msg -> Format.printf "%s\n" msg ;; diff --git a/Svirukov/bin/inference_test.ml b/Svirukov/bin/inference_test.ml index 69675115..20c6179a 100644 --- a/Svirukov/bin/inference_test.ml +++ b/Svirukov/bin/inference_test.ml @@ -1,3 +1,7 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + open Lambda_lib.Parser open Lambda_lib.Print open Lambda_lib.Inferencer diff --git a/Svirukov/bin/inference_test.mli b/Svirukov/bin/inference_test.mli new file mode 100644 index 00000000..0f1d1317 --- /dev/null +++ b/Svirukov/bin/inference_test.mli @@ -0,0 +1,3 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) diff --git a/Svirukov/tests/parser_gentest.mli b/Svirukov/tests/parser_gentest.mli new file mode 100644 index 00000000..0f1d1317 --- /dev/null +++ b/Svirukov/tests/parser_gentest.mli @@ -0,0 +1,3 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) diff --git a/Svirukov/tests/parser_test.mli b/Svirukov/tests/parser_test.mli new file mode 100644 index 00000000..0f1d1317 --- /dev/null +++ b/Svirukov/tests/parser_test.mli @@ -0,0 +1,3 @@ +(** Copyright 2021-2025, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) From ebb3e80eed84277d5f4c9c8175e2263f35b97a32 Mon Sep 17 00:00:00 2001 From: MikhailSvirukov Date: Mon, 1 Dec 2025 20:47:30 +0300 Subject: [PATCH 25/42] fix: remove Base --- Svirukov/bin/REPL.ml | 4 ---- Svirukov/tests/parser_gentest.ml | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index eede86cc..65d20698 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -8,7 +8,6 @@ open Lambda_lib open Stdio -open Base type args = { mutable ast : bool @@ -16,8 +15,6 @@ type args = ; mutable typecheck : bool } -open Base - type error = string module UnResult : sig @@ -25,7 +22,6 @@ module UnResult : sig val return : 'a -> 'a t val fail : error -> 'a t - val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end = struct type 'a t = ('a, error) Result.t diff --git a/Svirukov/tests/parser_gentest.ml b/Svirukov/tests/parser_gentest.ml index ef03ee49..8fbf5d28 100644 --- a/Svirukov/tests/parser_gentest.ml +++ b/Svirukov/tests/parser_gentest.ml @@ -150,17 +150,6 @@ let gen_invalid_program = ]) ;; -let invalid_programs_fail_parsing = - Test.make - ~name:"Invalid programs should fail parsing" - ~count:100 - gen_invalid_program - (fun program_str -> - match parse program_str with - | Ok _ -> false - | Error _ -> true) -;; - let invalid_prog = Test.make ~name:"Invalid programs return errors" From 491246e851cfe8e29136f969ea613899704df325 Mon Sep 17 00:00:00 2001 From: MikhailSvirukov Date: Thu, 4 Dec 2025 21:10:00 +0300 Subject: [PATCH 26/42] fix: clean code a bit --- Svirukov/bin/REPL.ml | 4 +--- Svirukov/lib/inferencer.ml | 4 +--- Svirukov/lib/interpret.ml | 8 +++----- Svirukov/lib/interpret.mli | 1 - Svirukov/tests/interpret_tests.t | 5 +++++ Svirukov/tests/parser_gentest.ml | 4 ++-- Svirukov/tests/parser_test.ml | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Svirukov/bin/REPL.ml b/Svirukov/bin/REPL.ml index 65d20698..78993104 100644 --- a/Svirukov/bin/REPL.ml +++ b/Svirukov/bin/REPL.ml @@ -29,13 +29,11 @@ end = struct let return x = Ok x let fail e = Error e - let ( >>= ) m f = + let ( let* ) m f = match m with | Ok x -> f x | Error e -> Error e ;; - - let ( let* ) = ( >>= ) end open UnResult diff --git a/Svirukov/lib/inferencer.ml b/Svirukov/lib/inferencer.ml index d92aeeba..ae904c6f 100644 --- a/Svirukov/lib/inferencer.ml +++ b/Svirukov/lib/inferencer.ml @@ -25,13 +25,11 @@ module TypeMonad = struct let return x = Ok x let fail msg = Error msg - let ( >>= ) m f = + let ( let* ) m f = match m with | Ok x -> f x | Error e -> Error e ;; - - let ( let* ) = ( >>= ) end let return = TypeMonad.return diff --git a/Svirukov/lib/interpret.ml b/Svirukov/lib/interpret.ml index a20c9f1d..43817db2 100644 --- a/Svirukov/lib/interpret.ml +++ b/Svirukov/lib/interpret.ml @@ -25,7 +25,6 @@ module type MONAD = sig val return : 'a -> 'a t val fail : error -> 'a t - val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end @@ -35,16 +34,14 @@ module ResultM : MONAD with type 'a t = ('a, error) Result.t = struct let return x = Ok x let fail msg = Error msg - let ( >>= ) m f = + let ( let* ) m f = match m with | Ok x -> f x | Error e -> Error e ;; - - let ( let* ) = ( >>= ) end -let ( let* ) = ResultM.( >>= ) +let ( let* ) = ResultM.( let* ) module Env : sig val init : env @@ -116,6 +113,7 @@ let rec eval exp env step = | Plus -> ResultM.return (Constant (CInt (l + r))) | Minus -> ResultM.return (Constant (CInt (l - r))) | Asteriks -> ResultM.return (Constant (CInt (l * r))) + | Dash when r = 0 -> ResultM.fail DivisionByZero | Dash -> ResultM.return (Constant (CInt (l / r))) | Equals -> ResultM.return (Constant (CInt (if l = r then 1 else 0))) | MoreThan -> ResultM.return (Constant (CInt (if l > r then 1 else 0))) diff --git a/Svirukov/lib/interpret.mli b/Svirukov/lib/interpret.mli index 05b272e6..3bac80e9 100644 --- a/Svirukov/lib/interpret.mli +++ b/Svirukov/lib/interpret.mli @@ -24,7 +24,6 @@ module type MONAD = sig val return : 'a -> 'a t val fail : error -> 'a t - val ( >>= ) : 'a t -> ('a -> 'b t) -> 'b t val ( let* ) : 'a t -> ('a -> 'b t) -> 'b t end diff --git a/Svirukov/tests/interpret_tests.t b/Svirukov/tests/interpret_tests.t index 988573f3..35972b18 100644 --- a/Svirukov/tests/interpret_tests.t +++ b/Svirukov/tests/interpret_tests.t @@ -23,6 +23,11 @@ in the dune file (fun s -> (fun k -> (s + k))) 5 7 12 + $ ../bin/REPL.exe < 5 / 0 + (5 / 0) + Division by zero + $ ../bin/REPL.exe < let r = (fun s k -> s+k) 5 7 in let p = (fun s->s*2) ((fun k -> k*3) 10) in p/2 + r (let r = (fun s -> (fun k -> (s + k))) 5 7 in (let p = (fun s -> (s * 2)) (fun k -> (k * 3)) 10 in ((p / 2) + r))) diff --git a/Svirukov/tests/parser_gentest.ml b/Svirukov/tests/parser_gentest.ml index 8fbf5d28..64c58997 100644 --- a/Svirukov/tests/parser_gentest.ml +++ b/Svirukov/tests/parser_gentest.ml @@ -77,7 +77,7 @@ let gen_expr = oneof [ map (fun c -> Constant c) gen_constant ; map (fun p -> Var p) gen_pattern - ; (let* left = oneof [ map (fun p -> Var p) gen_pattern ] in + ; (let* left = map (fun p -> Var p) gen_pattern in let* right = medium_expr in return (App (left, right))) ; (let* func = @@ -85,7 +85,7 @@ let gen_expr = in let* arg = medium_expr in return (App (func, arg))) - ; (let* func = oneof [ map (fun p -> Var p) gen_pattern ] in + ; (let* func = map (fun p -> Var p) gen_pattern in let* arg1 = simple_expr in let* arg2 = simple_expr in return (App (App (func, arg1), arg2))) diff --git a/Svirukov/tests/parser_test.ml b/Svirukov/tests/parser_test.ml index 1edb36a5..30228b46 100644 --- a/Svirukov/tests/parser_test.ml +++ b/Svirukov/tests/parser_test.ml @@ -89,7 +89,7 @@ let%expect_test "some skope values" = \ let inner pp = sterter pp + 8 in\n\ \ inner 8" in - print_string (print_ast (parse expresion |> Result.get_ok)); + print_string (print_ast (Result.get_ok (parse expresion))); [%expect {| (let result = (let sterter = (fun x -> (if ((x + (8 * 9)) > 4) then (x * 2) else (x * 5))) in (let inner = (fun pp -> (sterter pp + 8)) in inner 8))) |}] ;; From 8ad17ddeeccdf07e6d503cd7529858896c9a7336 Mon Sep 17 00:00:00 2001 From: Dmitrii Kosarev Date: Thu, 11 Dec 2025 15:47:25 +0300 Subject: [PATCH 27/42] Update tasks.md --- tasks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks.md b/tasks.md index 7b4dd392..c3cad6f4 100644 --- a/tasks.md +++ b/tasks.md @@ -14,7 +14,7 @@ Задача на одинаковая каждому, сдавать понимание кода надо очно пулу принимающих. Нужно реализовать интерпретатор miniML с лямбдами и арифметикой. -* Рекурсивные функции (с fix и с let rec), CBV +* Рекурсивные функции (с fix и с let rec), CBV. Идентификаторы как в OCaml * Целые числа и операции над ними; считаем, что if ожидает целочисленное условие, что будет true, а что false --- выберите сами * Тайпчекер не надо * В идеале какой-нибудь сахар для функций: `fun x y -> ...` вместо `fun x -> fun y -> ...` @@ -52,4 +52,4 @@ Тема "на двоих" означает, что делаете в двоем, вместе, одно и то же. В конце я буду ожидать, что оба разбираются в коде и смогут объяснить, что там происходит. Не сможете продемонстрировать, что знаете код напарника как свой --- пинайте на себя Если у Вас есть предложения по добавлению других языков -- пишите. ---> \ No newline at end of file +--> From 7a5a30253e3ddfc09a37a75a59da87e21ba48253 Mon Sep 17 00:00:00 2001 From: Dmitrii Kosarev Date: Thu, 11 Dec 2025 16:28:49 +0300 Subject: [PATCH 28/42] Update tasks.md --- tasks.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks.md b/tasks.md index c3cad6f4..80d4778f 100644 --- a/tasks.md +++ b/tasks.md @@ -39,7 +39,9 @@ * более крупные расширения (1 штука на пару студентов, без повторений) * алгебраические типы данных * explicit polymorphism для recordoв: - * `type 'b r = { func : 'a . ('a -> b') -> 'b } + * `type 'b r = { func : 'a . ('a -> b') -> 'b }` + * исключения? + * ООП **Мотузов+Шаехмитов** * буду дописывать при появлении желающих Если у кого-то курсач (учебная практика) про ФП, то по согласовании с научником, можно попробовать его засчитать этому человеку как допуск выше D. From 9772dd82a3dd4dd8003e81f7eca9856dcb401b06 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Tue, 21 Oct 2025 13:27:42 +0300 Subject: [PATCH 29/42] feat: initialize project --- Krivonosov/.gitignore | 6 + Krivonosov/.ocamlformat | 2 + Krivonosov/.zanuda | 1 + Krivonosov/COPYING | 674 ++++++++++++++++++++++++++++ Krivonosov/COPYING.CC0 | 121 +++++ Krivonosov/COPYING.LESSER | 165 +++++++ Krivonosov/Krivonosov.opam | 44 ++ Krivonosov/Krivonosov.opam.template | 4 + Krivonosov/Makefile | 49 ++ Krivonosov/bin/REPL.ml | 139 ++++++ Krivonosov/bin/REPL.mli | 7 + Krivonosov/bin/dune | 10 + Krivonosov/bin/repl.t | 12 + Krivonosov/dune | 7 + Krivonosov/dune-project | 40 ++ Krivonosov/lib/Pprintast.ml | 64 +++ Krivonosov/lib/Pprintast.mli | 13 + Krivonosov/lib/Printast.ml | 15 + Krivonosov/lib/Printast.mli | 13 + Krivonosov/lib/ast.mli | 19 + Krivonosov/lib/dune | 20 + Krivonosov/lib/interpret.ml | 35 ++ Krivonosov/lib/interpret.mli | 9 + Krivonosov/lib/lambda.ml | 118 +++++ Krivonosov/lib/lambda.mli | 47 ++ Krivonosov/lib/parser.ml | 65 +++ Krivonosov/lib/parser.mli | 22 + Krivonosov/lib/tests.ml | 56 +++ Krivonosov/lib/tests.mli | 9 + Krivonosov/lib/utils.ml | 34 ++ Krivonosov/lib/utils.mli | 22 + Krivonosov/tests/.gitignore | 1 + Krivonosov/tests/dune | 31 ++ Krivonosov/tests/gen_tests.ml | 61 +++ Krivonosov/tests/gen_tests.mli | 9 + Krivonosov/tests/interpret_tests.t | 74 +++ 36 files changed, 2018 insertions(+) create mode 100644 Krivonosov/.gitignore create mode 100644 Krivonosov/.ocamlformat create mode 100644 Krivonosov/.zanuda create mode 100644 Krivonosov/COPYING create mode 100644 Krivonosov/COPYING.CC0 create mode 100644 Krivonosov/COPYING.LESSER create mode 100644 Krivonosov/Krivonosov.opam create mode 100644 Krivonosov/Krivonosov.opam.template create mode 100644 Krivonosov/Makefile create mode 100644 Krivonosov/bin/REPL.ml create mode 100644 Krivonosov/bin/REPL.mli create mode 100644 Krivonosov/bin/dune create mode 100644 Krivonosov/bin/repl.t create mode 100644 Krivonosov/dune create mode 100644 Krivonosov/dune-project create mode 100644 Krivonosov/lib/Pprintast.ml create mode 100644 Krivonosov/lib/Pprintast.mli create mode 100644 Krivonosov/lib/Printast.ml create mode 100644 Krivonosov/lib/Printast.mli create mode 100644 Krivonosov/lib/ast.mli create mode 100644 Krivonosov/lib/dune create mode 100644 Krivonosov/lib/interpret.ml create mode 100644 Krivonosov/lib/interpret.mli create mode 100644 Krivonosov/lib/lambda.ml create mode 100644 Krivonosov/lib/lambda.mli create mode 100644 Krivonosov/lib/parser.ml create mode 100644 Krivonosov/lib/parser.mli create mode 100644 Krivonosov/lib/tests.ml create mode 100644 Krivonosov/lib/tests.mli create mode 100644 Krivonosov/lib/utils.ml create mode 100644 Krivonosov/lib/utils.mli create mode 100644 Krivonosov/tests/.gitignore create mode 100644 Krivonosov/tests/dune create mode 100644 Krivonosov/tests/gen_tests.ml create mode 100644 Krivonosov/tests/gen_tests.mli create mode 100644 Krivonosov/tests/interpret_tests.t diff --git a/Krivonosov/.gitignore b/Krivonosov/.gitignore new file mode 100644 index 00000000..7102a822 --- /dev/null +++ b/Krivonosov/.gitignore @@ -0,0 +1,6 @@ +_build +_coverage +/_esy +/node_modules +/esy.lock +/.melange.eobjs diff --git a/Krivonosov/.ocamlformat b/Krivonosov/.ocamlformat new file mode 100644 index 00000000..97f97080 --- /dev/null +++ b/Krivonosov/.ocamlformat @@ -0,0 +1,2 @@ +profile=janestreet +version=0.26.2 diff --git a/Krivonosov/.zanuda b/Krivonosov/.zanuda new file mode 100644 index 00000000..0f09b19b --- /dev/null +++ b/Krivonosov/.zanuda @@ -0,0 +1 @@ +forward mutability_check ignore REPL.ml diff --git a/Krivonosov/COPYING b/Krivonosov/COPYING new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/Krivonosov/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 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 General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is 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. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + 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. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + 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 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. Use with the GNU Affero General Public License. + + 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 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 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 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 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + 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 GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Krivonosov/COPYING.CC0 b/Krivonosov/COPYING.CC0 new file mode 100644 index 00000000..0e259d42 --- /dev/null +++ b/Krivonosov/COPYING.CC0 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/Krivonosov/COPYING.LESSER b/Krivonosov/COPYING.LESSER new file mode 100644 index 00000000..0a041280 --- /dev/null +++ b/Krivonosov/COPYING.LESSER @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 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. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/Krivonosov/Krivonosov.opam b/Krivonosov/Krivonosov.opam new file mode 100644 index 00000000..68ca103d --- /dev/null +++ b/Krivonosov/Krivonosov.opam @@ -0,0 +1,44 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +version: "0.1" +synopsis: "FIXME An interpreter for language" +description: + "FIXME. A longer description, for example, which are the most interesing features being supported, etc." +maintainer: ["FIXME Vasya Pupkin "] +authors: [ + "FIXME Vasya Pupkin " + "FIXME Pupkin Vasya " +] +license: "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception" +homepage: "https://github.com/Kakadu/fp25" +doc: "https://kakadu.github.io/fp25/docs/Lambda" +bug-reports: "https://github.com/Kakadu/fp25" +depends: [ + "dune" {>= "3.7" & = "3.19.1"} + "angstrom" {= "0.16.0"} + "base" + "ppx_inline_test" {with-test} + "ppx_expect" + "ppx_deriving" + "bisect_ppx" + "odoc" {with-doc} + "ocamlformat" {build & = "0.26.2"} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +pin-depends: [ + ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] +] +# Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Krivonosov/Krivonosov.opam.template b/Krivonosov/Krivonosov.opam.template new file mode 100644 index 00000000..480da691 --- /dev/null +++ b/Krivonosov/Krivonosov.opam.template @@ -0,0 +1,4 @@ +pin-depends: [ + ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] +] +# Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Krivonosov/Makefile b/Krivonosov/Makefile new file mode 100644 index 00000000..e234db4b --- /dev/null +++ b/Krivonosov/Makefile @@ -0,0 +1,49 @@ +.PHONY: repl tests test fmt lint celan + +all: + dune build + +repl: + dune build ./REPL.exe && rlwrap _build/default/REPL.exe + +tests: test +test: + dune runtest + +celan: clean +clean: + @$(RM) -r _build _coverage + +fmt: + dune build @fmt --auto-promote + +lint: + dune build @lint --force + +release: + dune build --profile=release + dune runtest --profile=release + +install: + dune b @install --profile=release + dune install + +ODIG_SWITCHES = --odoc-theme=odig.gruvbox.light +ODIG_SWITCHES += --no-tag-index +ODIG_SWITCHES += --no-pkg-deps +odig: + odig odoc $(ODIG_SWITCHES) Lambda + +TEST_COV_D = /tmp/cov +COVERAGE_OPTS = --coverage-path $(TEST_COV_D) --expect lib/ --expect tests/ + +.PHONY: test_coverage coverage +test_coverage: coverage +coverage: + $(RM) -r $(TEST_COV_D) + mkdir -p $(TEST_COV_D) + BISECT_FILE=$(TEST_COV_D)/language dune runtest --no-print-directory \ + --instrument-with bisect_ppx --force + bisect-ppx-report html $(COVERAGE_OPTS) + bisect-ppx-report summary $(COVERAGE_OPTS) + @echo "Use 'xdg-open _coverage/index.html' to see coverage report" diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml new file mode 100644 index 00000000..c761231e --- /dev/null +++ b/Krivonosov/bin/REPL.ml @@ -0,0 +1,139 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib + +include struct + open Ast + open Utils + + type 'a status = + | Done of 'a + | WIP of 'a + + let fin x = Done x + let wip x = WIP x + + let ao_small_step_strat = + let rec helper = function + | Var _ as l -> fin l + | Abs (x, b) -> + (match helper b with + | WIP b2 -> wip (abs x b2) + | Done b2 -> fin (abs x b2)) + | App (f, arg) -> + (match helper f with + | WIP f2 -> wip (app f2 arg) + | Done (Abs (x, body)) -> + (match helper arg with + | Done arg -> wip (Lambda.subst x ~by:arg body) + | WIP arg -> wip (app f arg)) + | Done f2 -> fin (App (f2, arg))) + in + let rec loop t = + match helper t with + | Done x -> x + | WIP x -> + Format.printf " -- %a\n%!" Pprintast.pp_hum x; + loop x + in + let on_app _ f arg = loop (app f arg) in + let on_abs _ f x = loop (abs f x) in + let on_var _ x = loop (var x) in + { Lambda.on_var; on_abs; on_app } + ;; +end + +type strategy = + | CBN + | CBV + | NO + | AO + +type strategy_kind = + | Small_step + | Big_step + +type stop_after = + | SA_parsing + | SA_never + +type opts = + { mutable dump_parsetree : bool + ; mutable mode : strategy_kind * strategy + ; mutable stop_after : stop_after + } + +let big_step_evaluator = function + | AO -> Lambda.ao_strat + | NO -> Lambda.nor_strat + | CBN -> Lambda.cbn_strat + | CBV -> Lambda.cbv_strat +;; + +let run_single dump_parsetree stop_after eval = + let text = In_channel.(input_all stdin) |> String.trim in + let ast = Parser.parse text in + match ast with + | Error e -> Format.printf "Error: %a\n%!" Parser.pp_error e + | Result.Ok ast -> + if dump_parsetree then Format.printf "Parsed result: @[%a@]\n%!" Printast.pp_named ast; + (match stop_after with + | SA_parsing -> () + | SA_never -> + let rez = eval ast in + Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez) +;; + +let () = + let opts = { dump_parsetree = false; mode = Big_step, NO; stop_after = SA_never } in + let pick_strategy stra () = + let kind, _ = opts.mode in + opts.mode <- kind, stra + in + let pick_step step () = + let _, stra = opts.mode in + opts.mode <- step, stra + in + let () = + let open Stdlib.Arg in + parse + [ "-cbv", Unit (pick_strategy CBV), "Call-by-value strategy" + ; "-cbn", Unit (pick_strategy CBN), "Call-by-name strategy" + ; "-no", Unit (pick_strategy NO), "Normal Order strategy" + ; "-ao", Unit (pick_strategy AO), "Applicative Order strategy" + ; ( "-small" + , Unit (pick_step Small_step) + , "Small-step strategy kind (default is big-step)" ) + ; ( "-big" + , Unit (pick_step Big_step) + , "Small-step strategy kind (default is big-step)" ) + ; ( "-dparsetree" + , Unit (fun () -> opts.dump_parsetree <- true) + , "Dump parse tree, don't eval enything" ) + ; ( "-stop-after" + , String + (function + | "parsing" -> opts.stop_after <- SA_parsing + | _ -> failwith "Bad argument of -stop-after") + , "" ) + ] + (fun _ -> + Stdlib.Format.eprintf "Positioned arguments are not supported\n"; + Stdlib.exit 1) + "Read-Eval-Print-Loop for Utyped Lambda Calculus" + in + run_single opts.dump_parsetree opts.stop_after (fun ast -> + let stra = + match opts.mode with + | Big_step, stra -> big_step_evaluator stra + | Small_step, AO -> ao_small_step_strat + | _ -> raise (Failure "Implement it yourself") + in + Lambda.apply_strat stra ast) +;; diff --git a/Krivonosov/bin/REPL.mli b/Krivonosov/bin/REPL.mli new file mode 100644 index 00000000..c1135e06 --- /dev/null +++ b/Krivonosov/bin/REPL.mli @@ -0,0 +1,7 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] diff --git a/Krivonosov/bin/dune b/Krivonosov/bin/dune new file mode 100644 index 00000000..a03fbc3b --- /dev/null +++ b/Krivonosov/bin/dune @@ -0,0 +1,10 @@ +(executable + (name REPL) + (public_name REPL) + (modules REPL) + (libraries lambda_lib) + (instrumentation + (backend bisect_ppx))) + +(cram + (deps ./REPL.exe %{bin:REPL})) diff --git a/Krivonosov/bin/repl.t b/Krivonosov/bin/repl.t new file mode 100644 index 00000000..35b4916c --- /dev/null +++ b/Krivonosov/bin/repl.t @@ -0,0 +1,12 @@ + + $ ./REPL.exe -help + Read-Eval-Print-Loop for Utyped Lambda Calculus + -cbv Call-by-value strategy + -cbn Call-by-name strategy + -no Normal Order strategy + -ao Applicative Order strategy + -small Small-step strategy kind (default is big-step) + -big Small-step strategy kind (default is big-step) + -dparsetree Dump parse tree, don't eval enything + -help Display this list of options + --help Display this list of options diff --git a/Krivonosov/dune b/Krivonosov/dune new file mode 100644 index 00000000..98e54536 --- /dev/null +++ b/Krivonosov/dune @@ -0,0 +1,7 @@ +(env + (dev + (flags + (:standard -alert @deprecated -warn-error -A -w -3-9-32-34-58))) + (release + (flags + (:standard -alert @deprecated -warn-error +A -w +A-4-40-42-44-70)))) diff --git a/Krivonosov/dune-project b/Krivonosov/dune-project new file mode 100644 index 00000000..382d6125 --- /dev/null +++ b/Krivonosov/dune-project @@ -0,0 +1,40 @@ +(lang dune 3.7) + +(generate_opam_files true) + +(cram enable) + +(license "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception") + +(authors "Krivonosov Konstantin ") + +(maintainers "Krivonosov Konstantin ") + +(bug_reports "https://github.com/Kakadu/fp25") + +(homepage "https://github.com/Kakadu/fp25") + +(package + (name Krivonosov) ; FIXME and regenerate .opam file using 'dune build @install' + (synopsis "An interpreter for mimiML") + (description "TODO: An interpreter for a functional miniML language") + (documentation "https://kakadu.github.io/fp25/docs/Lambda") + (version 0.1) + (depends + (dune + (= "3.19.1")) + (angstrom + (= "0.16.0")) + base + (ppx_inline_test :with-test) + ppx_expect + ppx_deriving + bisect_ppx + (odoc :with-doc) + (ocamlformat + (and + :build + (= "0.26.2"))) + ; base + ; After adding dependencies to 'dune' files add the same dependecies here too + )) diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml new file mode 100644 index 00000000..c57422a5 --- /dev/null +++ b/Krivonosov/lib/Pprintast.ml @@ -0,0 +1,64 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(* Pretty printer goes here *) + +open Ast +open Utils + +let pp ?(compact = true) = + let open Format in + let mangle t fmt x = + if is_free_in x t || not compact then fprintf fmt "%s" x else fprintf fmt "_" + in + let rec pp fmt = function + | Var s -> Format.fprintf fmt "%s" s + | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r + | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> + if compact then Format.fprintf fmt "⊤" + | Abs (x, Abs (y, Var z)) when y = z && x <> z && compact -> Format.fprintf fmt "⊥" + | Abs (f, Abs (x, Var z)) when x = z && x <> f && compact -> Format.fprintf fmt "0" + | Abs (f, Abs (x, App (Var g, Var z))) when x = z && x <> f && g = f && compact -> + Format.fprintf fmt "1" + | Abs (f, Abs (x, App (Var g, App (Var h, Var z)))) + when x = z && x <> f && g = f && h = g && compact -> Format.fprintf fmt "2" + | Abs (v1, Abs (v2, Abs (v3, Abs (v4, t)))) when compact -> + Format.fprintf + fmt + "(λ %a %a %a %a -> %a)" + (mangle t) + v1 + (mangle t) + v2 + (mangle t) + v3 + (mangle t) + v4 + pp + t + | Abs (v1, Abs (v2, Abs (v3, t))) when compact -> + Format.fprintf + fmt + "(λ %a %a %a -> %a)" + (mangle t) + v1 + (mangle t) + v2 + (mangle t) + v3 + pp + t + | Abs (v1, Abs (v2, t)) when compact -> + Format.fprintf fmt "(λ %a %a -> %a)" (mangle t) v1 (mangle t) v2 pp t + | Abs (x, t) -> Format.fprintf fmt "(λ %a . %a)" (mangle t) x pp t + in + pp +;; + +let pp_hum = pp ~compact:true +let pp = pp ~compact:false diff --git a/Krivonosov/lib/Pprintast.mli b/Krivonosov/lib/Pprintast.mli new file mode 100644 index 00000000..81f6c2ff --- /dev/null +++ b/Krivonosov/lib/Pprintast.mli @@ -0,0 +1,13 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** Verbose printing. Usable for paring *) +val pp : Format.formatter -> string Ast.t -> unit + +(** Print in fancy human-readable form *) +val pp_hum : Format.formatter -> string Ast.t -> unit diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml new file mode 100644 index 00000000..56a1fd7d --- /dev/null +++ b/Krivonosov/lib/Printast.ml @@ -0,0 +1,15 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type 'name t = 'name Ast.t = + | Var of 'name + | Abs of 'name * 'name t + | App of 'name t * 'name t +[@@deriving show { with_path = false }] + +let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/Printast.mli b/Krivonosov/lib/Printast.mli new file mode 100644 index 00000000..2b73b720 --- /dev/null +++ b/Krivonosov/lib/Printast.mli @@ -0,0 +1,13 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** Pretty-print representation of AST with names. *) +val pp_named : Format.formatter -> string Ast.t -> unit + +val pp : (Format.formatter -> 'name -> unit) -> Format.formatter -> 'name Ast.t -> unit +val show : (Format.formatter -> 'name -> unit) -> 'name Ast.t -> string diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli new file mode 100644 index 00000000..2d0f48fc --- /dev/null +++ b/Krivonosov/lib/ast.mli @@ -0,0 +1,19 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type name = string + +(** The main type for our AST (дерева абстрактного синтаксиса) *) +type 'name t = + | Var of 'name (** Variable [x] *) + | Abs of 'name * 'name t (** Abstraction [λx.t] *) + | App of 'name t * 'name t + +(* Application [f g ] *) +(** In type definition above the 3rd constructor is intentionally without documentation + to test linter *) diff --git a/Krivonosov/lib/dune b/Krivonosov/lib/dune new file mode 100644 index 00000000..c50f72d6 --- /dev/null +++ b/Krivonosov/lib/dune @@ -0,0 +1,20 @@ +(library + (name lambda_lib) + (public_name Krivonosov.Lib) + (modules Ast Lambda Interpret Parser Printast Pprintast utils) + (modules_without_implementation ast) + (libraries base angstrom) + (preprocess + (pps ppx_deriving.show)) + (instrumentation + (backend bisect_ppx))) + +(library + (name tests) + (modules tests) + (libraries lambda_lib) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx)) + (inline_tests)) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml new file mode 100644 index 00000000..26eafed4 --- /dev/null +++ b/Krivonosov/lib/interpret.ml @@ -0,0 +1,35 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** Real monadic interpreter goes here *) + +open Utils + +type error = [ `UnknownVariable of string (** just for example *) ] + +module Interpret (M : MONAD_FAIL) : sig + val run : _ Ast.t -> (int, [> error ]) M.t +end = struct + let run _ = + (* TODO: implement interpreter here *) + if true then M.fail (`UnknownVariable "var") else failwith "not implemented" + ;; +end + +let parse_and_run str = + let module I = Interpret (Base.Result) in + let rez = Base.Result.(Parser.parse str >>= I.run) in + match rez with + | Result.Ok n -> Printf.printf "Success: %d\n" n + | Result.Error #Parser.error -> + Format.eprintf "Parsing error\n%!"; + exit 1 + | Result.Error #error -> + Format.eprintf "Interpreter error\n%!"; + exit 1 +;; diff --git a/Krivonosov/lib/interpret.mli b/Krivonosov/lib/interpret.mli new file mode 100644 index 00000000..8575e8ab --- /dev/null +++ b/Krivonosov/lib/interpret.mli @@ -0,0 +1,9 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +val parse_and_run : string -> unit diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml new file mode 100644 index 00000000..fa62c9bc --- /dev/null +++ b/Krivonosov/lib/lambda.ml @@ -0,0 +1,118 @@ +(** Copyright 2021-2023, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +open Ast +open Base +open Utils + +(* Smart constructors *) +let var x = Var x +let abs x y = Abs (x, y) +let app x y = App (x, y) + +let replace_name x ~by = + let rec helper = function + | Var y when String.equal x y -> Var by + | Var t -> Var t + | App (l, r) -> App (helper l, helper r) + | Abs (y, t) when String.equal x y -> Abs (by, helper t) + | Abs (z, t) -> Abs (z, helper t) + in + helper +;; + +let rec next_name s old = + if List.mem ~equal:String.equal old s then next_name ("_" ^ s) old else s +;; + +(* The call [subst x ~by:v e] means `[x/v]e` or `e[v -> x]` *) +let subst x ~by:v = + let rec helper = function + | Var y when String.equal y x -> v + | Var y -> Var y + | App (l, r) -> app (helper l) (helper r) + | Abs (y, b) when String.equal y x -> abs y b + | Abs (y, t) when is_free_in y v -> + let frees = free_vars v @ free_vars t in + let w = next_name y frees in + helper (abs w (replace_name y ~by:w t)) + | Abs (y, b) -> abs y (helper b) + in + helper +;; + +type strat = + { on_var : strat -> name -> string Ast.t + ; on_abs : strat -> name -> string Ast.t -> string Ast.t + ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t + } + +let apply_strat st = function + | Var name -> st.on_var st name + | Abs (x, b) -> st.on_abs st x b + | App (l, r) -> st.on_app st l r +;; + +let without_strat = + let on_var _ = var in + let on_abs _ = abs in + let on_app _ = app in + { on_var; on_abs; on_app } +;; + +let cbn_strat = + let on_app st f arg = + match apply_strat st f with + | Abs (x, e) -> apply_strat st (subst x ~by:arg e) + | f2 -> App (f2, arg) + in + { without_strat with on_app } +;; + +let under_abstraction st x b = abs x (apply_strat st b) + +(* Normal Order Reduction to Normal Form + Application function reduced as CBN first + + Reduce under abstractions *) +let nor_strat = + let on_app st f arg = + match apply_strat cbn_strat f with + | Abs (x, e) -> apply_strat st @@ subst x ~by:arg e + | f1 -> + let f2 = apply_strat st f1 in + let arg2 = apply_strat st arg in + App (f2, arg2) + in + { without_strat with on_app; on_abs = under_abstraction } +;; + +(* Call-by-Value Reduction to Weak Normal Form *) +let cbv_strat = + let on_app st f arg = + match apply_strat st f with + | Abs (x, e) -> + let arg2 = apply_strat st arg in + apply_strat st @@ subst x ~by:arg2 e + | f2 -> App (f2, apply_strat st arg) + in + { without_strat with on_app } +;; + +(* Applicative Order Reduction to Normal Form + As CBV but reduce under abstractions *) +let ao_strat = { cbv_strat with on_abs = under_abstraction } +let a = var "a" +let x = var "x" +let y = var "y" +let z = var "z" +let f = var "f" +let g = var "g" +let h = var "h" +let m = var "m" +let n = var "n" +let p = var "p" +let zero = abs "f" @@ abs "x" x +let one = abs "f" @@ abs "x" @@ app f x +let two = abs "f" @@ abs "x" @@ app f (app f x) +let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli new file mode 100644 index 00000000..cf56ce4f --- /dev/null +++ b/Krivonosov/lib/lambda.mli @@ -0,0 +1,47 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(* + val var : 'a -> 'a Ast.t + val abs : 'a -> 'a Ast.t -> 'a Ast.t + val app : 'a Ast.t -> 'a Ast.t -> 'a Ast.t *) + +val subst : string -> by:string Ast.t -> string Ast.t -> string Ast.t + +type strat = + { on_var : strat -> Ast.name -> string Ast.t + ; on_abs : strat -> Ast.name -> string Ast.t -> string Ast.t + ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t + } + +val apply_strat : strat -> string Ast.t -> string Ast.t +val without_strat : strat + +(** Predefined strategies *) + +val cbn_strat : strat +val nor_strat : strat +val cbv_strat : strat +val ao_strat : strat + +(** Example lambda expressions *) + +val a : string Ast.t +val x : string Ast.t +val y : string Ast.t +val z : string Ast.t +val f : string Ast.t +val g : string Ast.t +val h : string Ast.t +val m : string Ast.t +val n : string Ast.t +val p : string Ast.t +val zero : string Ast.t +val one : string Ast.t +val two : string Ast.t +val three : string Ast.t diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml new file mode 100644 index 00000000..2b7f709b --- /dev/null +++ b/Krivonosov/lib/parser.ml @@ -0,0 +1,65 @@ +(** Copyright 2021-2023, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +(* TODO: implement parser here *) +open Angstrom + +let is_space = function + | ' ' | '\t' | '\n' | '\r' -> true + | _ -> false +;; + +let spaces = skip_while is_space + +let varname = + satisfy (function + | 'a' .. 'z' -> true + | _ -> false) +;; + +let conde = function + | [] -> fail "empty conde" + | h :: tl -> List.fold_left ( <|> ) h tl +;; + +type dispatch = + { apps : dispatch -> string Ast.t Angstrom.t + ; single : dispatch -> string Ast.t Angstrom.t + } + +type error = [ `Parsing_error of string ] + +let pp_error ppf = function + | `Parsing_error s -> Format.fprintf ppf "%s" s +;; + +let parse_lam = + let single pack = + fix (fun _ -> + conde + [ char '(' *> pack.apps pack <* char ')' "Parentheses expected" + ; ((string "λ" <|> string "\\") *> spaces *> varname + <* spaces + <* (return () <* char '.' <|> string "->" *> return ()) + >>= fun var -> + pack.apps pack >>= fun b -> return (Ast.Abs (String.make 1 var, b))) + ; (varname <* spaces >>= fun c -> return (Ast.Var (String.make 1 c))) + ]) + in + let apps pack = + many1 (spaces *> pack.single pack <* spaces) + >>= function + | [] -> fail "bad syntax" + | x :: xs -> return @@ List.fold_left (fun l r -> Ast.App (l, r)) x xs + in + { single; apps } +;; + +let parse str = + match + Angstrom.parse_string (parse_lam.apps parse_lam) ~consume:Angstrom.Consume.All str + with + | Result.Ok x -> Result.Ok x + | Error er -> Result.Error (`Parsing_error er) +;; diff --git a/Krivonosov/lib/parser.mli b/Krivonosov/lib/parser.mli new file mode 100644 index 00000000..815d0317 --- /dev/null +++ b/Krivonosov/lib/parser.mli @@ -0,0 +1,22 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type error = [ `Parsing_error of string ] + +val pp_error : Format.formatter -> [< `Parsing_error of string ] -> unit + +(** Main entry of parser *) +val parse : string -> (Ast.name Ast.t, [> error ]) result + +type dispatch = + { apps : dispatch -> Ast.name Ast.t Angstrom.t + ; single : dispatch -> Ast.name Ast.t Angstrom.t + } + +(* A collection of miniparsers *) +val parse_lam : dispatch diff --git a/Krivonosov/lib/tests.ml b/Krivonosov/lib/tests.ml new file mode 100644 index 00000000..7f7395a5 --- /dev/null +++ b/Krivonosov/lib/tests.ml @@ -0,0 +1,56 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** ***** UNIT TESTS COULD GO HERE (JUST AN EXAMPLE) *) +let rec fact n = if n = 1 then 1 else n * fact (n - 1) + +let%test _ = fact 5 = 120 + +(* These is a simple unit test that tests a single function 'fact' + If you want to test something large, like interpretation of a piece + of a minilanguge, it is not longer a unit tests but an integration test. + Read about dune's cram tests and put the test into `demos/somefile.t`. +*) + +open Lambda_lib +open Parser + +let parse_optimistically str = Result.get_ok (parse str) +let pp = Printast.pp_named + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "x y"); + [%expect {| (App ((Var x), (Var y))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(x y)"); + [%expect {| (App ((Var x), (Var y))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(\\x . x x)"); + [%expect {| (Abs (x, (App ((Var x), (Var x))))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(λf.λx. f (x x))"); + [%expect {| (Abs (f, (Abs (x, (App ((Var f), (App ((Var x), (Var x))))))))) |}] +;; + +let _ = Lambda_lib.Interpret.parse_and_run +let _ = Lambda_lib.Lambda.a +let _ = Lambda_lib.Lambda.one +let _ = Lambda_lib.Lambda.p +let _ = Lambda_lib.Lambda.three +let _ = Lambda_lib.Lambda.two +let _ = Lambda_lib.Lambda.without_strat +let _ = Lambda_lib.Lambda.zero +let _ = Lambda_lib.Parser.parse_lam +let _ = Lambda_lib.Printast.pp +let _ = Lambda_lib.Printast.show diff --git a/Krivonosov/lib/tests.mli b/Krivonosov/lib/tests.mli new file mode 100644 index 00000000..639d1975 --- /dev/null +++ b/Krivonosov/lib/tests.mli @@ -0,0 +1,9 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(* This file is intentionally empty *) diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml new file mode 100644 index 00000000..4974b9db --- /dev/null +++ b/Krivonosov/lib/utils.ml @@ -0,0 +1,34 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Base +open Ast + +(* TODO: use a set instead of list *) +let list_remove x = List.filter ~f:(fun a -> not (String.equal a x)) + +let free_vars = + let rec helper acc = function + | Var s -> s :: acc + | Abs (s, l) -> acc @ list_remove s (helper [] l) + | App (l, r) -> helper (helper acc r) l + in + helper [] +;; + +let is_free_in x term = List.mem (free_vars term) x ~equal:String.equal +let var x = Var x +let abs x l = Abs (x, l) +let app l r = App (l, r) + +(* TODO: rework this *) +module type MONAD_FAIL = sig + include Base.Monad.S2 + + val fail : 'e -> ('a, 'e) t +end diff --git a/Krivonosov/lib/utils.mli b/Krivonosov/lib/utils.mli new file mode 100644 index 00000000..70e625a5 --- /dev/null +++ b/Krivonosov/lib/utils.mli @@ -0,0 +1,22 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +val free_vars : string Ast.t -> string list +val is_free_in : string -> string Ast.t -> bool + +(** Smart constructors *) + +val var : 'a -> 'a Ast.t +val abs : 'a -> 'a Ast.t -> 'a Ast.t +val app : 'a Ast.t -> 'a Ast.t -> 'a Ast.t + +module type MONAD_FAIL = sig + include Base.Monad.S2 + + val fail : 'e -> ('a, 'e) t +end diff --git a/Krivonosov/tests/.gitignore b/Krivonosov/tests/.gitignore new file mode 100644 index 00000000..26685e79 --- /dev/null +++ b/Krivonosov/tests/.gitignore @@ -0,0 +1 @@ +lam*.txt \ No newline at end of file diff --git a/Krivonosov/tests/dune b/Krivonosov/tests/dune new file mode 100644 index 00000000..31780410 --- /dev/null +++ b/Krivonosov/tests/dune @@ -0,0 +1,31 @@ +(executable + (name gen_tests) + (libraries lambda_lib) + (modules gen_tests) + (instrumentation + (backend bisect_ppx))) + +(rule + (deps ./gen_tests.exe) + (targets + lam_zero.txt + lam_one.txt + lam_1+1.txt + lam_2x1.txt + lam_3x2.txt + lam_fac3.txt) + (mode + (promote (until-clean))) + (action + (run %{deps}))) + +(cram + (applies_to interpret_tests) + (deps + lam_zero.txt + lam_one.txt + lam_1+1.txt + lam_2x1.txt + lam_3x2.txt + lam_fac3.txt + ../bin/REPL.exe)) diff --git a/Krivonosov/tests/gen_tests.ml b/Krivonosov/tests/gen_tests.ml new file mode 100644 index 00000000..6ae0f429 --- /dev/null +++ b/Krivonosov/tests/gen_tests.ml @@ -0,0 +1,61 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib +open Ast +open Lambda +open Utils + +let zero = abs "g" @@ abs "y" @@ Var "y" +let one = abs "f" @@ abs "x" @@ app f (Var "x") +let two = abs "f" @@ abs "x" @@ app f (app f x) +let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) +let plus = abs "m" @@ abs "n" @@ abs "f" @@ abs "x" @@ app m @@ app f @@ app n @@ app f x +let mul = abs "x" @@ abs "y" @@ abs "z" @@ app x (app y z) +let true_ = abs "x" @@ abs "y" @@ Var "x" +let false_ = abs "x" @@ abs "y" @@ Var "y" +let isZero = abs "n" @@ app (app n (abs "x" false_)) true_ + +(* TODO: write the right if-then-else + by adding thunk around then and else branches to delay the evaluation *) +let pred = + let xxx = abs "g" @@ abs "h" @@ app h (app g f) in + abs "n" @@ abs "f" @@ abs "x" @@ app (app (app n xxx) (abs "u" x)) (abs "u" (Var "u")) +;; + +let pp = Pprintast.pp + +let out_term file lam = + Out_channel.with_open_text file (fun ch -> + Format.fprintf (Format.formatter_of_out_channel ch) "%a%!" pp lam; + flush ch) +;; + +let () = out_term "lam_zero.txt" zero +let () = out_term "lam_one.txt" one +let () = out_term "lam_1+1.txt" (app plus @@ app one one) +let () = out_term "lam_2x1.txt" (app (app mul two) one) +let () = out_term "lam_3x2.txt" (app (app mul three) two) + +(** Definition for normal order *) +module _ = struct + let ite cond th el = app (app (app isZero cond) th) el + + let fact = + abs "s" + @@ abs "n" + @@ ite (Var "n") one (app (app mul (app (var "s") (app pred (var "n")))) (var "n")) + ;; + + let ygrek = + let hack = abs "x" (app f (app x x)) in + abs "f" (app hack hack) + ;; + + let () = out_term "lam_fac3.txt" @@ app (app ygrek fact) three +end diff --git a/Krivonosov/tests/gen_tests.mli b/Krivonosov/tests/gen_tests.mli new file mode 100644 index 00000000..b0431923 --- /dev/null +++ b/Krivonosov/tests/gen_tests.mli @@ -0,0 +1,9 @@ +(* Intentionally empty *) + +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t new file mode 100644 index 00000000..8a377a93 --- /dev/null +++ b/Krivonosov/tests/interpret_tests.t @@ -0,0 +1,74 @@ +Copyright 2021-2024, Kakadu and contributors +SPDX-License-Identifier: CC0-1.0 + +Cram tests here. They run and compare program output to the expected output +https://dune.readthedocs.io/en/stable/tests.html#cram-tests +Use `dune promote` after you change things that should runned + +If you need to put sample program and use it both in your interpreter and preinstalled one, +you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` +in the dune file + + $ ../bin/REPL.exe -cbv -dparsetree < \f.x + Parsed result: (Abs (f, (Var x))) + Evaluated result: (λ _ . x) + $ ../bin/REPL.exe -dparsetree < garbage242 + Error: : end_of_input + + + + $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) + Parsed result: (App ( + (App ((Abs (x, (Abs (y, (Var x))))), (Abs (u, (Var u))))), + (App ((Abs (x, (App ((Var x), (Var x))))), + (Abs (x, (App ((Var x), (Var x))))))) + )) + Evaluated result: (λ u . u) +Below we redirect contents of the file to the evaluator + $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt + Parsed result: (App ( + (Abs (m, + (Abs (n, + (Abs (f, + (Abs (x, + (App ((Var m), + (App ((Var f), + (App ((Var n), (App ((Var f), (Var x))))) + )) + )) + )) + )) + )) + )), + (App ((Abs (f, (Abs (x, (App ((Var f), (Var x))))))), + (Abs (f, (Abs (x, (App ((Var f), (Var x))))))))) + )) + + $ ../bin/REPL.exe -ao < lam_1+1.txt + Evaluated result: (λ n f x _x -> ((f (n (f x))) _x)) + $ ../bin/REPL.exe -ao < lam_2x1.txt + Evaluated result: 2 +Call by value doesn't reduce under abstraction + $ ../bin/REPL.exe -cbv < lam_2x1.txt + Evaluated result: (λ z . (2 (1 z))) + $ ../bin/REPL.exe -ao -small < lam_3x2.txt + -- ((λ y z -> ((λ f x -> (f (f (f x)))) (y z))) 2) + -- ((λ y z x -> ((y z) ((y z) ((y z) x)))) 2) + -- (λ z x -> ((2 z) ((2 z) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((2 z) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((2 z) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((λ x . (z (z x))) x)))) + -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) (z (z x))))) + -- (λ z x -> ((λ x . (z (z x))) (z (z (z (z x)))))) + -- (λ z x -> (z (z (z (z (z (z x))))))) + Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) + $ ../bin/REPL.exe -ao < lam_zero.txt + Evaluated result: ⊥ +For 3! we use noral order reduction + $ cat lam_fac3.txt + (((λ f . ((λ x . (f (x x))) (λ x . (f (x x))))) (λ s . (λ n . ((((λ n . ((n (λ x . (λ x . (λ y . y)))) (λ x . (λ y . x)))) n) (λ f . (λ x . (f x)))) (((λ x . (λ y . (λ z . (x (y z))))) (s ((λ n . (λ f . (λ x . (((n (λ g . (λ h . (h (g f))))) (λ u . x)) (λ u . u))))) n))) n))))) (λ f . (λ x . (f (f (f x)))))) + $ ../bin/REPL.exe -no < lam_fac3.txt + Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) From efc45f96b81401c440b8310c171961dc2315f142 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Sun, 30 Nov 2025 19:34:46 +0300 Subject: [PATCH 30/42] chore: description --- Krivonosov/Krivonosov.opam | 13 +++++-------- Krivonosov/dune-project | 7 ++++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Krivonosov/Krivonosov.opam b/Krivonosov/Krivonosov.opam index 68ca103d..49f1cff5 100644 --- a/Krivonosov/Krivonosov.opam +++ b/Krivonosov/Krivonosov.opam @@ -1,17 +1,14 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" version: "0.1" -synopsis: "FIXME An interpreter for language" +synopsis: "An interpreter for mimiML" description: - "FIXME. A longer description, for example, which are the most interesing features being supported, etc." -maintainer: ["FIXME Vasya Pupkin "] -authors: [ - "FIXME Vasya Pupkin " - "FIXME Pupkin Vasya " -] + "A Call-by-Value miniML interpreter featuring recursion, arithmetic, and monadic error handling" +maintainer: ["Krivonosov Konstantin "] +authors: ["Krivonosov Konstantin "] license: "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception" homepage: "https://github.com/Kakadu/fp25" -doc: "https://kakadu.github.io/fp25/docs/Lambda" +doc: "https://kakadu.github.io/fp25/docs/Krivonosov" bug-reports: "https://github.com/Kakadu/fp25" depends: [ "dune" {>= "3.7" & = "3.19.1"} diff --git a/Krivonosov/dune-project b/Krivonosov/dune-project index 382d6125..d6a2be34 100644 --- a/Krivonosov/dune-project +++ b/Krivonosov/dune-project @@ -15,10 +15,11 @@ (homepage "https://github.com/Kakadu/fp25") (package - (name Krivonosov) ; FIXME and regenerate .opam file using 'dune build @install' + (name Krivonosov) (synopsis "An interpreter for mimiML") - (description "TODO: An interpreter for a functional miniML language") - (documentation "https://kakadu.github.io/fp25/docs/Lambda") + (description + "A Call-by-Value miniML interpreter featuring recursion, arithmetic, and monadic error handling") + (documentation "https://kakadu.github.io/fp25/docs/Krivonosov") (version 0.1) (depends (dune From c310a2a2d0957423ff3bf83d148ba560f0775636 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Wed, 10 Dec 2025 19:49:00 +0300 Subject: [PATCH 31/42] feat: implement multi-character identifiers --- Krivonosov/lib/parser.ml | 88 +++++++++++++++++++++++---------------- Krivonosov/lib/parser.mli | 8 ---- Krivonosov/lib/tests.ml | 2 +- 3 files changed, 54 insertions(+), 44 deletions(-) diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index 2b7f709b..1130e301 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -2,7 +2,6 @@ (** SPDX-License-Identifier: LGPL-3.0-or-later *) -(* TODO: implement parser here *) open Angstrom let is_space = function @@ -12,21 +11,33 @@ let is_space = function let spaces = skip_while is_space -let varname = - satisfy (function - | 'a' .. 'z' -> true - | _ -> false) +(* Keyword filtering *) +let is_keyword = function + | "let" | "rec" | "if" | "then" | "else" | "in" | "fun" | "fix" -> true + | _ -> false ;; -let conde = function - | [] -> fail "empty conde" - | h :: tl -> List.fold_left ( <|> ) h tl +let is_ident_char = function + | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '\'' -> true + | _ -> false ;; -type dispatch = - { apps : dispatch -> string Ast.t Angstrom.t - ; single : dispatch -> string Ast.t Angstrom.t - } +(* Multi-character identifier parser *) +let identifier = + let first_char_parser = + satisfy (function + | 'a' .. 'z' | '_' -> true + | _ -> false) + in + lift2 + (fun fc rest -> String.make 1 fc ^ rest) + first_char_parser + (take_while is_ident_char) + >>= fun ident -> + if is_keyword ident + then fail ("Keyword '" ^ ident ^ "' cannot be used as identifier") + else return ident +;; type error = [ `Parsing_error of string ] @@ -34,32 +45,39 @@ let pp_error ppf = function | `Parsing_error s -> Format.fprintf ppf "%s" s ;; -let parse_lam = - let single pack = - fix (fun _ -> - conde - [ char '(' *> pack.apps pack <* char ')' "Parentheses expected" - ; ((string "λ" <|> string "\\") *> spaces *> varname - <* spaces - <* (return () <* char '.' <|> string "->" *> return ()) - >>= fun var -> - pack.apps pack >>= fun b -> return (Ast.Abs (String.make 1 var, b))) - ; (varname <* spaces >>= fun c -> return (Ast.Var (String.make 1 c))) - ]) - in - let apps pack = - many1 (spaces *> pack.single pack <* spaces) - >>= function - | [] -> fail "bad syntax" - | x :: xs -> return @@ List.fold_left (fun l r -> Ast.App (l, r)) x xs - in - { single; apps } +(* Main parser using single fix point *) +let pexpr = + fix (fun pexpr -> + (* Atomic expressions: variables and parenthesized expressions *) + let patom = + spaces + *> choice + [ char '(' *> pexpr <* char ')' <* spaces "Parentheses expected" + ; (identifier <* spaces >>| fun name -> Ast.Var name) + ] + in + (* Lambda abstractions *) + let plambda = + (string "λ" <|> string "\\") *> spaces *> identifier + <* spaces + <* (char '.' <|> string "->" *> return ' ') + <* spaces + >>= fun param -> pexpr >>| fun body -> Ast.Abs (param, body) + in + (* Application: sequence of atoms *) + let papp = + many1 patom + >>| function + | [] -> failwith "impossible: many1 returned empty list" + | [ x ] -> x + | x :: xs -> List.fold_left (fun acc e -> Ast.App (acc, e)) x xs + in + (* Top level: try lambda first, then application *) + spaces *> (plambda <|> papp) <* spaces) ;; let parse str = - match - Angstrom.parse_string (parse_lam.apps parse_lam) ~consume:Angstrom.Consume.All str - with + match Angstrom.parse_string ~consume:Angstrom.Consume.All pexpr str with | Result.Ok x -> Result.Ok x | Error er -> Result.Error (`Parsing_error er) ;; diff --git a/Krivonosov/lib/parser.mli b/Krivonosov/lib/parser.mli index 815d0317..188060b5 100644 --- a/Krivonosov/lib/parser.mli +++ b/Krivonosov/lib/parser.mli @@ -12,11 +12,3 @@ val pp_error : Format.formatter -> [< `Parsing_error of string ] -> unit (** Main entry of parser *) val parse : string -> (Ast.name Ast.t, [> error ]) result - -type dispatch = - { apps : dispatch -> Ast.name Ast.t Angstrom.t - ; single : dispatch -> Ast.name Ast.t Angstrom.t - } - -(* A collection of miniparsers *) -val parse_lam : dispatch diff --git a/Krivonosov/lib/tests.ml b/Krivonosov/lib/tests.ml index 7f7395a5..c5e5771a 100644 --- a/Krivonosov/lib/tests.ml +++ b/Krivonosov/lib/tests.ml @@ -51,6 +51,6 @@ let _ = Lambda_lib.Lambda.three let _ = Lambda_lib.Lambda.two let _ = Lambda_lib.Lambda.without_strat let _ = Lambda_lib.Lambda.zero -let _ = Lambda_lib.Parser.parse_lam +(* parse_lam removed in new parser implementation *) let _ = Lambda_lib.Printast.pp let _ = Lambda_lib.Printast.show From d8b9f7f76219c84ce03abe12a68de46523be1625 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Wed, 10 Dec 2025 19:59:01 +0300 Subject: [PATCH 32/42] feat: add integer literals --- Krivonosov/bin/REPL.ml | 4 +++- Krivonosov/lib/Pprintast.ml | 1 + Krivonosov/lib/Printast.ml | 1 + Krivonosov/lib/ast.mli | 7 ++----- Krivonosov/lib/lambda.ml | 7 ++++++- Krivonosov/lib/lambda.mli | 1 + Krivonosov/lib/parser.ml | 12 +++++++++++- Krivonosov/lib/tests.ml | 1 + Krivonosov/lib/utils.ml | 1 + Krivonosov/tests/interpret_tests.t | 3 ++- 10 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index c761231e..5559b3b3 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -22,6 +22,7 @@ include struct let ao_small_step_strat = let rec helper = function | Var _ as l -> fin l + | Int _ as l -> fin l | Abs (x, b) -> (match helper b with | WIP b2 -> wip (abs x b2) @@ -45,7 +46,8 @@ include struct let on_app _ f arg = loop (app f arg) in let on_abs _ f x = loop (abs f x) in let on_var _ x = loop (var x) in - { Lambda.on_var; on_abs; on_app } + let on_int _ n = Ast.Int n in + { Lambda.on_var; on_abs; on_app; on_int } ;; end diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml index c57422a5..fd3ab301 100644 --- a/Krivonosov/lib/Pprintast.ml +++ b/Krivonosov/lib/Pprintast.ml @@ -18,6 +18,7 @@ let pp ?(compact = true) = in let rec pp fmt = function | Var s -> Format.fprintf fmt "%s" s + | Int n -> Format.fprintf fmt "%d" n | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> if compact then Format.fprintf fmt "⊤" diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml index 56a1fd7d..2f50bc5e 100644 --- a/Krivonosov/lib/Printast.ml +++ b/Krivonosov/lib/Printast.ml @@ -10,6 +10,7 @@ type 'name t = 'name Ast.t = | Var of 'name | Abs of 'name * 'name t | App of 'name t * 'name t + | Int of int [@@deriving show { with_path = false }] let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli index 2d0f48fc..0c31bd74 100644 --- a/Krivonosov/lib/ast.mli +++ b/Krivonosov/lib/ast.mli @@ -12,8 +12,5 @@ type name = string type 'name t = | Var of 'name (** Variable [x] *) | Abs of 'name * 'name t (** Abstraction [λx.t] *) - | App of 'name t * 'name t - -(* Application [f g ] *) -(** In type definition above the 3rd constructor is intentionally without documentation - to test linter *) + | App of 'name t * 'name t (** Application [f g ] *) + | Int of int (** Integer literal [42] *) diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml index fa62c9bc..50718dd7 100644 --- a/Krivonosov/lib/lambda.ml +++ b/Krivonosov/lib/lambda.ml @@ -15,6 +15,7 @@ let replace_name x ~by = let rec helper = function | Var y when String.equal x y -> Var by | Var t -> Var t + | Int n -> Int n | App (l, r) -> App (helper l, helper r) | Abs (y, t) when String.equal x y -> Abs (by, helper t) | Abs (z, t) -> Abs (z, helper t) @@ -31,6 +32,7 @@ let subst x ~by:v = let rec helper = function | Var y when String.equal y x -> v | Var y -> Var y + | Int n -> Int n | App (l, r) -> app (helper l) (helper r) | Abs (y, b) when String.equal y x -> abs y b | Abs (y, t) when is_free_in y v -> @@ -46,19 +48,22 @@ type strat = { on_var : strat -> name -> string Ast.t ; on_abs : strat -> name -> string Ast.t -> string Ast.t ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t + ; on_int : strat -> int -> string Ast.t } let apply_strat st = function | Var name -> st.on_var st name | Abs (x, b) -> st.on_abs st x b | App (l, r) -> st.on_app st l r + | Int n -> st.on_int st n ;; let without_strat = let on_var _ = var in let on_abs _ = abs in let on_app _ = app in - { on_var; on_abs; on_app } + let on_int _ n = Int n in + { on_var; on_abs; on_app; on_int } ;; let cbn_strat = diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli index cf56ce4f..56f550f1 100644 --- a/Krivonosov/lib/lambda.mli +++ b/Krivonosov/lib/lambda.mli @@ -17,6 +17,7 @@ type strat = { on_var : strat -> Ast.name -> string Ast.t ; on_abs : strat -> Ast.name -> string Ast.t -> string Ast.t ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t + ; on_int : strat -> int -> string Ast.t } val apply_strat : strat -> string Ast.t -> string Ast.t diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index 1130e301..01802487 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -45,14 +45,24 @@ let pp_error ppf = function | `Parsing_error s -> Format.fprintf ppf "%s" s ;; +(* Integer literal parser *) +let pinteger = + take_while1 (function + | '0' .. '9' -> true + | _ -> false) + >>| int_of_string + >>| fun n -> Ast.Int n +;; + (* Main parser using single fix point *) let pexpr = fix (fun pexpr -> - (* Atomic expressions: variables and parenthesized expressions *) + (* Atomic expressions: integers, variables and parenthesized expressions *) let patom = spaces *> choice [ char '(' *> pexpr <* char ')' <* spaces "Parentheses expected" + ; pinteger <* spaces ; (identifier <* spaces >>| fun name -> Ast.Var name) ] in diff --git a/Krivonosov/lib/tests.ml b/Krivonosov/lib/tests.ml index c5e5771a..006c95da 100644 --- a/Krivonosov/lib/tests.ml +++ b/Krivonosov/lib/tests.ml @@ -51,6 +51,7 @@ let _ = Lambda_lib.Lambda.three let _ = Lambda_lib.Lambda.two let _ = Lambda_lib.Lambda.without_strat let _ = Lambda_lib.Lambda.zero + (* parse_lam removed in new parser implementation *) let _ = Lambda_lib.Printast.pp let _ = Lambda_lib.Printast.show diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml index 4974b9db..c27b9c6d 100644 --- a/Krivonosov/lib/utils.ml +++ b/Krivonosov/lib/utils.ml @@ -15,6 +15,7 @@ let list_remove x = List.filter ~f:(fun a -> not (String.equal a x)) let free_vars = let rec helper acc = function | Var s -> s :: acc + | Int _ -> acc | Abs (s, l) -> acc @ list_remove s (helper [] l) | App (l, r) -> helper (helper acc r) l in diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index 8a377a93..079664ff 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -15,7 +15,8 @@ in the dune file Evaluated result: (λ _ . x) $ ../bin/REPL.exe -dparsetree < garbage242 - Error: : end_of_input + Parsed result: (Var garbage242) + Evaluated result: garbage242 From 865b8321bd8c2d9b021b5a6a080324d23b4280da Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Wed, 10 Dec 2025 20:09:22 +0300 Subject: [PATCH 33/42] feat: add binary operators --- Krivonosov/bin/REPL.ml | 4 +++- Krivonosov/lib/Pprintast.ml | 15 ++++++++++++ Krivonosov/lib/Printast.ml | 15 ++++++++++++ Krivonosov/lib/ast.mli | 15 ++++++++++++ Krivonosov/lib/lambda.ml | 7 +++++- Krivonosov/lib/lambda.mli | 1 + Krivonosov/lib/parser.ml | 47 +++++++++++++++++++++++++++++++++++-- Krivonosov/lib/utils.ml | 1 + 8 files changed, 101 insertions(+), 4 deletions(-) diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index 5559b3b3..91ad320f 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -23,6 +23,7 @@ include struct let rec helper = function | Var _ as l -> fin l | Int _ as l -> fin l + | BinOp (_, _, _) as l -> fin l | Abs (x, b) -> (match helper b with | WIP b2 -> wip (abs x b2) @@ -47,7 +48,8 @@ include struct let on_abs _ f x = loop (abs f x) in let on_var _ x = loop (var x) in let on_int _ n = Ast.Int n in - { Lambda.on_var; on_abs; on_app; on_int } + let on_binop _ op l r = Ast.BinOp (op, l, r) in + { Lambda.on_var; on_abs; on_app; on_int; on_binop } ;; end diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml index fd3ab301..0f3026bf 100644 --- a/Krivonosov/lib/Pprintast.ml +++ b/Krivonosov/lib/Pprintast.ml @@ -11,6 +11,20 @@ open Ast open Utils +let pp_binop fmt = function + | Add -> Format.fprintf fmt "+" + | Sub -> Format.fprintf fmt "-" + | Mul -> Format.fprintf fmt "*" + | Div -> Format.fprintf fmt "/" + | Mod -> Format.fprintf fmt "%%" + | Eq -> Format.fprintf fmt "=" + | Neq -> Format.fprintf fmt "<>" + | Lt -> Format.fprintf fmt "<" + | Gt -> Format.fprintf fmt ">" + | Leq -> Format.fprintf fmt "<=" + | Geq -> Format.fprintf fmt ">=" +;; + let pp ?(compact = true) = let open Format in let mangle t fmt x = @@ -19,6 +33,7 @@ let pp ?(compact = true) = let rec pp fmt = function | Var s -> Format.fprintf fmt "%s" s | Int n -> Format.fprintf fmt "%d" n + | BinOp (op, l, r) -> Format.fprintf fmt "(%a %a %a)" pp l pp_binop op pp r | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> if compact then Format.fprintf fmt "⊤" diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml index 2f50bc5e..407dbde2 100644 --- a/Krivonosov/lib/Printast.ml +++ b/Krivonosov/lib/Printast.ml @@ -6,11 +6,26 @@ [@@@ocaml.text "/*"] +type binop = Ast.binop = + | Add + | Sub + | Mul + | Div + | Mod + | Eq + | Neq + | Lt + | Gt + | Leq + | Geq +[@@deriving show { with_path = false }] + type 'name t = 'name Ast.t = | Var of 'name | Abs of 'name * 'name t | App of 'name t * 'name t | Int of int + | BinOp of binop * 'name t * 'name t [@@deriving show { with_path = false }] let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli index 0c31bd74..8fe2091a 100644 --- a/Krivonosov/lib/ast.mli +++ b/Krivonosov/lib/ast.mli @@ -8,9 +8,24 @@ type name = string +(** Binary operators *) +type binop = + | Add (** [+] *) + | Sub (** [-] *) + | Mul (** [*] *) + | Div (** [/] *) + | Mod (** [%] *) + | Eq (** [=] *) + | Neq (** [<>] *) + | Lt (** [<] *) + | Gt (** [>] *) + | Leq (** [<=] *) + | Geq (** [>=] *) + (** The main type for our AST (дерева абстрактного синтаксиса) *) type 'name t = | Var of 'name (** Variable [x] *) | Abs of 'name * 'name t (** Abstraction [λx.t] *) | App of 'name t * 'name t (** Application [f g ] *) | Int of int (** Integer literal [42] *) + | BinOp of binop * 'name t * 'name t (** Binary operation [e1 + e2] *) diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml index 50718dd7..1aa8b95c 100644 --- a/Krivonosov/lib/lambda.ml +++ b/Krivonosov/lib/lambda.ml @@ -16,6 +16,7 @@ let replace_name x ~by = | Var y when String.equal x y -> Var by | Var t -> Var t | Int n -> Int n + | BinOp (op, l, r) -> BinOp (op, helper l, helper r) | App (l, r) -> App (helper l, helper r) | Abs (y, t) when String.equal x y -> Abs (by, helper t) | Abs (z, t) -> Abs (z, helper t) @@ -33,6 +34,7 @@ let subst x ~by:v = | Var y when String.equal y x -> v | Var y -> Var y | Int n -> Int n + | BinOp (op, l, r) -> BinOp (op, helper l, helper r) | App (l, r) -> app (helper l) (helper r) | Abs (y, b) when String.equal y x -> abs y b | Abs (y, t) when is_free_in y v -> @@ -49,6 +51,7 @@ type strat = ; on_abs : strat -> name -> string Ast.t -> string Ast.t ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t ; on_int : strat -> int -> string Ast.t + ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t } let apply_strat st = function @@ -56,6 +59,7 @@ let apply_strat st = function | Abs (x, b) -> st.on_abs st x b | App (l, r) -> st.on_app st l r | Int n -> st.on_int st n + | BinOp (op, l, r) -> st.on_binop st op l r ;; let without_strat = @@ -63,7 +67,8 @@ let without_strat = let on_abs _ = abs in let on_app _ = app in let on_int _ n = Int n in - { on_var; on_abs; on_app; on_int } + let on_binop _ op l r = BinOp (op, l, r) in + { on_var; on_abs; on_app; on_int; on_binop } ;; let cbn_strat = diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli index 56f550f1..966ab856 100644 --- a/Krivonosov/lib/lambda.mli +++ b/Krivonosov/lib/lambda.mli @@ -18,6 +18,7 @@ type strat = ; on_abs : strat -> Ast.name -> string Ast.t -> string Ast.t ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t ; on_int : strat -> int -> string Ast.t + ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t } val apply_strat : strat -> string Ast.t -> string Ast.t diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index 01802487..ed61e5f2 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -54,6 +54,12 @@ let pinteger = >>| fun n -> Ast.Int n ;; +(* Chainl1: left-associative infix operator parser *) +let chainl1 p op = + let rec go acc = op >>= (fun f -> p >>= fun x -> go (f acc x)) <|> return acc in + p >>= go +;; + (* Main parser using single fix point *) let pexpr = fix (fun pexpr -> @@ -82,8 +88,45 @@ let pexpr = | [ x ] -> x | x :: xs -> List.fold_left (fun acc e -> Ast.App (acc, e)) x xs in - (* Top level: try lambda first, then application *) - spaces *> (plambda <|> papp) <* spaces) + (* Binary operators with precedence *) + (* Comparison operators: =, <>, <, >, <=, >= (lowest precedence) *) + let pcmp_op = + spaces + *> choice + [ string "<=" *> return (fun l r -> Ast.BinOp (Ast.Leq, l, r)) + ; string ">=" *> return (fun l r -> Ast.BinOp (Ast.Geq, l, r)) + ; string "<>" *> return (fun l r -> Ast.BinOp (Ast.Neq, l, r)) + ; char '<' *> return (fun l r -> Ast.BinOp (Ast.Lt, l, r)) + ; char '>' *> return (fun l r -> Ast.BinOp (Ast.Gt, l, r)) + ; char '=' *> return (fun l r -> Ast.BinOp (Ast.Eq, l, r)) + ] + <* spaces + in + (* Additive operators: +, - *) + let padd_op = + spaces + *> choice + [ char '+' *> return (fun l r -> Ast.BinOp (Ast.Add, l, r)) + ; char '-' *> return (fun l r -> Ast.BinOp (Ast.Sub, l, r)) + ] + <* spaces + in + (* Multiplicative operators: *, /, % (higher precedence) *) + let pmul_op = + spaces + *> choice + [ char '*' *> return (fun l r -> Ast.BinOp (Ast.Mul, l, r)) + ; char '/' *> return (fun l r -> Ast.BinOp (Ast.Div, l, r)) + ; char '%' *> return (fun l r -> Ast.BinOp (Ast.Mod, l, r)) + ] + <* spaces + in + (* Precedence levels: mul > add > cmp > app > lambda *) + let pmul = chainl1 papp pmul_op in + let padd = chainl1 pmul padd_op in + let pcmp = chainl1 padd pcmp_op in + (* Top level: try lambda first, then comparison *) + spaces *> (plambda <|> pcmp) <* spaces) ;; let parse str = diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml index c27b9c6d..6ec2b983 100644 --- a/Krivonosov/lib/utils.ml +++ b/Krivonosov/lib/utils.ml @@ -16,6 +16,7 @@ let free_vars = let rec helper acc = function | Var s -> s :: acc | Int _ -> acc + | BinOp (_, l, r) -> helper (helper acc r) l | Abs (s, l) -> acc @ list_remove s (helper [] l) | App (l, r) -> helper (helper acc r) l in From be673ff482ac6bbf1721607f9fd0157d06e83efd Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Wed, 10 Dec 2025 20:16:13 +0300 Subject: [PATCH 34/42] feat: add monadic interpreter --- Krivonosov/lib/interpret.ml | 82 ++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 10 deletions(-) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index 26eafed4..dac4c900 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -8,28 +8,90 @@ (** Real monadic interpreter goes here *) +open Base open Utils -type error = [ `UnknownVariable of string (** just for example *) ] +type error = + [ `UnknownVariable of string + | `DivisionByZero + | `TypeMismatch + ] + +(** Values in our interpreter *) +type value = + | VInt of int + | VClosure of string * string Ast.t * environment + +and environment = (string * value) list module Interpret (M : MONAD_FAIL) : sig - val run : _ Ast.t -> (int, [> error ]) M.t + val run : string Ast.t -> (value, [> error ]) M.t end = struct - let run _ = - (* TODO: implement interpreter here *) - if true then M.fail (`UnknownVariable "var") else failwith "not implemented" + open M + + (** Lookup variable in environment *) + let lookup env name = + match List.Assoc.find ~equal:String.equal env name with + | Some v -> return v + | None -> fail (`UnknownVariable name) + ;; + + (** Evaluate binary operation *) + let eval_binop op v1 v2 = + match op, v1, v2 with + | Ast.Add, VInt a, VInt b -> return (VInt (a + b)) + | Ast.Sub, VInt a, VInt b -> return (VInt (a - b)) + | Ast.Mul, VInt a, VInt b -> return (VInt (a * b)) + | Ast.Div, VInt _, VInt 0 -> fail `DivisionByZero + | Ast.Div, VInt a, VInt b -> return (VInt (a / b)) + | Ast.Mod, VInt _, VInt 0 -> fail `DivisionByZero + | Ast.Mod, VInt a, VInt b -> return (VInt (a mod b)) + | Ast.Eq, VInt a, VInt b -> return (VInt (if a = b then 1 else 0)) + | Ast.Neq, VInt a, VInt b -> return (VInt (if a <> b then 1 else 0)) + | Ast.Lt, VInt a, VInt b -> return (VInt (if a < b then 1 else 0)) + | Ast.Gt, VInt a, VInt b -> return (VInt (if a > b then 1 else 0)) + | Ast.Leq, VInt a, VInt b -> return (VInt (if a <= b then 1 else 0)) + | Ast.Geq, VInt a, VInt b -> return (VInt (if a >= b then 1 else 0)) + | _ -> fail `TypeMismatch + ;; + + (** Main evaluation function *) + let rec eval env = function + | Ast.Int n -> return (VInt n) + | Ast.Var name -> lookup env name + | Ast.Abs (param, body) -> return (VClosure (param, body, env)) + | Ast.BinOp (op, l, r) -> + eval env l >>= fun vl -> eval env r >>= fun vr -> eval_binop op vl vr + | Ast.App (f, arg) -> + eval env f + >>= (function + | VClosure (param, body, closure_env) -> + eval env arg + >>= fun varg -> + let new_env = (param, varg) :: closure_env in + eval new_env body + | _ -> fail `TypeMismatch) ;; + + let run expr = eval [] expr end let parse_and_run str = let module I = Interpret (Base.Result) in let rez = Base.Result.(Parser.parse str >>= I.run) in match rez with - | Result.Ok n -> Printf.printf "Success: %d\n" n + | Result.Ok (VInt n) -> Stdlib.Printf.printf "Success: %d\n" n + | Result.Ok (VClosure _) -> Stdlib.Printf.printf "Success: \n" | Result.Error #Parser.error -> Format.eprintf "Parsing error\n%!"; - exit 1 - | Result.Error #error -> - Format.eprintf "Interpreter error\n%!"; - exit 1 + Stdlib.exit 1 + | Result.Error (`UnknownVariable name) -> + Format.eprintf "Interpreter error: Unknown variable %s\n%!" name; + Stdlib.exit 1 + | Result.Error `DivisionByZero -> + Format.eprintf "Interpreter error: Division by zero\n%!"; + Stdlib.exit 1 + | Result.Error `TypeMismatch -> + Format.eprintf "Interpreter error: Type mismatch\n%!"; + Stdlib.exit 1 ;; From 4023bc1acac74bef6dd73ad7395efed06750deeb Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Thu, 11 Dec 2025 06:35:22 +0300 Subject: [PATCH 35/42] add if-then-else --- Krivonosov/bin/REPL.ml | 4 +++- Krivonosov/lib/Pprintast.ml | 3 +++ Krivonosov/lib/Printast.ml | 1 + Krivonosov/lib/ast.mli | 1 + Krivonosov/lib/interpret.ml | 9 +++++++++ Krivonosov/lib/lambda.ml | 7 ++++++- Krivonosov/lib/lambda.mli | 1 + Krivonosov/lib/parser.ml | 13 +++++++++++-- Krivonosov/lib/utils.ml | 6 ++++++ Krivonosov/tests/interpret_tests.t | 11 +++++++++++ 10 files changed, 52 insertions(+), 4 deletions(-) diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index 91ad320f..0c692e28 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -24,6 +24,7 @@ include struct | Var _ as l -> fin l | Int _ as l -> fin l | BinOp (_, _, _) as l -> fin l + | If (_, _, _) as l -> fin l | Abs (x, b) -> (match helper b with | WIP b2 -> wip (abs x b2) @@ -49,7 +50,8 @@ include struct let on_var _ x = loop (var x) in let on_int _ n = Ast.Int n in let on_binop _ op l r = Ast.BinOp (op, l, r) in - { Lambda.on_var; on_abs; on_app; on_int; on_binop } + let on_if _ c t e = Ast.If (c, t, e) in + { Lambda.on_var; on_abs; on_app; on_int; on_binop; on_if } ;; end diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml index 0f3026bf..71992c1c 100644 --- a/Krivonosov/lib/Pprintast.ml +++ b/Krivonosov/lib/Pprintast.ml @@ -34,6 +34,9 @@ let pp ?(compact = true) = | Var s -> Format.fprintf fmt "%s" s | Int n -> Format.fprintf fmt "%d" n | BinOp (op, l, r) -> Format.fprintf fmt "(%a %a %a)" pp l pp_binop op pp r + | If (cond, then_br, None) -> Format.fprintf fmt "(if %a then %a)" pp cond pp then_br + | If (cond, then_br, Some else_br) -> + Format.fprintf fmt "(if %a then %a else %a)" pp cond pp then_br pp else_br | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> if compact then Format.fprintf fmt "⊤" diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml index 407dbde2..2b09db28 100644 --- a/Krivonosov/lib/Printast.ml +++ b/Krivonosov/lib/Printast.ml @@ -26,6 +26,7 @@ type 'name t = 'name Ast.t = | App of 'name t * 'name t | Int of int | BinOp of binop * 'name t * 'name t + | If of 'name t * 'name t * 'name t option [@@deriving show { with_path = false }] let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli index 8fe2091a..1aa45766 100644 --- a/Krivonosov/lib/ast.mli +++ b/Krivonosov/lib/ast.mli @@ -29,3 +29,4 @@ type 'name t = | App of 'name t * 'name t (** Application [f g ] *) | Int of int (** Integer literal [42] *) | BinOp of binop * 'name t * 'name t (** Binary operation [e1 + e2] *) + | If of 'name t * 'name t * 'name t option (** Conditional [if cond then e1 else e2] *) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index dac4c900..59e55ccb 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -62,6 +62,15 @@ end = struct | Ast.Abs (param, body) -> return (VClosure (param, body, env)) | Ast.BinOp (op, l, r) -> eval env l >>= fun vl -> eval env r >>= fun vr -> eval_binop op vl vr + | Ast.If (cond, then_branch, else_branch_opt) -> + eval env cond + >>= (function + | VInt 0 -> + (match else_branch_opt with + | Some else_branch -> eval env else_branch + | None -> return (VInt 0)) + | VInt _ -> eval env then_branch + | _ -> fail `TypeMismatch) | Ast.App (f, arg) -> eval env f >>= (function diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml index 1aa8b95c..c6175311 100644 --- a/Krivonosov/lib/lambda.ml +++ b/Krivonosov/lib/lambda.ml @@ -17,6 +17,7 @@ let replace_name x ~by = | Var t -> Var t | Int n -> Int n | BinOp (op, l, r) -> BinOp (op, helper l, helper r) + | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) | App (l, r) -> App (helper l, helper r) | Abs (y, t) when String.equal x y -> Abs (by, helper t) | Abs (z, t) -> Abs (z, helper t) @@ -35,6 +36,7 @@ let subst x ~by:v = | Var y -> Var y | Int n -> Int n | BinOp (op, l, r) -> BinOp (op, helper l, helper r) + | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) | App (l, r) -> app (helper l) (helper r) | Abs (y, b) when String.equal y x -> abs y b | Abs (y, t) when is_free_in y v -> @@ -52,6 +54,7 @@ type strat = ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t ; on_int : strat -> int -> string Ast.t ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t + ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t } let apply_strat st = function @@ -60,6 +63,7 @@ let apply_strat st = function | App (l, r) -> st.on_app st l r | Int n -> st.on_int st n | BinOp (op, l, r) -> st.on_binop st op l r + | If (c, t, e) -> st.on_if st c t e ;; let without_strat = @@ -68,7 +72,8 @@ let without_strat = let on_app _ = app in let on_int _ n = Int n in let on_binop _ op l r = BinOp (op, l, r) in - { on_var; on_abs; on_app; on_int; on_binop } + let on_if _ c t e = If (c, t, e) in + { on_var; on_abs; on_app; on_int; on_binop; on_if } ;; let cbn_strat = diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli index 966ab856..096ef8b7 100644 --- a/Krivonosov/lib/lambda.mli +++ b/Krivonosov/lib/lambda.mli @@ -19,6 +19,7 @@ type strat = ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t ; on_int : strat -> int -> string Ast.t ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t + ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t } val apply_strat : strat -> string Ast.t -> string Ast.t diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index ed61e5f2..dd579fe4 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -80,6 +80,15 @@ let pexpr = <* spaces >>= fun param -> pexpr >>| fun body -> Ast.Abs (param, body) in + (* If-then-else expression *) + let pif = + string "if" *> spaces *> pexpr + >>= fun cond -> + spaces *> string "then" *> spaces *> pexpr + >>= fun then_branch -> + option None (spaces *> string "else" *> spaces *> pexpr >>| Option.some) + >>| fun else_branch -> Ast.If (cond, then_branch, else_branch) + in (* Application: sequence of atoms *) let papp = many1 patom @@ -125,8 +134,8 @@ let pexpr = let pmul = chainl1 papp pmul_op in let padd = chainl1 pmul padd_op in let pcmp = chainl1 padd pcmp_op in - (* Top level: try lambda first, then comparison *) - spaces *> (plambda <|> pcmp) <* spaces) + (* Top level: try if, lambda first, then comparison *) + spaces *> choice [ pif; plambda; pcmp ] <* spaces) ;; let parse str = diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml index 6ec2b983..7e75ef54 100644 --- a/Krivonosov/lib/utils.ml +++ b/Krivonosov/lib/utils.ml @@ -17,6 +17,12 @@ let free_vars = | Var s -> s :: acc | Int _ -> acc | BinOp (_, l, r) -> helper (helper acc r) l + | If (c, t, e) -> + let acc = helper acc c in + let acc = helper acc t in + (match e with + | None -> acc + | Some e -> helper acc e) | Abs (s, l) -> acc @ list_remove s (helper [] l) | App (l, r) -> helper (helper acc r) l in diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index 079664ff..aa8e0fb5 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -73,3 +73,14 @@ For 3! we use noral order reduction (((λ f . ((λ x . (f (x x))) (λ x . (f (x x))))) (λ s . (λ n . ((((λ n . ((n (λ x . (λ x . (λ y . y)))) (λ x . (λ y . x)))) n) (λ f . (λ x . (f x)))) (((λ x . (λ y . (λ z . (x (y z))))) (s ((λ n . (λ f . (λ x . (((n (λ g . (λ h . (h (g f))))) (λ u . x)) (λ u . u))))) n))) n))))) (λ f . (λ x . (f (f (f x)))))) $ ../bin/REPL.exe -no < lam_fac3.txt Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) + +If-then-else tests +Test parsing if-then-else + $ ../bin/REPL.exe -dparsetree -stop-after parsing < if 1 then 5 else 10 + Parsed result: (If ((Int 1), (Int 5), (Some (Int 10)))) + +Test parsing if-then without else + $ ../bin/REPL.exe -dparsetree -stop-after parsing < if 0 then 100 + Parsed result: (If ((Int 0), (Int 100), None)) From 64fcb600674b8a3874a21d6517ccafa3df6f6967 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Thu, 11 Dec 2025 06:49:16 +0300 Subject: [PATCH 36/42] feat: add let bindings --- Krivonosov/bin/REPL.ml | 4 +++- Krivonosov/lib/Pprintast.ml | 4 ++++ Krivonosov/lib/Printast.ml | 1 + Krivonosov/lib/ast.mli | 2 ++ Krivonosov/lib/interpret.ml | 20 ++++++++++++++++++++ Krivonosov/lib/lambda.ml | 11 ++++++++++- Krivonosov/lib/lambda.mli | 1 + Krivonosov/lib/parser.ml | 18 ++++++++++++++++-- Krivonosov/lib/utils.ml | 3 +++ Krivonosov/tests/interpret_tests.t | 20 ++++++++++++++++++++ 10 files changed, 80 insertions(+), 4 deletions(-) diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index 0c692e28..b8c9e888 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -25,6 +25,7 @@ include struct | Int _ as l -> fin l | BinOp (_, _, _) as l -> fin l | If (_, _, _) as l -> fin l + | Let (_, _, _, _) as l -> fin l | Abs (x, b) -> (match helper b with | WIP b2 -> wip (abs x b2) @@ -51,7 +52,8 @@ include struct let on_int _ n = Ast.Int n in let on_binop _ op l r = Ast.BinOp (op, l, r) in let on_if _ c t e = Ast.If (c, t, e) in - { Lambda.on_var; on_abs; on_app; on_int; on_binop; on_if } + let on_let _ is_rec name binding body = Ast.Let (is_rec, name, binding, body) in + { Lambda.on_var; on_abs; on_app; on_int; on_binop; on_if; on_let } ;; end diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml index 71992c1c..8a666c36 100644 --- a/Krivonosov/lib/Pprintast.ml +++ b/Krivonosov/lib/Pprintast.ml @@ -37,6 +37,10 @@ let pp ?(compact = true) = | If (cond, then_br, None) -> Format.fprintf fmt "(if %a then %a)" pp cond pp then_br | If (cond, then_br, Some else_br) -> Format.fprintf fmt "(if %a then %a else %a)" pp cond pp then_br pp else_br + | Let (is_rec, name, binding, body) -> + if is_rec + then Format.fprintf fmt "(let rec %s = %a in %a)" name pp binding pp body + else Format.fprintf fmt "(let %s = %a in %a)" name pp binding pp body | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> if compact then Format.fprintf fmt "⊤" diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml index 2b09db28..5e0600e1 100644 --- a/Krivonosov/lib/Printast.ml +++ b/Krivonosov/lib/Printast.ml @@ -27,6 +27,7 @@ type 'name t = 'name Ast.t = | Int of int | BinOp of binop * 'name t * 'name t | If of 'name t * 'name t * 'name t option + | Let of bool * 'name * 'name t * 'name t [@@deriving show { with_path = false }] let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli index 1aa45766..07d57101 100644 --- a/Krivonosov/lib/ast.mli +++ b/Krivonosov/lib/ast.mli @@ -30,3 +30,5 @@ type 'name t = | Int of int (** Integer literal [42] *) | BinOp of binop * 'name t * 'name t (** Binary operation [e1 + e2] *) | If of 'name t * 'name t * 'name t option (** Conditional [if cond then e1 else e2] *) + | Let of bool * 'name * 'name t * 'name t + (** Let binding [let (rec) x = e1 in e2]. bool indicates recursion *) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index 59e55ccb..937ec04e 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -71,6 +71,26 @@ end = struct | None -> return (VInt 0)) | VInt _ -> eval env then_branch | _ -> fail `TypeMismatch) + | Ast.Let (is_rec, name, binding, body) -> + if is_rec + then ( + (* For recursive let, create environment with self-reference *) + match binding with + | Ast.Abs (param, func_body) -> + (* Create closure with recursive environment *) + let rec new_env = (name, VClosure (param, func_body, new_env)) :: env in + eval new_env body + | _ -> + (* Non-function recursive bindings not supported yet *) + eval env binding + >>= fun value -> + let new_env = (name, value) :: env in + eval new_env body) + else + eval env binding + >>= fun value -> + let new_env = (name, value) :: env in + eval new_env body | Ast.App (f, arg) -> eval env f >>= (function diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml index c6175311..f36f3a11 100644 --- a/Krivonosov/lib/lambda.ml +++ b/Krivonosov/lib/lambda.ml @@ -18,6 +18,8 @@ let replace_name x ~by = | Int n -> Int n | BinOp (op, l, r) -> BinOp (op, helper l, helper r) | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) + | Let (is_rec, name, binding, body) -> + Let (is_rec, (if String.equal name x then by else name), helper binding, helper body) | App (l, r) -> App (helper l, helper r) | Abs (y, t) when String.equal x y -> Abs (by, helper t) | Abs (z, t) -> Abs (z, helper t) @@ -37,6 +39,10 @@ let subst x ~by:v = | Int n -> Int n | BinOp (op, l, r) -> BinOp (op, helper l, helper r) | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) + | Let (is_rec, name, binding, body) when String.equal name x -> + (* Don't substitute in body if name shadows x *) + Let (is_rec, name, helper binding, body) + | Let (is_rec, name, binding, body) -> Let (is_rec, name, helper binding, helper body) | App (l, r) -> app (helper l) (helper r) | Abs (y, b) when String.equal y x -> abs y b | Abs (y, t) when is_free_in y v -> @@ -55,6 +61,7 @@ type strat = ; on_int : strat -> int -> string Ast.t ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t + ; on_let : strat -> bool -> name -> string Ast.t -> string Ast.t -> string Ast.t } let apply_strat st = function @@ -64,6 +71,7 @@ let apply_strat st = function | Int n -> st.on_int st n | BinOp (op, l, r) -> st.on_binop st op l r | If (c, t, e) -> st.on_if st c t e + | Let (is_rec, name, binding, body) -> st.on_let st is_rec name binding body ;; let without_strat = @@ -73,7 +81,8 @@ let without_strat = let on_int _ n = Int n in let on_binop _ op l r = BinOp (op, l, r) in let on_if _ c t e = If (c, t, e) in - { on_var; on_abs; on_app; on_int; on_binop; on_if } + let on_let _ is_rec name binding body = Let (is_rec, name, binding, body) in + { on_var; on_abs; on_app; on_int; on_binop; on_if; on_let } ;; let cbn_strat = diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli index 096ef8b7..7e8faba0 100644 --- a/Krivonosov/lib/lambda.mli +++ b/Krivonosov/lib/lambda.mli @@ -20,6 +20,7 @@ type strat = ; on_int : strat -> int -> string Ast.t ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t + ; on_let : strat -> bool -> Ast.name -> string Ast.t -> string Ast.t -> string Ast.t } val apply_strat : strat -> string Ast.t -> string Ast.t diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index dd579fe4..47ac6280 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -89,6 +89,20 @@ let pexpr = option None (spaces *> string "else" *> spaces *> pexpr >>| Option.some) >>| fun else_branch -> Ast.If (cond, then_branch, else_branch) in + (* Let expression *) + let plet = + string "let" *> spaces *> option false (string "rec" *> spaces *> return true) + >>= fun is_rec -> + identifier + <* spaces + <* char '=' + <* spaces + >>= fun name -> + pexpr + >>= fun binding -> + spaces *> string "in" *> spaces *> pexpr + >>| fun body -> Ast.Let (is_rec, name, binding, body) + in (* Application: sequence of atoms *) let papp = many1 patom @@ -134,8 +148,8 @@ let pexpr = let pmul = chainl1 papp pmul_op in let padd = chainl1 pmul padd_op in let pcmp = chainl1 padd pcmp_op in - (* Top level: try if, lambda first, then comparison *) - spaces *> choice [ pif; plambda; pcmp ] <* spaces) + (* Top level: try let, if, lambda first, then comparison *) + spaces *> choice [ plet; pif; plambda; pcmp ] <* spaces) ;; let parse str = diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml index 7e75ef54..81cb1ade 100644 --- a/Krivonosov/lib/utils.ml +++ b/Krivonosov/lib/utils.ml @@ -23,6 +23,9 @@ let free_vars = (match e with | None -> acc | Some e -> helper acc e) + | Let (_, name, binding, body) -> + let acc = helper acc binding in + acc @ list_remove name (helper [] body) | Abs (s, l) -> acc @ list_remove s (helper [] l) | App (l, r) -> helper (helper acc r) l in diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index aa8e0fb5..f83c6188 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -84,3 +84,23 @@ Test parsing if-then without else $ ../bin/REPL.exe -dparsetree -stop-after parsing < if 0 then 100 Parsed result: (If ((Int 0), (Int 100), None)) + +Let-binding tests +Test parsing simple let + $ ../bin/REPL.exe -dparsetree -stop-after parsing < let x = 5 in x + 3 + Parsed result: (Let (false, x, (Int 5), (BinOp (Add, (Var x), (Int 3))))) + +Test parsing nested let + $ ../bin/REPL.exe -dparsetree -stop-after parsing < let x = 10 in let y = 20 in x + y + Parsed result: (Let (false, x, (Int 10), + (Let (false, y, (Int 20), (BinOp (Add, (Var x), (Var y))))) + )) + +Test parsing let rec + $ ../bin/REPL.exe -dparsetree -stop-after parsing < let rec fact = \n. if n then n else 1 in fact 5 + Parsed result: (Let (true, fact, + (Abs (n, (If ((Var n), (Var n), (Some (Int 1)))))), + (App ((Var fact), (Int 5))))) From 7e476c299d294aa21eb02f1c3a998d8a323b3c2f Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Thu, 11 Dec 2025 07:16:46 +0300 Subject: [PATCH 37/42] feat: implement fix combinator as built-in function --- Krivonosov/lib/interpret.ml | 56 +++++++++++++++++++++++++++++++++---- Krivonosov/lib/parser.ml | 2 +- Krivonosov/lib/tests.ml | 25 +++++++++++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index 937ec04e..775ed920 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -21,11 +21,12 @@ type error = type value = | VInt of int | VClosure of string * string Ast.t * environment + | VBuiltin of string * (value -> (value, error) Base.Result.t) and environment = (string * value) list module Interpret (M : MONAD_FAIL) : sig - val run : string Ast.t -> (value, [> error ]) M.t + val run : string Ast.t -> (value, error) M.t end = struct open M @@ -99,20 +100,65 @@ end = struct >>= fun varg -> let new_env = (param, varg) :: closure_env in eval new_env body + | VBuiltin (_, builtin_fn) -> + eval env arg + >>= fun varg -> + (match builtin_fn varg with + | Base.Result.Ok v -> return v + | Base.Result.Error e -> fail e) | _ -> fail `TypeMismatch) ;; - let run expr = eval [] expr + (** Create initial environment with built-in functions *) + let initial_env () = + (* Implementation of fix combinator for CBV (Call-By-Value). + + For a function f = λrec_fn. λarg. ...body... + We want: fix f = λarg. ...body[rec_fn := fix f]... + + The implementation mirrors let rec: + We create a cyclic closure where the inner function has access to itself + through the environment. *) + let fix_builtin = + VBuiltin + ( "fix" + , fun f_val -> + match f_val with + | VClosure (rec_param, inner_fn, f_env) -> + (* f is λrec_param. inner_fn + We need to evaluate inner_fn with rec_param bound to the result itself *) + (match inner_fn with + | Ast.Abs (param, body) -> + (* inner_fn = λparam.body + Result should be: λparam. body with rec_param bound to result *) + let rec result = VClosure (param, body, (rec_param, result) :: f_env) in + Base.Result.Ok result + | _ -> + (* If inner_fn is not a lambda, we can't properly implement fix *) + Base.Result.Error (`TypeMismatch : [> error ])) + | _ -> Base.Result.Error (`TypeMismatch : [> error ]) ) + in + [ "fix", fix_builtin ] + ;; + + let run expr = eval (initial_env ()) expr end let parse_and_run str = let module I = Interpret (Base.Result) in - let rez = Base.Result.(Parser.parse str >>= I.run) in + let open Base.Result in + let rez = + Parser.parse str + >>= fun ast -> + I.run ast |> Result.map_error ~f:(fun e -> (e :> [ Parser.error | error ])) + in match rez with | Result.Ok (VInt n) -> Stdlib.Printf.printf "Success: %d\n" n | Result.Ok (VClosure _) -> Stdlib.Printf.printf "Success: \n" - | Result.Error #Parser.error -> - Format.eprintf "Parsing error\n%!"; + | Result.Ok (VBuiltin (name, _)) -> Stdlib.Printf.printf "Success: \n" name + | Result.Error (#Parser.error as e) -> + (match e with + | `Parsing_error msg -> Format.eprintf "Parsing error: %s\n%!" msg); Stdlib.exit 1 | Result.Error (`UnknownVariable name) -> Format.eprintf "Interpreter error: Unknown variable %s\n%!" name; diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index 47ac6280..af86003f 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -13,7 +13,7 @@ let spaces = skip_while is_space (* Keyword filtering *) let is_keyword = function - | "let" | "rec" | "if" | "then" | "else" | "in" | "fun" | "fix" -> true + | "let" | "rec" | "if" | "then" | "else" | "in" | "fun" -> true | _ -> false ;; diff --git a/Krivonosov/lib/tests.ml b/Krivonosov/lib/tests.ml index 006c95da..6ba485ff 100644 --- a/Krivonosov/lib/tests.ml +++ b/Krivonosov/lib/tests.ml @@ -43,6 +43,31 @@ let%expect_test _ = [%expect {| (Abs (f, (Abs (x, (App ((Var f), (App ((Var x), (Var x))))))))) |}] ;; +(* Tests for fix combinator *) +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "fix"); + [%expect {| (Var fix) |}] +;; + +let%expect_test _ = + Format.printf + "%a" + pp + (parse_optimistically "fix (\\f. \\n. if n <= 1 then 1 else n * f (n - 1))"); + [%expect + {| + (App ((Var fix), + (Abs (f, + (Abs (n, + (If ((BinOp (Leq, (Var n), (Int 1))), (Int 1), + (Some (BinOp (Mul, (Var n), + (App ((Var f), (BinOp (Sub, (Var n), (Int 1)))))))) + )) + )) + )) + )) |}] +;; + let _ = Lambda_lib.Interpret.parse_and_run let _ = Lambda_lib.Lambda.a let _ = Lambda_lib.Lambda.one From 707d2eb91ddb97abef2941c31379434add05ae7f Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Sat, 20 Dec 2025 12:31:23 +0300 Subject: [PATCH 38/42] chore structure and interpreter --- Krivonosov/bin/REPL.ml | 63 ++++++++++--- Krivonosov/bin/repl.t | 12 --- Krivonosov/lib/dune | 10 -- Krivonosov/lib/interpret.ml | 77 +++++++++------ Krivonosov/lib/interpret.mli | 21 +++++ Krivonosov/lib/parser.ml | 31 +++++- Krivonosov/lib/tests.ml | 82 ---------------- Krivonosov/tests/dune | 10 ++ Krivonosov/tests/interpret_tests.t | 131 +++++++++++++++++++++++++- Krivonosov/tests/tests.ml | 141 ++++++++++++++++++++++++++++ Krivonosov/{lib => tests}/tests.mli | 0 11 files changed, 425 insertions(+), 153 deletions(-) delete mode 100644 Krivonosov/bin/repl.t delete mode 100644 Krivonosov/lib/tests.ml create mode 100644 Krivonosov/tests/tests.ml rename Krivonosov/{lib => tests}/tests.mli (100%) diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index b8c9e888..08c582c1 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -75,6 +75,8 @@ type opts = { mutable dump_parsetree : bool ; mutable mode : strategy_kind * strategy ; mutable stop_after : stop_after + ; mutable use_interpreter : bool + ; mutable max_steps : int } let big_step_evaluator = function @@ -84,7 +86,7 @@ let big_step_evaluator = function | CBV -> Lambda.cbv_strat ;; -let run_single dump_parsetree stop_after eval = +let run_single dump_parsetree stop_after use_interpreter max_steps eval = let text = In_channel.(input_all stdin) |> String.trim in let ast = Parser.parse text in match ast with @@ -94,15 +96,42 @@ let run_single dump_parsetree stop_after eval = (match stop_after with | SA_parsing -> () | SA_never -> - let rez = eval ast in - Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez) + if use_interpreter + then ( + (* Use monadic interpreter *) + match Interpret.eval_expr ~max_steps ast with + | Base.Result.Ok (Interpret.VInt n) -> Format.printf "Evaluated result: %d\n%!" n + | Base.Result.Ok (Interpret.VClosure _) -> + Format.printf "Evaluated result: \n%!" + | Base.Result.Ok (Interpret.VBuiltin (name, _)) -> + Format.printf "Evaluated result: \n%!" name + | Base.Result.Ok Interpret.VUnit -> Format.printf "Evaluated result: ()\n%!" + | Base.Result.Error (`UnknownVariable name) -> + Format.printf "Error: Unknown variable %s\n%!" name + | Base.Result.Error `DivisionByZero -> + Format.printf "Error: Division by zero\n%!" + | Base.Result.Error `TypeMismatch -> Format.printf "Error: Type mismatch\n%!" + | Base.Result.Error `StepLimitExceeded -> + Format.printf "Error: Step limit exceeded (max %d steps)\n%!" max_steps) + else ( + (* Use old lambda reduction *) + let rez = eval ast in + Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez)) ;; let () = - let opts = { dump_parsetree = false; mode = Big_step, NO; stop_after = SA_never } in + let opts = + { dump_parsetree = false + ; mode = Big_step, NO + ; stop_after = SA_never + ; use_interpreter = true + ; max_steps = 10000 + } + in let pick_strategy stra () = let kind, _ = opts.mode in - opts.mode <- kind, stra + opts.mode <- kind, stra; + opts.use_interpreter <- false in let pick_step step () = let _, stra = opts.mode in @@ -130,18 +159,26 @@ let () = | "parsing" -> opts.stop_after <- SA_parsing | _ -> failwith "Bad argument of -stop-after") , "" ) + ; ( "-max-steps" + , Int (fun n -> opts.max_steps <- n) + , "Maximum number of evaluation steps (default: 10000)" ) ] (fun _ -> Stdlib.Format.eprintf "Positioned arguments are not supported\n"; Stdlib.exit 1) "Read-Eval-Print-Loop for Utyped Lambda Calculus" in - run_single opts.dump_parsetree opts.stop_after (fun ast -> - let stra = - match opts.mode with - | Big_step, stra -> big_step_evaluator stra - | Small_step, AO -> ao_small_step_strat - | _ -> raise (Failure "Implement it yourself") - in - Lambda.apply_strat stra ast) + run_single + opts.dump_parsetree + opts.stop_after + opts.use_interpreter + opts.max_steps + (fun ast -> + let stra = + match opts.mode with + | Big_step, stra -> big_step_evaluator stra + | Small_step, AO -> ao_small_step_strat + | _ -> raise (Failure "Implement it yourself") + in + Lambda.apply_strat stra ast) ;; diff --git a/Krivonosov/bin/repl.t b/Krivonosov/bin/repl.t deleted file mode 100644 index 35b4916c..00000000 --- a/Krivonosov/bin/repl.t +++ /dev/null @@ -1,12 +0,0 @@ - - $ ./REPL.exe -help - Read-Eval-Print-Loop for Utyped Lambda Calculus - -cbv Call-by-value strategy - -cbn Call-by-name strategy - -no Normal Order strategy - -ao Applicative Order strategy - -small Small-step strategy kind (default is big-step) - -big Small-step strategy kind (default is big-step) - -dparsetree Dump parse tree, don't eval enything - -help Display this list of options - --help Display this list of options diff --git a/Krivonosov/lib/dune b/Krivonosov/lib/dune index c50f72d6..80ffceeb 100644 --- a/Krivonosov/lib/dune +++ b/Krivonosov/lib/dune @@ -8,13 +8,3 @@ (pps ppx_deriving.show)) (instrumentation (backend bisect_ppx))) - -(library - (name tests) - (modules tests) - (libraries lambda_lib) - (preprocess - (pps ppx_expect ppx_deriving.show)) - (instrumentation - (backend bisect_ppx)) - (inline_tests)) diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index 775ed920..014c19b8 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -15,6 +15,7 @@ type error = [ `UnknownVariable of string | `DivisionByZero | `TypeMismatch + | `StepLimitExceeded ] (** Values in our interpreter *) @@ -22,14 +23,26 @@ type value = | VInt of int | VClosure of string * string Ast.t * environment | VBuiltin of string * (value -> (value, error) Base.Result.t) + | VUnit and environment = (string * value) list module Interpret (M : MONAD_FAIL) : sig - val run : string Ast.t -> (value, error) M.t + val run : max_steps:int -> string Ast.t -> (value, error) M.t end = struct open M + (** Step counter to prevent infinite loops *) + let step_counter = ref 0 + + let max_steps_limit = ref 10000 + + (** Increment step counter and check limit *) + let check_step () = + step_counter := !step_counter + 1; + if !step_counter > !max_steps_limit then fail `StepLimitExceeded else return () + ;; + (** Lookup variable in environment *) let lookup env name = match List.Assoc.find ~equal:String.equal env name with @@ -57,7 +70,10 @@ end = struct ;; (** Main evaluation function *) - let rec eval env = function + let rec eval env expr = + check_step () + >>= fun () -> + match expr with | Ast.Int n -> return (VInt n) | Ast.Var name -> lookup env name | Ast.Abs (param, body) -> return (VClosure (param, body, env)) @@ -111,51 +127,49 @@ end = struct (** Create initial environment with built-in functions *) let initial_env () = - (* Implementation of fix combinator for CBV (Call-By-Value). - - For a function f = λrec_fn. λarg. ...body... - We want: fix f = λarg. ...body[rec_fn := fix f]... - - The implementation mirrors let rec: - We create a cyclic closure where the inner function has access to itself - through the environment. *) - let fix_builtin = + (* Print function: prints a value and returns unit *) + let print_builtin = VBuiltin - ( "fix" - , fun f_val -> - match f_val with - | VClosure (rec_param, inner_fn, f_env) -> - (* f is λrec_param. inner_fn - We need to evaluate inner_fn with rec_param bound to the result itself *) - (match inner_fn with - | Ast.Abs (param, body) -> - (* inner_fn = λparam.body - Result should be: λparam. body with rec_param bound to result *) - let rec result = VClosure (param, body, (rec_param, result) :: f_env) in - Base.Result.Ok result - | _ -> - (* If inner_fn is not a lambda, we can't properly implement fix *) - Base.Result.Error (`TypeMismatch : [> error ])) - | _ -> Base.Result.Error (`TypeMismatch : [> error ]) ) + ( "print" + , fun v -> + (match v with + | VInt n -> Stdlib.Printf.printf "%d\n%!" n + | VClosure _ -> Stdlib.Printf.printf "\n%!" + | VBuiltin (name, _) -> Stdlib.Printf.printf "\n%!" name + | VUnit -> Stdlib.Printf.printf "()\n%!"); + Base.Result.Ok VUnit ) in - [ "fix", fix_builtin ] + [ "print", print_builtin ] ;; - let run expr = eval (initial_env ()) expr + let run ~max_steps expr = + (* Reset and set step limit *) + step_counter := 0; + max_steps_limit := max_steps; + eval (initial_env ()) expr + ;; end +(** Public function to evaluate an AST expression *) +let eval_expr ?(max_steps = 10000) ast = + let module I = Interpret (Base.Result) in + I.run ~max_steps ast +;; + let parse_and_run str = let module I = Interpret (Base.Result) in let open Base.Result in let rez = Parser.parse str >>= fun ast -> - I.run ast |> Result.map_error ~f:(fun e -> (e :> [ Parser.error | error ])) + I.run ~max_steps:10000 ast + |> Result.map_error ~f:(fun e -> (e :> [ Parser.error | error ])) in match rez with | Result.Ok (VInt n) -> Stdlib.Printf.printf "Success: %d\n" n | Result.Ok (VClosure _) -> Stdlib.Printf.printf "Success: \n" | Result.Ok (VBuiltin (name, _)) -> Stdlib.Printf.printf "Success: \n" name + | Result.Ok VUnit -> Stdlib.Printf.printf "Success: ()\n" | Result.Error (#Parser.error as e) -> (match e with | `Parsing_error msg -> Format.eprintf "Parsing error: %s\n%!" msg); @@ -169,4 +183,7 @@ let parse_and_run str = | Result.Error `TypeMismatch -> Format.eprintf "Interpreter error: Type mismatch\n%!"; Stdlib.exit 1 + | Result.Error `StepLimitExceeded -> + Format.eprintf "Interpreter error: Step limit exceeded\n%!"; + Stdlib.exit 1 ;; diff --git a/Krivonosov/lib/interpret.mli b/Krivonosov/lib/interpret.mli index 8575e8ab..66a5c5dd 100644 --- a/Krivonosov/lib/interpret.mli +++ b/Krivonosov/lib/interpret.mli @@ -6,4 +6,25 @@ [@@@ocaml.text "/*"] +(** Error types for interpreter *) +type error = + [ `UnknownVariable of string + | `DivisionByZero + | `TypeMismatch + | `StepLimitExceeded + ] + +(** Values in our interpreter *) +type value = + | VInt of int + | VClosure of string * string Ast.t * environment + | VBuiltin of string * (value -> (value, error) Base.Result.t) + | VUnit + +and environment = (string * value) list + +(** Evaluate an AST expression with optional step limit *) +val eval_expr : ?max_steps:int -> string Ast.t -> (value, error) Base.Result.t + +(** Parse and run a string (for testing) *) val parse_and_run : string -> unit diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index af86003f..082c1701 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -74,11 +74,32 @@ let pexpr = in (* Lambda abstractions *) let plambda = - (string "λ" <|> string "\\") *> spaces *> identifier - <* spaces - <* (char '.' <|> string "->" *> return ' ') - <* spaces - >>= fun param -> pexpr >>| fun body -> Ast.Abs (param, body) + choice + [ (* fun x y z -> body syntax sugar (multi-parameter) *) + (string "fun" *> spaces *> many1 (identifier <* spaces) + <* string "->" + <* spaces + >>= fun params -> + pexpr + >>| fun body -> + (* Desugar: fun x y z -> body becomes fun x -> fun y -> fun z -> body *) + List.fold_right (fun param acc -> Ast.Abs (param, acc)) params body) + ; (* λ x y z -> body syntax sugar (multi-parameter) *) + ((string "λ" <|> string "\\") *> spaces *> many1 (identifier <* spaces) + <* string "->" + <* spaces + >>= fun params -> + pexpr + >>| fun body -> + (* Desugar: λ x y z -> body becomes λx.λy.λz.body *) + List.fold_right (fun param acc -> Ast.Abs (param, acc)) params body) + ; (* λx. body or \x. body (single parameter with dot) *) + ((string "λ" <|> string "\\") *> spaces *> identifier + <* spaces + <* char '.' + <* spaces + >>= fun param -> pexpr >>| fun body -> Ast.Abs (param, body)) + ] in (* If-then-else expression *) let pif = diff --git a/Krivonosov/lib/tests.ml b/Krivonosov/lib/tests.ml deleted file mode 100644 index 6ba485ff..00000000 --- a/Krivonosov/lib/tests.ml +++ /dev/null @@ -1,82 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(** ***** UNIT TESTS COULD GO HERE (JUST AN EXAMPLE) *) -let rec fact n = if n = 1 then 1 else n * fact (n - 1) - -let%test _ = fact 5 = 120 - -(* These is a simple unit test that tests a single function 'fact' - If you want to test something large, like interpretation of a piece - of a minilanguge, it is not longer a unit tests but an integration test. - Read about dune's cram tests and put the test into `demos/somefile.t`. -*) - -open Lambda_lib -open Parser - -let parse_optimistically str = Result.get_ok (parse str) -let pp = Printast.pp_named - -let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "x y"); - [%expect {| (App ((Var x), (Var y))) |}] -;; - -let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(x y)"); - [%expect {| (App ((Var x), (Var y))) |}] -;; - -let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(\\x . x x)"); - [%expect {| (Abs (x, (App ((Var x), (Var x))))) |}] -;; - -let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(λf.λx. f (x x))"); - [%expect {| (Abs (f, (Abs (x, (App ((Var f), (App ((Var x), (Var x))))))))) |}] -;; - -(* Tests for fix combinator *) -let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "fix"); - [%expect {| (Var fix) |}] -;; - -let%expect_test _ = - Format.printf - "%a" - pp - (parse_optimistically "fix (\\f. \\n. if n <= 1 then 1 else n * f (n - 1))"); - [%expect - {| - (App ((Var fix), - (Abs (f, - (Abs (n, - (If ((BinOp (Leq, (Var n), (Int 1))), (Int 1), - (Some (BinOp (Mul, (Var n), - (App ((Var f), (BinOp (Sub, (Var n), (Int 1)))))))) - )) - )) - )) - )) |}] -;; - -let _ = Lambda_lib.Interpret.parse_and_run -let _ = Lambda_lib.Lambda.a -let _ = Lambda_lib.Lambda.one -let _ = Lambda_lib.Lambda.p -let _ = Lambda_lib.Lambda.three -let _ = Lambda_lib.Lambda.two -let _ = Lambda_lib.Lambda.without_strat -let _ = Lambda_lib.Lambda.zero - -(* parse_lam removed in new parser implementation *) -let _ = Lambda_lib.Printast.pp -let _ = Lambda_lib.Printast.show diff --git a/Krivonosov/tests/dune b/Krivonosov/tests/dune index 31780410..97361172 100644 --- a/Krivonosov/tests/dune +++ b/Krivonosov/tests/dune @@ -29,3 +29,13 @@ lam_3x2.txt lam_fac3.txt ../bin/REPL.exe)) + +(library + (name tests) + (modules tests) + (libraries lambda_lib) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx)) + (inline_tests)) diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index f83c6188..f2822f7d 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -16,7 +16,7 @@ in the dune file $ ../bin/REPL.exe -dparsetree < garbage242 Parsed result: (Var garbage242) - Evaluated result: garbage242 + Error: Unknown variable garbage242 @@ -104,3 +104,132 @@ Test parsing let rec Parsed result: (Let (true, fact, (Abs (n, (If ((Var n), (Var n), (Some (Int 1)))))), (App ((Var fact), (Int 5))))) + +Interpreter tests +================= + +Basic arithmetic + $ ../bin/REPL.exe < 2 + 3 + Evaluated result: 5 + $ ../bin/REPL.exe < 10 - 4 + Evaluated result: 6 + $ ../bin/REPL.exe < 3 * 4 + Evaluated result: 12 + $ ../bin/REPL.exe < 15 / 3 + Evaluated result: 5 + $ ../bin/REPL.exe < 17 % 5 + Evaluated result: 2 + +Comparison operators + $ ../bin/REPL.exe < 5 = 5 + Evaluated result: 1 + $ ../bin/REPL.exe < 5 = 3 + Evaluated result: 0 + $ ../bin/REPL.exe < 3 < 5 + Evaluated result: 1 + $ ../bin/REPL.exe < 5 <= 5 + Evaluated result: 1 + +Conditional expressions + $ ../bin/REPL.exe < if 1 then 100 else 200 + Evaluated result: 100 + $ ../bin/REPL.exe < if 0 then 100 else 200 + Evaluated result: 200 + $ ../bin/REPL.exe < if (3 > 2) then 42 else 0 + Evaluated result: 42 + +Let bindings + $ ../bin/REPL.exe < let x = 10 in x + 5 + Evaluated result: 15 + $ ../bin/REPL.exe < let x = 5 in let y = 10 in x * y + Evaluated result: 50 + +Factorial with let rec + $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 0 + Evaluated result: 1 + $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 1 + Evaluated result: 1 + $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5 + Evaluated result: 120 + $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 10 + Evaluated result: 3628800 + +Fibonacci with let rec + $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 0 + Evaluated result: 0 + $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 1 + Evaluated result: 1 + $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 7 + Evaluated result: 13 + $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 10 + Evaluated result: 55 + +Multi-parameter syntax sugar + $ ../bin/REPL.exe < (fun x y -> x + y) 2 3 + Evaluated result: 5 + $ ../bin/REPL.exe < (fun x y z -> x + y + z) 1 2 3 + Evaluated result: 6 + +Print function + $ ../bin/REPL.exe < print 42 + 42 + Evaluated result: () + $ ../bin/REPL.exe < print (5 + 3) + 8 + Evaluated result: () + $ ../bin/REPL.exe < let x = print 10 in print 20 + 10 + 20 + Evaluated result: () + +Error handling - Division by zero + $ ../bin/REPL.exe < 10 / 0 + Error: Division by zero + +Error handling - Unknown variable + $ ../bin/REPL.exe < x + 5 + Error: Unknown variable x + +Error handling - Type mismatch + $ ../bin/REPL.exe < (fun x -> x) + 5 + Error: Type mismatch + +Step limit - Infinite loop with let rec + $ ../bin/REPL.exe -max-steps 100 < let rec loop = fun x -> loop x in loop 0 + Error: Step limit exceeded (max 100 steps) + +Step limit - Factorial completes within limit + $ ../bin/REPL.exe -max-steps 200 < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5 + Evaluated result: 120 diff --git a/Krivonosov/tests/tests.ml b/Krivonosov/tests/tests.ml new file mode 100644 index 00000000..9cae072a --- /dev/null +++ b/Krivonosov/tests/tests.ml @@ -0,0 +1,141 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** ***** UNIT TESTS COULD GO HERE (JUST AN EXAMPLE) *) +let rec fact n = if n = 1 then 1 else n * fact (n - 1) + +let%test _ = fact 5 = 120 + +(* These is a simple unit test that tests a single function 'fact' + If you want to test something large, like interpretation of a piece + of a minilanguge, it is not longer a unit tests but an integration test. + Read about dune's cram tests and put the test into `demos/somefile.t`. +*) + +open Lambda_lib +open Parser + +let parse_optimistically str = Result.get_ok (parse str) +let pp = Printast.pp_named + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "x y"); + [%expect {| (App ((Var x), (Var y))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(x y)"); + [%expect {| (App ((Var x), (Var y))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(\\x . x x)"); + [%expect {| (Abs (x, (App ((Var x), (Var x))))) |}] +;; + +let%expect_test _ = + Format.printf "%a" pp (parse_optimistically "(λf.λx. f (x x))"); + [%expect {| (Abs (f, (Abs (x, (App ((Var f), (App ((Var x), (Var x))))))))) |}] +;; + +(* Round-trip tests: parse(pretty_print(ast)) should equal ast *) +(* Testing that parsing and printing are inverses *) + +let test_roundtrip ast_str = + let parsed = parse_optimistically ast_str in + let printed = Format.asprintf "%a" Pprintast.pp_hum parsed in + let reparsed = parse_optimistically printed in + if parsed = reparsed + then () + else + Format.printf + "Round-trip failed!\nOriginal: %s\nPrinted: %s\nReparsed AST: %a\n" + ast_str + printed + pp + reparsed +;; + +(* Test round-trip for integers *) +let%test "roundtrip: integer" = + test_roundtrip "42"; + true +;; + +(* Test round-trip for variables *) +let%test "roundtrip: variable" = + test_roundtrip "foo"; + true +;; + +(* Test round-trip for lambda *) +let%test "roundtrip: lambda" = + test_roundtrip "fun x -> x"; + true +;; + +(* Test round-trip for application *) +let%test "roundtrip: application" = + test_roundtrip "(fun x -> x) 5"; + true +;; + +(* Test round-trip for arithmetic *) +let%test "roundtrip: arithmetic" = + test_roundtrip "2 + 3"; + true +;; + +let%test "roundtrip: complex arithmetic" = + test_roundtrip "3 * 4 + 5"; + true +;; + +(* Test round-trip for if-then-else *) +let%test "roundtrip: if-then-else" = + test_roundtrip "if 1 then 5 else 10"; + true +;; + +(* Test round-trip for let binding *) +let%test "roundtrip: let binding" = + test_roundtrip "let x = 5 in x + 3"; + true +;; + +(* Test round-trip for let rec *) +let%test "roundtrip: let rec" = + test_roundtrip + "let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5"; + true +;; + +(* Test round-trip for multi-parameter function *) +let%test "roundtrip: multi-param fun" = + test_roundtrip "fun x y z -> x + y + z"; + true +;; + +(* Test round-trip for nested let *) +let%test "roundtrip: nested let" = + test_roundtrip "let x = 10 in let y = 20 in x + y"; + true +;; + +let _ = Lambda_lib.Interpret.parse_and_run +let _ = Lambda_lib.Lambda.a +let _ = Lambda_lib.Lambda.one +let _ = Lambda_lib.Lambda.p +let _ = Lambda_lib.Lambda.three +let _ = Lambda_lib.Lambda.two +let _ = Lambda_lib.Lambda.without_strat +let _ = Lambda_lib.Lambda.zero + +(* parse_lam removed in new parser implementation *) +let _ = Lambda_lib.Printast.pp +let _ = Lambda_lib.Printast.show diff --git a/Krivonosov/lib/tests.mli b/Krivonosov/tests/tests.mli similarity index 100% rename from Krivonosov/lib/tests.mli rename to Krivonosov/tests/tests.mli From 81e2491135f5acc4d58b21162813bc1ce191f270 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Sun, 21 Dec 2025 14:32:35 +0300 Subject: [PATCH 39/42] chore project --- Krivonosov/bin/REPL.ml | 201 +++++------------------------ Krivonosov/lib/Pprintast.ml | 87 ------------- Krivonosov/lib/Pprintast.mli | 13 -- Krivonosov/lib/Printast.ml | 33 ----- Krivonosov/lib/Printast.mli | 13 -- Krivonosov/lib/dune | 2 +- Krivonosov/lib/interpret.ml | 8 +- Krivonosov/lib/lambda.ml | 142 -------------------- Krivonosov/lib/lambda.mli | 51 -------- Krivonosov/lib/print.ml | 77 +++++++++++ Krivonosov/lib/print.mli | 15 +++ Krivonosov/lib/utils.ml | 45 ------- Krivonosov/lib/utils.mli | 22 ---- Krivonosov/tests/dune | 30 +---- Krivonosov/tests/gen_tests.ml | 61 --------- Krivonosov/tests/gen_tests.mli | 9 -- Krivonosov/tests/interpret_tests.t | 172 ++++++------------------ Krivonosov/tests/tests.ml | 38 ++---- 18 files changed, 180 insertions(+), 839 deletions(-) delete mode 100644 Krivonosov/lib/Pprintast.ml delete mode 100644 Krivonosov/lib/Pprintast.mli delete mode 100644 Krivonosov/lib/Printast.ml delete mode 100644 Krivonosov/lib/Printast.mli delete mode 100644 Krivonosov/lib/lambda.ml delete mode 100644 Krivonosov/lib/lambda.mli create mode 100644 Krivonosov/lib/print.ml create mode 100644 Krivonosov/lib/print.mli delete mode 100644 Krivonosov/lib/utils.ml delete mode 100644 Krivonosov/lib/utils.mli delete mode 100644 Krivonosov/tests/gen_tests.ml delete mode 100644 Krivonosov/tests/gen_tests.mli diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index 08c582c1..d08ae1bf 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -8,177 +8,34 @@ open Lambda_lib -include struct - open Ast - open Utils - - type 'a status = - | Done of 'a - | WIP of 'a - - let fin x = Done x - let wip x = WIP x - - let ao_small_step_strat = - let rec helper = function - | Var _ as l -> fin l - | Int _ as l -> fin l - | BinOp (_, _, _) as l -> fin l - | If (_, _, _) as l -> fin l - | Let (_, _, _, _) as l -> fin l - | Abs (x, b) -> - (match helper b with - | WIP b2 -> wip (abs x b2) - | Done b2 -> fin (abs x b2)) - | App (f, arg) -> - (match helper f with - | WIP f2 -> wip (app f2 arg) - | Done (Abs (x, body)) -> - (match helper arg with - | Done arg -> wip (Lambda.subst x ~by:arg body) - | WIP arg -> wip (app f arg)) - | Done f2 -> fin (App (f2, arg))) - in - let rec loop t = - match helper t with - | Done x -> x - | WIP x -> - Format.printf " -- %a\n%!" Pprintast.pp_hum x; - loop x - in - let on_app _ f arg = loop (app f arg) in - let on_abs _ f x = loop (abs f x) in - let on_var _ x = loop (var x) in - let on_int _ n = Ast.Int n in - let on_binop _ op l r = Ast.BinOp (op, l, r) in - let on_if _ c t e = Ast.If (c, t, e) in - let on_let _ is_rec name binding body = Ast.Let (is_rec, name, binding, body) in - { Lambda.on_var; on_abs; on_app; on_int; on_binop; on_if; on_let } - ;; -end - -type strategy = - | CBN - | CBV - | NO - | AO - -type strategy_kind = - | Small_step - | Big_step - -type stop_after = - | SA_parsing - | SA_never - -type opts = - { mutable dump_parsetree : bool - ; mutable mode : strategy_kind * strategy - ; mutable stop_after : stop_after - ; mutable use_interpreter : bool - ; mutable max_steps : int - } - -let big_step_evaluator = function - | AO -> Lambda.ao_strat - | NO -> Lambda.nor_strat - | CBN -> Lambda.cbn_strat - | CBV -> Lambda.cbv_strat -;; - -let run_single dump_parsetree stop_after use_interpreter max_steps eval = - let text = In_channel.(input_all stdin) |> String.trim in - let ast = Parser.parse text in - match ast with - | Error e -> Format.printf "Error: %a\n%!" Parser.pp_error e - | Result.Ok ast -> - if dump_parsetree then Format.printf "Parsed result: @[%a@]\n%!" Printast.pp_named ast; - (match stop_after with - | SA_parsing -> () - | SA_never -> - if use_interpreter - then ( - (* Use monadic interpreter *) - match Interpret.eval_expr ~max_steps ast with - | Base.Result.Ok (Interpret.VInt n) -> Format.printf "Evaluated result: %d\n%!" n - | Base.Result.Ok (Interpret.VClosure _) -> - Format.printf "Evaluated result: \n%!" - | Base.Result.Ok (Interpret.VBuiltin (name, _)) -> - Format.printf "Evaluated result: \n%!" name - | Base.Result.Ok Interpret.VUnit -> Format.printf "Evaluated result: ()\n%!" - | Base.Result.Error (`UnknownVariable name) -> - Format.printf "Error: Unknown variable %s\n%!" name - | Base.Result.Error `DivisionByZero -> - Format.printf "Error: Division by zero\n%!" - | Base.Result.Error `TypeMismatch -> Format.printf "Error: Type mismatch\n%!" - | Base.Result.Error `StepLimitExceeded -> - Format.printf "Error: Step limit exceeded (max %d steps)\n%!" max_steps) - else ( - (* Use old lambda reduction *) - let rez = eval ast in - Format.printf "Evaluated result: %a\n%!" Pprintast.pp_hum rez)) -;; - let () = - let opts = - { dump_parsetree = false - ; mode = Big_step, NO - ; stop_after = SA_never - ; use_interpreter = true - ; max_steps = 10000 - } - in - let pick_strategy stra () = - let kind, _ = opts.mode in - opts.mode <- kind, stra; - opts.use_interpreter <- false - in - let pick_step step () = - let _, stra = opts.mode in - opts.mode <- step, stra - in - let () = - let open Stdlib.Arg in - parse - [ "-cbv", Unit (pick_strategy CBV), "Call-by-value strategy" - ; "-cbn", Unit (pick_strategy CBN), "Call-by-name strategy" - ; "-no", Unit (pick_strategy NO), "Normal Order strategy" - ; "-ao", Unit (pick_strategy AO), "Applicative Order strategy" - ; ( "-small" - , Unit (pick_step Small_step) - , "Small-step strategy kind (default is big-step)" ) - ; ( "-big" - , Unit (pick_step Big_step) - , "Small-step strategy kind (default is big-step)" ) - ; ( "-dparsetree" - , Unit (fun () -> opts.dump_parsetree <- true) - , "Dump parse tree, don't eval enything" ) - ; ( "-stop-after" - , String - (function - | "parsing" -> opts.stop_after <- SA_parsing - | _ -> failwith "Bad argument of -stop-after") - , "" ) - ; ( "-max-steps" - , Int (fun n -> opts.max_steps <- n) - , "Maximum number of evaluation steps (default: 10000)" ) - ] - (fun _ -> - Stdlib.Format.eprintf "Positioned arguments are not supported\n"; - Stdlib.exit 1) - "Read-Eval-Print-Loop for Utyped Lambda Calculus" - in - run_single - opts.dump_parsetree - opts.stop_after - opts.use_interpreter - opts.max_steps - (fun ast -> - let stra = - match opts.mode with - | Big_step, stra -> big_step_evaluator stra - | Small_step, AO -> ao_small_step_strat - | _ -> raise (Failure "Implement it yourself") - in - Lambda.apply_strat stra ast) + let max_steps = ref 10000 in + Stdlib.Arg.parse + [ "-max-steps", Int (fun n -> max_steps := n), "Maximum evaluation steps" ] + (fun _ -> failwith "No positional args") + "miniML REPL"; + let input = In_channel.(input_all stdin) |> String.trim in + match Parser.parse input with + | Error e -> + Format.printf "Error: %a\n%!" Parser.pp_error e; + exit 1 + | Result.Ok ast -> + (match Interpret.eval_expr ~max_steps:!max_steps ast with + | Base.Result.Ok (Interpret.VInt n) -> Printf.printf "%d\n" n + | Base.Result.Ok (Interpret.VClosure _) -> Printf.printf "\n" + | Base.Result.Ok (Interpret.VBuiltin (name, _)) -> + Printf.printf "\n" name + | Base.Result.Ok Interpret.VUnit -> Printf.printf "()\n" + | Base.Result.Error (`UnknownVariable name) -> + Printf.eprintf "Unbound variable: %s\n" name; + exit 1 + | Base.Result.Error `DivisionByZero -> + Printf.eprintf "Division by zero\n"; + exit 1 + | Base.Result.Error `TypeMismatch -> + Printf.eprintf "Type error\n"; + exit 1 + | Base.Result.Error `StepLimitExceeded -> + Printf.eprintf "Step limit exceeded\n"; + exit 1) ;; diff --git a/Krivonosov/lib/Pprintast.ml b/Krivonosov/lib/Pprintast.ml deleted file mode 100644 index 8a666c36..00000000 --- a/Krivonosov/lib/Pprintast.ml +++ /dev/null @@ -1,87 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(* Pretty printer goes here *) - -open Ast -open Utils - -let pp_binop fmt = function - | Add -> Format.fprintf fmt "+" - | Sub -> Format.fprintf fmt "-" - | Mul -> Format.fprintf fmt "*" - | Div -> Format.fprintf fmt "/" - | Mod -> Format.fprintf fmt "%%" - | Eq -> Format.fprintf fmt "=" - | Neq -> Format.fprintf fmt "<>" - | Lt -> Format.fprintf fmt "<" - | Gt -> Format.fprintf fmt ">" - | Leq -> Format.fprintf fmt "<=" - | Geq -> Format.fprintf fmt ">=" -;; - -let pp ?(compact = true) = - let open Format in - let mangle t fmt x = - if is_free_in x t || not compact then fprintf fmt "%s" x else fprintf fmt "_" - in - let rec pp fmt = function - | Var s -> Format.fprintf fmt "%s" s - | Int n -> Format.fprintf fmt "%d" n - | BinOp (op, l, r) -> Format.fprintf fmt "(%a %a %a)" pp l pp_binop op pp r - | If (cond, then_br, None) -> Format.fprintf fmt "(if %a then %a)" pp cond pp then_br - | If (cond, then_br, Some else_br) -> - Format.fprintf fmt "(if %a then %a else %a)" pp cond pp then_br pp else_br - | Let (is_rec, name, binding, body) -> - if is_rec - then Format.fprintf fmt "(let rec %s = %a in %a)" name pp binding pp body - else Format.fprintf fmt "(let %s = %a in %a)" name pp binding pp body - | App (l, r) -> Format.fprintf fmt "(%a %a)" pp l pp r - | Abs (x, Abs (y, Var z)) when x = z && y <> z && compact -> - if compact then Format.fprintf fmt "⊤" - | Abs (x, Abs (y, Var z)) when y = z && x <> z && compact -> Format.fprintf fmt "⊥" - | Abs (f, Abs (x, Var z)) when x = z && x <> f && compact -> Format.fprintf fmt "0" - | Abs (f, Abs (x, App (Var g, Var z))) when x = z && x <> f && g = f && compact -> - Format.fprintf fmt "1" - | Abs (f, Abs (x, App (Var g, App (Var h, Var z)))) - when x = z && x <> f && g = f && h = g && compact -> Format.fprintf fmt "2" - | Abs (v1, Abs (v2, Abs (v3, Abs (v4, t)))) when compact -> - Format.fprintf - fmt - "(λ %a %a %a %a -> %a)" - (mangle t) - v1 - (mangle t) - v2 - (mangle t) - v3 - (mangle t) - v4 - pp - t - | Abs (v1, Abs (v2, Abs (v3, t))) when compact -> - Format.fprintf - fmt - "(λ %a %a %a -> %a)" - (mangle t) - v1 - (mangle t) - v2 - (mangle t) - v3 - pp - t - | Abs (v1, Abs (v2, t)) when compact -> - Format.fprintf fmt "(λ %a %a -> %a)" (mangle t) v1 (mangle t) v2 pp t - | Abs (x, t) -> Format.fprintf fmt "(λ %a . %a)" (mangle t) x pp t - in - pp -;; - -let pp_hum = pp ~compact:true -let pp = pp ~compact:false diff --git a/Krivonosov/lib/Pprintast.mli b/Krivonosov/lib/Pprintast.mli deleted file mode 100644 index 81f6c2ff..00000000 --- a/Krivonosov/lib/Pprintast.mli +++ /dev/null @@ -1,13 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(** Verbose printing. Usable for paring *) -val pp : Format.formatter -> string Ast.t -> unit - -(** Print in fancy human-readable form *) -val pp_hum : Format.formatter -> string Ast.t -> unit diff --git a/Krivonosov/lib/Printast.ml b/Krivonosov/lib/Printast.ml deleted file mode 100644 index 5e0600e1..00000000 --- a/Krivonosov/lib/Printast.ml +++ /dev/null @@ -1,33 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -type binop = Ast.binop = - | Add - | Sub - | Mul - | Div - | Mod - | Eq - | Neq - | Lt - | Gt - | Leq - | Geq -[@@deriving show { with_path = false }] - -type 'name t = 'name Ast.t = - | Var of 'name - | Abs of 'name * 'name t - | App of 'name t * 'name t - | Int of int - | BinOp of binop * 'name t * 'name t - | If of 'name t * 'name t * 'name t option - | Let of bool * 'name * 'name t * 'name t -[@@deriving show { with_path = false }] - -let pp_named = pp Format.pp_print_string diff --git a/Krivonosov/lib/Printast.mli b/Krivonosov/lib/Printast.mli deleted file mode 100644 index 2b73b720..00000000 --- a/Krivonosov/lib/Printast.mli +++ /dev/null @@ -1,13 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(** Pretty-print representation of AST with names. *) -val pp_named : Format.formatter -> string Ast.t -> unit - -val pp : (Format.formatter -> 'name -> unit) -> Format.formatter -> 'name Ast.t -> unit -val show : (Format.formatter -> 'name -> unit) -> 'name Ast.t -> string diff --git a/Krivonosov/lib/dune b/Krivonosov/lib/dune index 80ffceeb..7e0688e4 100644 --- a/Krivonosov/lib/dune +++ b/Krivonosov/lib/dune @@ -1,7 +1,7 @@ (library (name lambda_lib) (public_name Krivonosov.Lib) - (modules Ast Lambda Interpret Parser Printast Pprintast utils) + (modules Ast Interpret Parser Print) (modules_without_implementation ast) (libraries base angstrom) (preprocess diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index 014c19b8..eb8e40a6 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -9,7 +9,13 @@ (** Real monadic interpreter goes here *) open Base -open Utils + +(** Monad signature with fail *) +module type MONAD_FAIL = sig + include Base.Monad.S2 + + val fail : 'e -> ('a, 'e) t +end type error = [ `UnknownVariable of string diff --git a/Krivonosov/lib/lambda.ml b/Krivonosov/lib/lambda.ml deleted file mode 100644 index f36f3a11..00000000 --- a/Krivonosov/lib/lambda.ml +++ /dev/null @@ -1,142 +0,0 @@ -(** Copyright 2021-2023, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -open Ast -open Base -open Utils - -(* Smart constructors *) -let var x = Var x -let abs x y = Abs (x, y) -let app x y = App (x, y) - -let replace_name x ~by = - let rec helper = function - | Var y when String.equal x y -> Var by - | Var t -> Var t - | Int n -> Int n - | BinOp (op, l, r) -> BinOp (op, helper l, helper r) - | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) - | Let (is_rec, name, binding, body) -> - Let (is_rec, (if String.equal name x then by else name), helper binding, helper body) - | App (l, r) -> App (helper l, helper r) - | Abs (y, t) when String.equal x y -> Abs (by, helper t) - | Abs (z, t) -> Abs (z, helper t) - in - helper -;; - -let rec next_name s old = - if List.mem ~equal:String.equal old s then next_name ("_" ^ s) old else s -;; - -(* The call [subst x ~by:v e] means `[x/v]e` or `e[v -> x]` *) -let subst x ~by:v = - let rec helper = function - | Var y when String.equal y x -> v - | Var y -> Var y - | Int n -> Int n - | BinOp (op, l, r) -> BinOp (op, helper l, helper r) - | If (c, t, e) -> If (helper c, helper t, Option.map ~f:helper e) - | Let (is_rec, name, binding, body) when String.equal name x -> - (* Don't substitute in body if name shadows x *) - Let (is_rec, name, helper binding, body) - | Let (is_rec, name, binding, body) -> Let (is_rec, name, helper binding, helper body) - | App (l, r) -> app (helper l) (helper r) - | Abs (y, b) when String.equal y x -> abs y b - | Abs (y, t) when is_free_in y v -> - let frees = free_vars v @ free_vars t in - let w = next_name y frees in - helper (abs w (replace_name y ~by:w t)) - | Abs (y, b) -> abs y (helper b) - in - helper -;; - -type strat = - { on_var : strat -> name -> string Ast.t - ; on_abs : strat -> name -> string Ast.t -> string Ast.t - ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t - ; on_int : strat -> int -> string Ast.t - ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t - ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t - ; on_let : strat -> bool -> name -> string Ast.t -> string Ast.t -> string Ast.t - } - -let apply_strat st = function - | Var name -> st.on_var st name - | Abs (x, b) -> st.on_abs st x b - | App (l, r) -> st.on_app st l r - | Int n -> st.on_int st n - | BinOp (op, l, r) -> st.on_binop st op l r - | If (c, t, e) -> st.on_if st c t e - | Let (is_rec, name, binding, body) -> st.on_let st is_rec name binding body -;; - -let without_strat = - let on_var _ = var in - let on_abs _ = abs in - let on_app _ = app in - let on_int _ n = Int n in - let on_binop _ op l r = BinOp (op, l, r) in - let on_if _ c t e = If (c, t, e) in - let on_let _ is_rec name binding body = Let (is_rec, name, binding, body) in - { on_var; on_abs; on_app; on_int; on_binop; on_if; on_let } -;; - -let cbn_strat = - let on_app st f arg = - match apply_strat st f with - | Abs (x, e) -> apply_strat st (subst x ~by:arg e) - | f2 -> App (f2, arg) - in - { without_strat with on_app } -;; - -let under_abstraction st x b = abs x (apply_strat st b) - -(* Normal Order Reduction to Normal Form - Application function reduced as CBN first - + Reduce under abstractions *) -let nor_strat = - let on_app st f arg = - match apply_strat cbn_strat f with - | Abs (x, e) -> apply_strat st @@ subst x ~by:arg e - | f1 -> - let f2 = apply_strat st f1 in - let arg2 = apply_strat st arg in - App (f2, arg2) - in - { without_strat with on_app; on_abs = under_abstraction } -;; - -(* Call-by-Value Reduction to Weak Normal Form *) -let cbv_strat = - let on_app st f arg = - match apply_strat st f with - | Abs (x, e) -> - let arg2 = apply_strat st arg in - apply_strat st @@ subst x ~by:arg2 e - | f2 -> App (f2, apply_strat st arg) - in - { without_strat with on_app } -;; - -(* Applicative Order Reduction to Normal Form - As CBV but reduce under abstractions *) -let ao_strat = { cbv_strat with on_abs = under_abstraction } -let a = var "a" -let x = var "x" -let y = var "y" -let z = var "z" -let f = var "f" -let g = var "g" -let h = var "h" -let m = var "m" -let n = var "n" -let p = var "p" -let zero = abs "f" @@ abs "x" x -let one = abs "f" @@ abs "x" @@ app f x -let two = abs "f" @@ abs "x" @@ app f (app f x) -let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) diff --git a/Krivonosov/lib/lambda.mli b/Krivonosov/lib/lambda.mli deleted file mode 100644 index 7e8faba0..00000000 --- a/Krivonosov/lib/lambda.mli +++ /dev/null @@ -1,51 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(* - val var : 'a -> 'a Ast.t - val abs : 'a -> 'a Ast.t -> 'a Ast.t - val app : 'a Ast.t -> 'a Ast.t -> 'a Ast.t *) - -val subst : string -> by:string Ast.t -> string Ast.t -> string Ast.t - -type strat = - { on_var : strat -> Ast.name -> string Ast.t - ; on_abs : strat -> Ast.name -> string Ast.t -> string Ast.t - ; on_app : strat -> string Ast.t -> string Ast.t -> string Ast.t - ; on_int : strat -> int -> string Ast.t - ; on_binop : strat -> Ast.binop -> string Ast.t -> string Ast.t -> string Ast.t - ; on_if : strat -> string Ast.t -> string Ast.t -> string Ast.t option -> string Ast.t - ; on_let : strat -> bool -> Ast.name -> string Ast.t -> string Ast.t -> string Ast.t - } - -val apply_strat : strat -> string Ast.t -> string Ast.t -val without_strat : strat - -(** Predefined strategies *) - -val cbn_strat : strat -val nor_strat : strat -val cbv_strat : strat -val ao_strat : strat - -(** Example lambda expressions *) - -val a : string Ast.t -val x : string Ast.t -val y : string Ast.t -val z : string Ast.t -val f : string Ast.t -val g : string Ast.t -val h : string Ast.t -val m : string Ast.t -val n : string Ast.t -val p : string Ast.t -val zero : string Ast.t -val one : string Ast.t -val two : string Ast.t -val three : string Ast.t diff --git a/Krivonosov/lib/print.ml b/Krivonosov/lib/print.ml new file mode 100644 index 00000000..9fc88528 --- /dev/null +++ b/Krivonosov/lib/print.ml @@ -0,0 +1,77 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Ast + +(** Structural printing for debugging *) +let rec print_ast = function + | Int n -> Printf.sprintf "Int %d" n + | Var x -> Printf.sprintf "Var %S" x + | BinOp (op, l, r) -> + let op_str = + match op with + | Add -> "Add" + | Sub -> "Sub" + | Mul -> "Mul" + | Div -> "Div" + | Mod -> "Mod" + | Eq -> "Eq" + | Neq -> "Neq" + | Lt -> "Lt" + | Gt -> "Gt" + | Leq -> "Leq" + | Geq -> "Geq" + in + Printf.sprintf "BinOp (%s, %s, %s)" op_str (print_ast l) (print_ast r) + | If (c, t, None) -> Printf.sprintf "If (%s, %s, None)" (print_ast c) (print_ast t) + | If (c, t, Some e) -> + Printf.sprintf "If (%s, %s, Some %s)" (print_ast c) (print_ast t) (print_ast e) + | Let (is_rec, x, e, b) -> + Printf.sprintf + "Let (%s, %S, %s, %s)" + (if is_rec then "true" else "false") + x + (print_ast e) + (print_ast b) + | Abs (param, body) -> Printf.sprintf "Abs (%S, %s)" param (print_ast body) + | App (f, a) -> Printf.sprintf "App (%s, %s)" (print_ast f) (print_ast a) +;; + +(** Human-readable printing *) +let rec print_expr = function + | Int n -> string_of_int n + | Var s -> s + | BinOp (op, l, r) -> + let op_str = + match op with + | Add -> "+" + | Sub -> "-" + | Mul -> "*" + | Div -> "/" + | Mod -> "%" + | Eq -> "=" + | Neq -> "<>" + | Lt -> "<" + | Gt -> ">" + | Leq -> "<=" + | Geq -> ">=" + in + Printf.sprintf "(%s %s %s)" (print_expr l) op_str (print_expr r) + | If (c, t, None) -> Printf.sprintf "(if %s then %s)" (print_expr c) (print_expr t) + | If (c, t, Some e) -> + Printf.sprintf "(if %s then %s else %s)" (print_expr c) (print_expr t) (print_expr e) + | Let (is_rec, name, value, body) -> + Printf.sprintf + "(let %s%s = %s in %s)" + (if is_rec then "rec " else "") + name + (print_expr value) + (print_expr body) + | Abs (param, body) -> Printf.sprintf "(fun %s -> %s)" param (print_expr body) + | App (f, a) -> Printf.sprintf "(%s %s)" (print_expr f) (print_expr a) +;; diff --git a/Krivonosov/lib/print.mli b/Krivonosov/lib/print.mli new file mode 100644 index 00000000..19b4eabf --- /dev/null +++ b/Krivonosov/lib/print.mli @@ -0,0 +1,15 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** Print AST in structural form for debugging + Example: [Int 42], [Var "x"], [BinOp (Add, Int 1, Int 2)] *) +val print_ast : string Ast.t -> string + +(** Print AST in human-readable form + Example: [42], [x], [(1 + 2)] *) +val print_expr : string Ast.t -> string diff --git a/Krivonosov/lib/utils.ml b/Krivonosov/lib/utils.ml deleted file mode 100644 index 81cb1ade..00000000 --- a/Krivonosov/lib/utils.ml +++ /dev/null @@ -1,45 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -open Base -open Ast - -(* TODO: use a set instead of list *) -let list_remove x = List.filter ~f:(fun a -> not (String.equal a x)) - -let free_vars = - let rec helper acc = function - | Var s -> s :: acc - | Int _ -> acc - | BinOp (_, l, r) -> helper (helper acc r) l - | If (c, t, e) -> - let acc = helper acc c in - let acc = helper acc t in - (match e with - | None -> acc - | Some e -> helper acc e) - | Let (_, name, binding, body) -> - let acc = helper acc binding in - acc @ list_remove name (helper [] body) - | Abs (s, l) -> acc @ list_remove s (helper [] l) - | App (l, r) -> helper (helper acc r) l - in - helper [] -;; - -let is_free_in x term = List.mem (free_vars term) x ~equal:String.equal -let var x = Var x -let abs x l = Abs (x, l) -let app l r = App (l, r) - -(* TODO: rework this *) -module type MONAD_FAIL = sig - include Base.Monad.S2 - - val fail : 'e -> ('a, 'e) t -end diff --git a/Krivonosov/lib/utils.mli b/Krivonosov/lib/utils.mli deleted file mode 100644 index 70e625a5..00000000 --- a/Krivonosov/lib/utils.mli +++ /dev/null @@ -1,22 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -val free_vars : string Ast.t -> string list -val is_free_in : string -> string Ast.t -> bool - -(** Smart constructors *) - -val var : 'a -> 'a Ast.t -val abs : 'a -> 'a Ast.t -> 'a Ast.t -val app : 'a Ast.t -> 'a Ast.t -> 'a Ast.t - -module type MONAD_FAIL = sig - include Base.Monad.S2 - - val fail : 'e -> ('a, 'e) t -end diff --git a/Krivonosov/tests/dune b/Krivonosov/tests/dune index 97361172..a45e2867 100644 --- a/Krivonosov/tests/dune +++ b/Krivonosov/tests/dune @@ -1,34 +1,6 @@ -(executable - (name gen_tests) - (libraries lambda_lib) - (modules gen_tests) - (instrumentation - (backend bisect_ppx))) - -(rule - (deps ./gen_tests.exe) - (targets - lam_zero.txt - lam_one.txt - lam_1+1.txt - lam_2x1.txt - lam_3x2.txt - lam_fac3.txt) - (mode - (promote (until-clean))) - (action - (run %{deps}))) - (cram (applies_to interpret_tests) - (deps - lam_zero.txt - lam_one.txt - lam_1+1.txt - lam_2x1.txt - lam_3x2.txt - lam_fac3.txt - ../bin/REPL.exe)) + (deps ../bin/REPL.exe)) (library (name tests) diff --git a/Krivonosov/tests/gen_tests.ml b/Krivonosov/tests/gen_tests.ml deleted file mode 100644 index 6ae0f429..00000000 --- a/Krivonosov/tests/gen_tests.ml +++ /dev/null @@ -1,61 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -open Lambda_lib -open Ast -open Lambda -open Utils - -let zero = abs "g" @@ abs "y" @@ Var "y" -let one = abs "f" @@ abs "x" @@ app f (Var "x") -let two = abs "f" @@ abs "x" @@ app f (app f x) -let three = abs "f" @@ abs "x" @@ app f (app f (app f x)) -let plus = abs "m" @@ abs "n" @@ abs "f" @@ abs "x" @@ app m @@ app f @@ app n @@ app f x -let mul = abs "x" @@ abs "y" @@ abs "z" @@ app x (app y z) -let true_ = abs "x" @@ abs "y" @@ Var "x" -let false_ = abs "x" @@ abs "y" @@ Var "y" -let isZero = abs "n" @@ app (app n (abs "x" false_)) true_ - -(* TODO: write the right if-then-else - by adding thunk around then and else branches to delay the evaluation *) -let pred = - let xxx = abs "g" @@ abs "h" @@ app h (app g f) in - abs "n" @@ abs "f" @@ abs "x" @@ app (app (app n xxx) (abs "u" x)) (abs "u" (Var "u")) -;; - -let pp = Pprintast.pp - -let out_term file lam = - Out_channel.with_open_text file (fun ch -> - Format.fprintf (Format.formatter_of_out_channel ch) "%a%!" pp lam; - flush ch) -;; - -let () = out_term "lam_zero.txt" zero -let () = out_term "lam_one.txt" one -let () = out_term "lam_1+1.txt" (app plus @@ app one one) -let () = out_term "lam_2x1.txt" (app (app mul two) one) -let () = out_term "lam_3x2.txt" (app (app mul three) two) - -(** Definition for normal order *) -module _ = struct - let ite cond th el = app (app (app isZero cond) th) el - - let fact = - abs "s" - @@ abs "n" - @@ ite (Var "n") one (app (app mul (app (var "s") (app pred (var "n")))) (var "n")) - ;; - - let ygrek = - let hack = abs "x" (app f (app x x)) in - abs "f" (app hack hack) - ;; - - let () = out_term "lam_fac3.txt" @@ app (app ygrek fact) three -end diff --git a/Krivonosov/tests/gen_tests.mli b/Krivonosov/tests/gen_tests.mli deleted file mode 100644 index b0431923..00000000 --- a/Krivonosov/tests/gen_tests.mli +++ /dev/null @@ -1,9 +0,0 @@ -(* Intentionally empty *) - -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index f2822f7d..6e9c7fe9 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -5,231 +5,135 @@ Cram tests here. They run and compare program output to the expected output https://dune.readthedocs.io/en/stable/tests.html#cram-tests Use `dune promote` after you change things that should runned -If you need to put sample program and use it both in your interpreter and preinstalled one, -you could put it into separate file. Thise will need stanza `(cram (deps demo_input.txt))` -in the dune file - - $ ../bin/REPL.exe -cbv -dparsetree < \f.x - Parsed result: (Abs (f, (Var x))) - Evaluated result: (λ _ . x) - $ ../bin/REPL.exe -dparsetree < garbage242 - Parsed result: (Var garbage242) - Error: Unknown variable garbage242 - - - - $ ../bin/REPL.exe -no -dparsetree < (\x.\y.x)(\u.u)((\x. x x)(\x.x x)) - Parsed result: (App ( - (App ((Abs (x, (Abs (y, (Var x))))), (Abs (u, (Var u))))), - (App ((Abs (x, (App ((Var x), (Var x))))), - (Abs (x, (App ((Var x), (Var x))))))) - )) - Evaluated result: (λ u . u) -Below we redirect contents of the file to the evaluator - $ ../bin/REPL.exe -dparsetree -stop-after parsing < lam_1+1.txt - Parsed result: (App ( - (Abs (m, - (Abs (n, - (Abs (f, - (Abs (x, - (App ((Var m), - (App ((Var f), - (App ((Var n), (App ((Var f), (Var x))))) - )) - )) - )) - )) - )) - )), - (App ((Abs (f, (Abs (x, (App ((Var f), (Var x))))))), - (Abs (f, (Abs (x, (App ((Var f), (Var x))))))))) - )) - - $ ../bin/REPL.exe -ao < lam_1+1.txt - Evaluated result: (λ n f x _x -> ((f (n (f x))) _x)) - $ ../bin/REPL.exe -ao < lam_2x1.txt - Evaluated result: 2 -Call by value doesn't reduce under abstraction - $ ../bin/REPL.exe -cbv < lam_2x1.txt - Evaluated result: (λ z . (2 (1 z))) - $ ../bin/REPL.exe -ao -small < lam_3x2.txt - -- ((λ y z -> ((λ f x -> (f (f (f x)))) (y z))) 2) - -- ((λ y z x -> ((y z) ((y z) ((y z) x)))) 2) - -- (λ z x -> ((2 z) ((2 z) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((2 z) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((2 z) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) ((λ x . (z (z x))) x)))) - -- (λ z x -> ((λ x . (z (z x))) ((λ x . (z (z x))) (z (z x))))) - -- (λ z x -> ((λ x . (z (z x))) (z (z (z (z x)))))) - -- (λ z x -> (z (z (z (z (z (z x))))))) - Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) - $ ../bin/REPL.exe -ao < lam_zero.txt - Evaluated result: ⊥ -For 3! we use noral order reduction - $ cat lam_fac3.txt - (((λ f . ((λ x . (f (x x))) (λ x . (f (x x))))) (λ s . (λ n . ((((λ n . ((n (λ x . (λ x . (λ y . y)))) (λ x . (λ y . x)))) n) (λ f . (λ x . (f x)))) (((λ x . (λ y . (λ z . (x (y z))))) (s ((λ n . (λ f . (λ x . (((n (λ g . (λ h . (h (g f))))) (λ u . x)) (λ u . u))))) n))) n))))) (λ f . (λ x . (f (f (f x)))))) - $ ../bin/REPL.exe -no < lam_fac3.txt - Evaluated result: (λ z x -> (z (z (z (z (z (z x))))))) - -If-then-else tests -Test parsing if-then-else - $ ../bin/REPL.exe -dparsetree -stop-after parsing < if 1 then 5 else 10 - Parsed result: (If ((Int 1), (Int 5), (Some (Int 10)))) - -Test parsing if-then without else - $ ../bin/REPL.exe -dparsetree -stop-after parsing < if 0 then 100 - Parsed result: (If ((Int 0), (Int 100), None)) - -Let-binding tests -Test parsing simple let - $ ../bin/REPL.exe -dparsetree -stop-after parsing < let x = 5 in x + 3 - Parsed result: (Let (false, x, (Int 5), (BinOp (Add, (Var x), (Int 3))))) - -Test parsing nested let - $ ../bin/REPL.exe -dparsetree -stop-after parsing < let x = 10 in let y = 20 in x + y - Parsed result: (Let (false, x, (Int 10), - (Let (false, y, (Int 20), (BinOp (Add, (Var x), (Var y))))) - )) - -Test parsing let rec - $ ../bin/REPL.exe -dparsetree -stop-after parsing < let rec fact = \n. if n then n else 1 in fact 5 - Parsed result: (Let (true, fact, - (Abs (n, (If ((Var n), (Var n), (Some (Int 1)))))), - (App ((Var fact), (Int 5))))) - -Interpreter tests -================= +miniML Interpreter tests +======================== Basic arithmetic $ ../bin/REPL.exe < 2 + 3 - Evaluated result: 5 + 5 $ ../bin/REPL.exe < 10 - 4 - Evaluated result: 6 + 6 $ ../bin/REPL.exe < 3 * 4 - Evaluated result: 12 + 12 $ ../bin/REPL.exe < 15 / 3 - Evaluated result: 5 + 5 $ ../bin/REPL.exe < 17 % 5 - Evaluated result: 2 + 2 Comparison operators $ ../bin/REPL.exe < 5 = 5 - Evaluated result: 1 + 1 $ ../bin/REPL.exe < 5 = 3 - Evaluated result: 0 + 0 $ ../bin/REPL.exe < 3 < 5 - Evaluated result: 1 + 1 $ ../bin/REPL.exe < 5 <= 5 - Evaluated result: 1 + 1 Conditional expressions $ ../bin/REPL.exe < if 1 then 100 else 200 - Evaluated result: 100 + 100 $ ../bin/REPL.exe < if 0 then 100 else 200 - Evaluated result: 200 + 200 $ ../bin/REPL.exe < if (3 > 2) then 42 else 0 - Evaluated result: 42 + 42 Let bindings $ ../bin/REPL.exe < let x = 10 in x + 5 - Evaluated result: 15 + 15 $ ../bin/REPL.exe < let x = 5 in let y = 10 in x * y - Evaluated result: 50 + 50 Factorial with let rec $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 0 - Evaluated result: 1 + 1 $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 1 - Evaluated result: 1 + 1 $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5 - Evaluated result: 120 + 120 $ ../bin/REPL.exe < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 10 - Evaluated result: 3628800 + 3628800 Fibonacci with let rec $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 0 - Evaluated result: 0 + 0 $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 1 - Evaluated result: 1 + 1 $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 7 - Evaluated result: 13 + 13 $ ../bin/REPL.exe < let rec fib = fun n -> if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 10 - Evaluated result: 55 + 55 Multi-parameter syntax sugar $ ../bin/REPL.exe < (fun x y -> x + y) 2 3 - Evaluated result: 5 + 5 $ ../bin/REPL.exe < (fun x y z -> x + y + z) 1 2 3 - Evaluated result: 6 + 6 Print function $ ../bin/REPL.exe < print 42 42 - Evaluated result: () + () $ ../bin/REPL.exe < print (5 + 3) 8 - Evaluated result: () + () $ ../bin/REPL.exe < let x = print 10 in print 20 10 20 - Evaluated result: () + () Error handling - Division by zero $ ../bin/REPL.exe < 10 / 0 - Error: Division by zero + Division by zero + [1] Error handling - Unknown variable $ ../bin/REPL.exe < x + 5 - Error: Unknown variable x + Unbound variable: x + [1] Error handling - Type mismatch $ ../bin/REPL.exe < (fun x -> x) + 5 - Error: Type mismatch + Type error + [1] Step limit - Infinite loop with let rec $ ../bin/REPL.exe -max-steps 100 < let rec loop = fun x -> loop x in loop 0 - Error: Step limit exceeded (max 100 steps) + Step limit exceeded + [1] Step limit - Factorial completes within limit $ ../bin/REPL.exe -max-steps 200 < let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5 - Evaluated result: 120 + 120 diff --git a/Krivonosov/tests/tests.ml b/Krivonosov/tests/tests.ml index 9cae072a..526db4fe 100644 --- a/Krivonosov/tests/tests.ml +++ b/Krivonosov/tests/tests.ml @@ -21,26 +21,26 @@ open Lambda_lib open Parser let parse_optimistically str = Result.get_ok (parse str) -let pp = Printast.pp_named +let pp ast = Print.print_ast ast let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "x y"); - [%expect {| (App ((Var x), (Var y))) |}] + Format.printf "%s" (pp (parse_optimistically "x y")); + [%expect {| App (Var "x", Var "y") |}] ;; let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(x y)"); - [%expect {| (App ((Var x), (Var y))) |}] + Format.printf "%s" (pp (parse_optimistically "(x y)")); + [%expect {| App (Var "x", Var "y") |}] ;; let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(\\x . x x)"); - [%expect {| (Abs (x, (App ((Var x), (Var x))))) |}] + Format.printf "%s" (pp (parse_optimistically "(\\x . x x)")); + [%expect {| Abs ("x", App (Var "x", Var "x")) |}] ;; let%expect_test _ = - Format.printf "%a" pp (parse_optimistically "(λf.λx. f (x x))"); - [%expect {| (Abs (f, (Abs (x, (App ((Var f), (App ((Var x), (Var x))))))))) |}] + Format.printf "%s" (pp (parse_optimistically "(λf.λx. f (x x))")); + [%expect {| Abs ("f", Abs ("x", App (Var "f", App (Var "x", Var "x")))) |}] ;; (* Round-trip tests: parse(pretty_print(ast)) should equal ast *) @@ -48,17 +48,16 @@ let%expect_test _ = let test_roundtrip ast_str = let parsed = parse_optimistically ast_str in - let printed = Format.asprintf "%a" Pprintast.pp_hum parsed in + let printed = Print.print_expr parsed in let reparsed = parse_optimistically printed in if parsed = reparsed then () else Format.printf - "Round-trip failed!\nOriginal: %s\nPrinted: %s\nReparsed AST: %a\n" + "Round-trip failed!\nOriginal: %s\nPrinted: %s\nReparsed AST: %s\n" ast_str printed - pp - reparsed + (pp reparsed) ;; (* Test round-trip for integers *) @@ -126,16 +125,3 @@ let%test "roundtrip: nested let" = test_roundtrip "let x = 10 in let y = 20 in x + y"; true ;; - -let _ = Lambda_lib.Interpret.parse_and_run -let _ = Lambda_lib.Lambda.a -let _ = Lambda_lib.Lambda.one -let _ = Lambda_lib.Lambda.p -let _ = Lambda_lib.Lambda.three -let _ = Lambda_lib.Lambda.two -let _ = Lambda_lib.Lambda.without_strat -let _ = Lambda_lib.Lambda.zero - -(* parse_lam removed in new parser implementation *) -let _ = Lambda_lib.Printast.pp -let _ = Lambda_lib.Printast.show From d751ff50738b47de7617928516c027e8db5270e5 Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Sun, 21 Dec 2025 15:29:41 +0300 Subject: [PATCH 40/42] CamelCase fixing --- Krivonosov/Makefile | 2 +- Krivonosov/bin/REPL.ml | 21 ++++-- Krivonosov/lib/interpret.ml | 128 ++++++++++++++++-------------------- 3 files changed, 73 insertions(+), 78 deletions(-) diff --git a/Krivonosov/Makefile b/Krivonosov/Makefile index e234db4b..3889c476 100644 --- a/Krivonosov/Makefile +++ b/Krivonosov/Makefile @@ -4,7 +4,7 @@ all: dune build repl: - dune build ./REPL.exe && rlwrap _build/default/REPL.exe + dune build bin/REPL.exe && rlwrap _build/default/bin/REPL.exe tests: test test: diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index d08ae1bf..d71672e9 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -8,19 +8,28 @@ open Lambda_lib +(** Parse command line arguments*) +let parse_args args = + let rec parse max_steps = function + | [] -> max_steps + | "-max-steps" :: n :: rest -> + (match int_of_string_opt n with + | Some steps -> parse steps rest + | None -> failwith "Invalid value for -max-steps") + | arg :: _ -> failwith ("Unknown argument: " ^ arg) + in + parse 10000 args +;; + let () = - let max_steps = ref 10000 in - Stdlib.Arg.parse - [ "-max-steps", Int (fun n -> max_steps := n), "Maximum evaluation steps" ] - (fun _ -> failwith "No positional args") - "miniML REPL"; + let max_steps = parse_args (List.tl (Array.to_list Sys.argv)) in let input = In_channel.(input_all stdin) |> String.trim in match Parser.parse input with | Error e -> Format.printf "Error: %a\n%!" Parser.pp_error e; exit 1 | Result.Ok ast -> - (match Interpret.eval_expr ~max_steps:!max_steps ast with + (match Interpret.eval_expr ~max_steps ast with | Base.Result.Ok (Interpret.VInt n) -> Printf.printf "%d\n" n | Base.Result.Ok (Interpret.VClosure _) -> Printf.printf "\n" | Base.Result.Ok (Interpret.VBuiltin (name, _)) -> diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index eb8e40a6..bee8f1f3 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -11,7 +11,7 @@ open Base (** Monad signature with fail *) -module type MONAD_FAIL = sig +module type MonadFail = sig include Base.Monad.S2 val fail : 'e -> ('a, 'e) t @@ -33,22 +33,11 @@ type value = and environment = (string * value) list -module Interpret (M : MONAD_FAIL) : sig +module Interpret (M : MonadFail) : sig val run : max_steps:int -> string Ast.t -> (value, error) M.t end = struct open M - (** Step counter to prevent infinite loops *) - let step_counter = ref 0 - - let max_steps_limit = ref 10000 - - (** Increment step counter and check limit *) - let check_step () = - step_counter := !step_counter + 1; - if !step_counter > !max_steps_limit then fail `StepLimitExceeded else return () - ;; - (** Lookup variable in environment *) let lookup env name = match List.Assoc.find ~equal:String.equal env name with @@ -75,60 +64,62 @@ end = struct | _ -> fail `TypeMismatch ;; - (** Main evaluation function *) - let rec eval env expr = - check_step () - >>= fun () -> - match expr with - | Ast.Int n -> return (VInt n) - | Ast.Var name -> lookup env name - | Ast.Abs (param, body) -> return (VClosure (param, body, env)) - | Ast.BinOp (op, l, r) -> - eval env l >>= fun vl -> eval env r >>= fun vr -> eval_binop op vl vr - | Ast.If (cond, then_branch, else_branch_opt) -> - eval env cond - >>= (function - | VInt 0 -> - (match else_branch_opt with - | Some else_branch -> eval env else_branch - | None -> return (VInt 0)) - | VInt _ -> eval env then_branch - | _ -> fail `TypeMismatch) - | Ast.Let (is_rec, name, binding, body) -> - if is_rec - then ( - (* For recursive let, create environment with self-reference *) - match binding with - | Ast.Abs (param, func_body) -> - (* Create closure with recursive environment *) - let rec new_env = (name, VClosure (param, func_body, new_env)) :: env in - eval new_env body - | _ -> - (* Non-function recursive bindings not supported yet *) - eval env binding + (** Main evaluation function with step counter as parameter *) + let rec eval steps_remaining env expr = + if steps_remaining <= 0 + then fail `StepLimitExceeded + else ( + let steps = steps_remaining - 1 in + match expr with + | Ast.Int n -> return (VInt n) + | Ast.Var name -> lookup env name + | Ast.Abs (param, body) -> return (VClosure (param, body, env)) + | Ast.BinOp (op, l, r) -> + eval steps env l >>= fun vl -> eval steps env r >>= fun vr -> eval_binop op vl vr + | Ast.If (cond, then_branch, else_branch_opt) -> + eval steps env cond + >>= (function + | VInt 0 -> + (match else_branch_opt with + | Some else_branch -> eval steps env else_branch + | None -> return (VInt 0)) + | VInt _ -> eval steps env then_branch + | _ -> fail `TypeMismatch) + | Ast.Let (is_rec, name, binding, body) -> + if is_rec + then ( + (* For recursive let, create environment with self-reference *) + match binding with + | Ast.Abs (param, func_body) -> + (* Create closure with recursive environment *) + let rec new_env = (name, VClosure (param, func_body, new_env)) :: env in + eval steps new_env body + | _ -> + (* Non-function recursive bindings not supported yet *) + eval steps env binding + >>= fun value -> + let new_env = (name, value) :: env in + eval steps new_env body) + else + eval steps env binding >>= fun value -> let new_env = (name, value) :: env in - eval new_env body) - else - eval env binding - >>= fun value -> - let new_env = (name, value) :: env in - eval new_env body - | Ast.App (f, arg) -> - eval env f - >>= (function - | VClosure (param, body, closure_env) -> - eval env arg - >>= fun varg -> - let new_env = (param, varg) :: closure_env in - eval new_env body - | VBuiltin (_, builtin_fn) -> - eval env arg - >>= fun varg -> - (match builtin_fn varg with - | Base.Result.Ok v -> return v - | Base.Result.Error e -> fail e) - | _ -> fail `TypeMismatch) + eval steps new_env body + | Ast.App (f, arg) -> + eval steps env f + >>= (function + | VClosure (param, body, closure_env) -> + eval steps env arg + >>= fun varg -> + let new_env = (param, varg) :: closure_env in + eval steps new_env body + | VBuiltin (_, builtin_fn) -> + eval steps env arg + >>= fun varg -> + (match builtin_fn varg with + | Base.Result.Ok v -> return v + | Base.Result.Error e -> fail e) + | _ -> fail `TypeMismatch)) ;; (** Create initial environment with built-in functions *) @@ -148,12 +139,7 @@ end = struct [ "print", print_builtin ] ;; - let run ~max_steps expr = - (* Reset and set step limit *) - step_counter := 0; - max_steps_limit := max_steps; - eval (initial_env ()) expr - ;; + let run ~max_steps expr = eval max_steps (initial_env ()) expr end (** Public function to evaluate an AST expression *) From 607db62458bb63343a151f79e1a5e9c6fda06e7b Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Sun, 21 Dec 2025 20:27:20 +0300 Subject: [PATCH 41/42] add: QuickCheck testing with AST generators --- Krivonosov/.gitignore | 1 + Krivonosov/Krivonosov.opam | 6 +- Krivonosov/Krivonosov.opam.template | 3 - Krivonosov/bin/REPL.ml | 14 +- Krivonosov/dune-project | 3 + Krivonosov/lib/dune | 2 +- Krivonosov/lib/interpret.ml | 42 +---- Krivonosov/lib/interpret.mli | 3 - Krivonosov/lib/parser.ml | 8 +- Krivonosov/tests/dune | 2 +- Krivonosov/tests/interpret_tests.t | 67 +++++++ Krivonosov/tests/tests.ml | 274 ++++++++++++++++++++-------- 12 files changed, 288 insertions(+), 137 deletions(-) diff --git a/Krivonosov/.gitignore b/Krivonosov/.gitignore index 7102a822..e6d7abd6 100644 --- a/Krivonosov/.gitignore +++ b/Krivonosov/.gitignore @@ -4,3 +4,4 @@ _coverage /node_modules /esy.lock /.melange.eobjs +check-ci.sh diff --git a/Krivonosov/Krivonosov.opam b/Krivonosov/Krivonosov.opam index 49f1cff5..0464cd06 100644 --- a/Krivonosov/Krivonosov.opam +++ b/Krivonosov/Krivonosov.opam @@ -14,10 +14,13 @@ depends: [ "dune" {>= "3.7" & = "3.19.1"} "angstrom" {= "0.16.0"} "base" + "stdio" "ppx_inline_test" {with-test} "ppx_expect" "ppx_deriving" "bisect_ppx" + "qcheck" {with-test} + "qcheck-core" {with-test} "odoc" {with-doc} "ocamlformat" {build & = "0.26.2"} ] @@ -35,7 +38,4 @@ build: [ "@doc" {with-doc} ] ] -pin-depends: [ - ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] -] # Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Krivonosov/Krivonosov.opam.template b/Krivonosov/Krivonosov.opam.template index 480da691..83c4847c 100644 --- a/Krivonosov/Krivonosov.opam.template +++ b/Krivonosov/Krivonosov.opam.template @@ -1,4 +1 @@ -pin-depends: [ - ["ppx_deriving_qcheck.0.6" "git+https://github.com/c-cube/qcheck.git#42429bf06ba12373cad02b1404f50d0ad6238af5"] -] # Don't edit '*.opam' file manually. Use 'dune b @install' diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index d71672e9..fc93b5af 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -11,14 +11,20 @@ open Lambda_lib (** Parse command line arguments*) let parse_args args = let rec parse max_steps = function - | [] -> max_steps + | [] -> Some max_steps | "-max-steps" :: n :: rest -> (match int_of_string_opt n with | Some steps -> parse steps rest - | None -> failwith "Invalid value for -max-steps") - | arg :: _ -> failwith ("Unknown argument: " ^ arg) + | None -> + Printf.eprintf "Error: Invalid value for -max-steps: %s\n" n; + None) + | arg :: _ -> + Printf.eprintf "Error: Unknown argument: %s\n" arg; + None in - parse 10000 args + match parse 10000 args with + | Some max_steps -> max_steps + | None -> exit 1 ;; let () = diff --git a/Krivonosov/dune-project b/Krivonosov/dune-project index d6a2be34..6dea837a 100644 --- a/Krivonosov/dune-project +++ b/Krivonosov/dune-project @@ -27,10 +27,13 @@ (angstrom (= "0.16.0")) base + stdio (ppx_inline_test :with-test) ppx_expect ppx_deriving bisect_ppx + (qcheck :with-test) + (qcheck-core :with-test) (odoc :with-doc) (ocamlformat (and diff --git a/Krivonosov/lib/dune b/Krivonosov/lib/dune index 7e0688e4..c8dc6c2f 100644 --- a/Krivonosov/lib/dune +++ b/Krivonosov/lib/dune @@ -3,7 +3,7 @@ (public_name Krivonosov.Lib) (modules Ast Interpret Parser Print) (modules_without_implementation ast) - (libraries base angstrom) + (libraries base stdio angstrom) (preprocess (pps ppx_deriving.show)) (instrumentation diff --git a/Krivonosov/lib/interpret.ml b/Krivonosov/lib/interpret.ml index bee8f1f3..676e026b 100644 --- a/Krivonosov/lib/interpret.ml +++ b/Krivonosov/lib/interpret.ml @@ -54,7 +54,7 @@ end = struct | Ast.Div, VInt _, VInt 0 -> fail `DivisionByZero | Ast.Div, VInt a, VInt b -> return (VInt (a / b)) | Ast.Mod, VInt _, VInt 0 -> fail `DivisionByZero - | Ast.Mod, VInt a, VInt b -> return (VInt (a mod b)) + | Ast.Mod, VInt a, VInt b -> return (VInt (a % b)) | Ast.Eq, VInt a, VInt b -> return (VInt (if a = b then 1 else 0)) | Ast.Neq, VInt a, VInt b -> return (VInt (if a <> b then 1 else 0)) | Ast.Lt, VInt a, VInt b -> return (VInt (if a < b then 1 else 0)) @@ -130,10 +130,10 @@ end = struct ( "print" , fun v -> (match v with - | VInt n -> Stdlib.Printf.printf "%d\n%!" n - | VClosure _ -> Stdlib.Printf.printf "\n%!" - | VBuiltin (name, _) -> Stdlib.Printf.printf "\n%!" name - | VUnit -> Stdlib.Printf.printf "()\n%!"); + | VInt n -> Stdio.printf "%d\n%!" n + | VClosure _ -> Stdio.printf "\n%!" + | VBuiltin (name, _) -> Stdio.printf "\n%!" name + | VUnit -> Stdio.printf "()\n%!"); Base.Result.Ok VUnit ) in [ "print", print_builtin ] @@ -147,35 +147,3 @@ let eval_expr ?(max_steps = 10000) ast = let module I = Interpret (Base.Result) in I.run ~max_steps ast ;; - -let parse_and_run str = - let module I = Interpret (Base.Result) in - let open Base.Result in - let rez = - Parser.parse str - >>= fun ast -> - I.run ~max_steps:10000 ast - |> Result.map_error ~f:(fun e -> (e :> [ Parser.error | error ])) - in - match rez with - | Result.Ok (VInt n) -> Stdlib.Printf.printf "Success: %d\n" n - | Result.Ok (VClosure _) -> Stdlib.Printf.printf "Success: \n" - | Result.Ok (VBuiltin (name, _)) -> Stdlib.Printf.printf "Success: \n" name - | Result.Ok VUnit -> Stdlib.Printf.printf "Success: ()\n" - | Result.Error (#Parser.error as e) -> - (match e with - | `Parsing_error msg -> Format.eprintf "Parsing error: %s\n%!" msg); - Stdlib.exit 1 - | Result.Error (`UnknownVariable name) -> - Format.eprintf "Interpreter error: Unknown variable %s\n%!" name; - Stdlib.exit 1 - | Result.Error `DivisionByZero -> - Format.eprintf "Interpreter error: Division by zero\n%!"; - Stdlib.exit 1 - | Result.Error `TypeMismatch -> - Format.eprintf "Interpreter error: Type mismatch\n%!"; - Stdlib.exit 1 - | Result.Error `StepLimitExceeded -> - Format.eprintf "Interpreter error: Step limit exceeded\n%!"; - Stdlib.exit 1 -;; diff --git a/Krivonosov/lib/interpret.mli b/Krivonosov/lib/interpret.mli index 66a5c5dd..19210efd 100644 --- a/Krivonosov/lib/interpret.mli +++ b/Krivonosov/lib/interpret.mli @@ -25,6 +25,3 @@ and environment = (string * value) list (** Evaluate an AST expression with optional step limit *) val eval_expr : ?max_steps:int -> string Ast.t -> (value, error) Base.Result.t - -(** Parse and run a string (for testing) *) -val parse_and_run : string -> unit diff --git a/Krivonosov/lib/parser.ml b/Krivonosov/lib/parser.ml index 082c1701..a787611f 100644 --- a/Krivonosov/lib/parser.ml +++ b/Krivonosov/lib/parser.ml @@ -126,11 +126,9 @@ let pexpr = in (* Application: sequence of atoms *) let papp = - many1 patom - >>| function - | [] -> failwith "impossible: many1 returned empty list" - | [ x ] -> x - | x :: xs -> List.fold_left (fun acc e -> Ast.App (acc, e)) x xs + patom + >>= fun first -> + many patom >>| fun rest -> List.fold_left (fun acc e -> Ast.App (acc, e)) first rest in (* Binary operators with precedence *) (* Comparison operators: =, <>, <, >, <=, >= (lowest precedence) *) diff --git a/Krivonosov/tests/dune b/Krivonosov/tests/dune index a45e2867..ee1d9bb8 100644 --- a/Krivonosov/tests/dune +++ b/Krivonosov/tests/dune @@ -5,7 +5,7 @@ (library (name tests) (modules tests) - (libraries lambda_lib) + (libraries lambda_lib qcheck) (preprocess (pps ppx_expect ppx_deriving.show)) (instrumentation diff --git a/Krivonosov/tests/interpret_tests.t b/Krivonosov/tests/interpret_tests.t index 6e9c7fe9..f633a1aa 100644 --- a/Krivonosov/tests/interpret_tests.t +++ b/Krivonosov/tests/interpret_tests.t @@ -33,11 +33,35 @@ Comparison operators > 5 = 3 0 $ ../bin/REPL.exe < 5 <> 3 + 1 + $ ../bin/REPL.exe < 5 <> 5 + 0 + $ ../bin/REPL.exe < 3 < 5 1 $ ../bin/REPL.exe < 5 < 3 + 0 + $ ../bin/REPL.exe < 5 > 3 + 1 + $ ../bin/REPL.exe < 3 > 5 + 0 + $ ../bin/REPL.exe < 5 <= 5 1 + $ ../bin/REPL.exe < 6 <= 5 + 0 + $ ../bin/REPL.exe < 5 >= 5 + 1 + $ ../bin/REPL.exe < 4 >= 5 + 0 Conditional expressions $ ../bin/REPL.exe < if (3 > 2) then 42 else 0 42 + $ ../bin/REPL.exe < if 1 then 42 + 42 + $ ../bin/REPL.exe < if 0 then 42 + 0 Let bindings $ ../bin/REPL.exe < let x = 5 in let y = 10 in x * y 50 + $ ../bin/REPL.exe < let rec x = 42 in x + 42 Factorial with let rec $ ../bin/REPL.exe < print (fun x -> x) + + () + $ ../bin/REPL.exe < print print + + () + +Returning closures and builtins + $ ../bin/REPL.exe < fun x -> x + + $ ../bin/REPL.exe < print + Error handling - Division by zero $ ../bin/REPL.exe < 10 % 0 + Division by zero + [1] + Error handling - Unknown variable $ ../bin/REPL.exe < x + 5 @@ -126,6 +181,18 @@ Error handling - Type mismatch > (fun x -> x) + 5 Type error [1] + $ ../bin/REPL.exe < 5 + (fun x -> x) + Type error + [1] + $ ../bin/REPL.exe < 42 10 + Type error + [1] + $ ../bin/REPL.exe < if (fun x -> x) then 1 else 0 + Type error + [1] Step limit - Infinite loop with let rec $ ../bin/REPL.exe -max-steps 100 < x"; - true -;; - -(* Test round-trip for application *) -let%test "roundtrip: application" = - test_roundtrip "(fun x -> x) 5"; - true -;; - -(* Test round-trip for arithmetic *) -let%test "roundtrip: arithmetic" = - test_roundtrip "2 + 3"; - true -;; - -let%test "roundtrip: complex arithmetic" = - test_roundtrip "3 * 4 + 5"; - true -;; - -(* Test round-trip for if-then-else *) -let%test "roundtrip: if-then-else" = - test_roundtrip "if 1 then 5 else 10"; - true +(* Test all binary operators *) +let%expect_test "parse division" = + Format.printf "%s" (pp (parse_optimistically "10 / 2")); + [%expect {| BinOp (Div, Int 10, Int 2) |}] ;; -(* Test round-trip for let binding *) -let%test "roundtrip: let binding" = - test_roundtrip "let x = 5 in x + 3"; - true +let%expect_test "parse modulo" = + Format.printf "%s" (pp (parse_optimistically "10 % 3")); + [%expect {| BinOp (Mod, Int 10, Int 3) |}] ;; -(* Test round-trip for let rec *) -let%test "roundtrip: let rec" = - test_roundtrip - "let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 5"; - true +let%expect_test "parse equality" = + Format.printf "%s" (pp (parse_optimistically "5 = 5")); + [%expect {| BinOp (Eq, Int 5, Int 5) |}] ;; -(* Test round-trip for multi-parameter function *) -let%test "roundtrip: multi-param fun" = - test_roundtrip "fun x y z -> x + y + z"; - true +let%expect_test "parse not equal" = + Format.printf "%s" (pp (parse_optimistically "5 <> 3")); + [%expect {| BinOp (Neq, Int 5, Int 3) |}] ;; -(* Test round-trip for nested let *) -let%test "roundtrip: nested let" = - test_roundtrip "let x = 10 in let y = 20 in x + y"; - true +let%expect_test "parse less than" = + Format.printf "%s" (pp (parse_optimistically "3 < 5")); + [%expect {| BinOp (Lt, Int 3, Int 5) |}] +;; + +let%expect_test "parse greater than" = + Format.printf "%s" (pp (parse_optimistically "5 > 3")); + [%expect {| BinOp (Gt, Int 5, Int 3) |}] +;; + +let%expect_test "parse less or equal" = + Format.printf "%s" (pp (parse_optimistically "3 <= 5")); + [%expect {| BinOp (Leq, Int 3, Int 5) |}] +;; + +let%expect_test "parse greater or equal" = + Format.printf "%s" (pp (parse_optimistically "5 >= 3")); + [%expect {| BinOp (Geq, Int 5, Int 3) |}] +;; + +let%expect_test "parse if without else" = + Format.printf "%s" (pp (parse_optimistically "if 1 then 42")); + [%expect {| If (Int 1, Int 42, None) |}] +;; + +let%expect_test "parse if with else" = + Format.printf "%s" (pp (parse_optimistically "if 1 then 42 else 0")); + [%expect {| If (Int 1, Int 42, Some Int 0) |}] +;; + +let%expect_test "parse let without rec" = + Format.printf "%s" (pp (parse_optimistically "let x = 5 in x")); + [%expect {| Let (false, "x", Int 5, Var "x") |}] +;; + +let%expect_test "parse let rec" = + Format.printf "%s" (pp (parse_optimistically "let rec f = fun x -> x in f")); + [%expect {| Let (true, "f", Abs ("x", Var "x"), Var "f") |}] +;; + +(* ========================================================================== *) +(* QuickCheck Generators and Property-Based Tests *) +(* ========================================================================== *) + +(** Generator for variable names *) +let gen_name = + Gen.(oneofl [ "x"; "y"; "z"; "f"; "g"; "h"; "n"; "m"; "a"; "b"; "foo"; "bar"; "baz" ]) +;; + +(** Generator for binary operators *) +let gen_binop = Gen.oneofl Ast.[ Add; Sub; Mul; Div; Mod; Eq; Neq; Lt; Gt; Leq; Geq ] + +(** Generator for AST expressions with bounded depth + @param max_depth Maximum depth of the generated AST tree *) +let gen_ast max_depth = + let open Gen in + let rec gen_ast_sized depth = + if depth <= 0 + then + (* At max depth, generate only leaf nodes *) + oneof + [ map (fun n -> Ast.Int n) (int_range 0 100) + ; map (fun name -> Ast.Var name) gen_name + ] + else + (* Generate all kinds of expressions *) + frequency + [ (* Leaf nodes - higher weight for simpler expressions *) + 3, map (fun n -> Ast.Int n) (int_range 0 100) + ; 3, map (fun name -> Ast.Var name) gen_name (* Binary operations *) + ; ( 2 + , map3 + (fun op l r -> Ast.BinOp (op, l, r)) + gen_binop + (gen_ast_sized (depth - 1)) + (gen_ast_sized (depth - 1)) ) + (* Abstraction (lambda) *) + ; ( 2 + , map2 + (fun param body -> Ast.Abs (param, body)) + gen_name + (gen_ast_sized (depth - 1)) ) + (* Application *) + ; ( 2 + , map2 + (fun f arg -> Ast.App (f, arg)) + (gen_ast_sized (depth - 1)) + (gen_ast_sized (depth - 1)) ) + (* If-then-else *) + ; ( 1 + , map3 + (fun c t e -> Ast.If (c, t, Some e)) + (gen_ast_sized (depth - 1)) + (gen_ast_sized (depth - 1)) + (gen_ast_sized (depth - 1)) ) + (* Let binding (non-recursive only to avoid complexity) *) + ; ( 1 + , map3 + (fun name binding body -> Ast.Let (false, name, binding, body)) + gen_name + (gen_ast_sized (depth - 1)) + (gen_ast_sized (depth - 1)) ) + ] + in + gen_ast_sized max_depth +;; + +(** QuickCheck test: parse and print are inverses (round-trip property) + Property: for any AST, parsing the printed representation should yield the same AST *) +let test_roundtrip_property = + Test.make + ~name:"parse-print roundtrip" + ~count:1000 + (make (gen_ast 3)) + (fun ast -> + let printed = Lambda_lib.Print.print_expr ast in + match Parser.parse printed with + | Result.Ok reparsed -> ast = reparsed + | Result.Error _ -> + (* If parsing fails, this is also acceptable since our printer might produce + expressions that are syntactically valid but the parser doesn't handle *) + true) +;; + +(** QuickCheck test: printer always produces parseable output + Property: for any AST, the printed representation should be parseable *) +let test_printer_produces_parseable = + Test.make + ~name:"printer produces parseable output" + ~count:1000 + (make (gen_ast 3)) + (fun ast -> + let printed = Lambda_lib.Print.print_expr ast in + match Parser.parse printed with + | Result.Ok _ -> true + | Result.Error _ -> false) +;; + +(** QuickCheck test: print is deterministic + Property: printing the same AST twice should produce the same string *) +let test_printer_deterministic = + Test.make + ~name:"printer is deterministic" + ~count:1000 + (make (gen_ast 3)) + (fun ast -> + let printed1 = Lambda_lib.Print.print_expr ast in + let printed2 = Lambda_lib.Print.print_expr ast in + printed1 = printed2) +;; + +(** QuickCheck test: parser is deterministic + Property: parsing the same string twice should produce the same result *) +let test_parser_deterministic = + Test.make + ~name:"parser is deterministic" + ~count:1000 + (make Gen.(small_string ~gen:printable)) + (fun str -> + let result1 = Parser.parse str in + let result2 = Parser.parse str in + result1 = result2) +;; + +(* Run QuickCheck tests *) +let () = + let open QCheck_base_runner in + run_tests + [ test_roundtrip_property + ; test_printer_produces_parseable + ; test_printer_deterministic + ; test_parser_deterministic + ] + |> ignore ;; From 4f5e5b74f25ddc4f03c5d39fbf43b82d675d308d Mon Sep 17 00:00:00 2001 From: fUS1ONd Date: Mon, 22 Dec 2025 18:33:22 +0300 Subject: [PATCH 42/42] refactor: migrate REPL to Stdio/Base and fix CI issues --- Krivonosov/.zanuda | 2 +- Krivonosov/bin/REPL.ml | 52 ++++++++++++++++++++------------------- Krivonosov/bin/dune | 2 +- Krivonosov/lib/ast.mli | 2 +- Krivonosov/tests/tests.ml | 2 +- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Krivonosov/.zanuda b/Krivonosov/.zanuda index 0f09b19b..39f42da0 100644 --- a/Krivonosov/.zanuda +++ b/Krivonosov/.zanuda @@ -1 +1 @@ -forward mutability_check ignore REPL.ml +forward mutability_check ignore REPL.ml \ No newline at end of file diff --git a/Krivonosov/bin/REPL.ml b/Krivonosov/bin/REPL.ml index fc93b5af..387df54b 100644 --- a/Krivonosov/bin/REPL.ml +++ b/Krivonosov/bin/REPL.ml @@ -6,6 +6,8 @@ [@@@ocaml.text "/*"] +open Base +open Stdio open Lambda_lib (** Parse command line arguments*) @@ -13,44 +15,44 @@ let parse_args args = let rec parse max_steps = function | [] -> Some max_steps | "-max-steps" :: n :: rest -> - (match int_of_string_opt n with + (match Stdlib.int_of_string_opt n with | Some steps -> parse steps rest | None -> - Printf.eprintf "Error: Invalid value for -max-steps: %s\n" n; + eprintf "Error: Invalid value for -max-steps: %s\n" n; None) | arg :: _ -> - Printf.eprintf "Error: Unknown argument: %s\n" arg; + eprintf "Error: Unknown argument: %s\n" arg; None in match parse 10000 args with | Some max_steps -> max_steps - | None -> exit 1 + | None -> Stdlib.exit 1 ;; let () = - let max_steps = parse_args (List.tl (Array.to_list Sys.argv)) in - let input = In_channel.(input_all stdin) |> String.trim in + let max_steps = parse_args (List.tl_exn (Array.to_list (Sys.get_argv ()))) in + let input = In_channel.input_all In_channel.stdin |> String.strip in match Parser.parse input with | Error e -> - Format.printf "Error: %a\n%!" Parser.pp_error e; - exit 1 + let msg = Stdlib.Format.asprintf "%a" Parser.pp_error e in + eprintf "Error: %s\n" msg; + Stdlib.exit 1 | Result.Ok ast -> (match Interpret.eval_expr ~max_steps ast with - | Base.Result.Ok (Interpret.VInt n) -> Printf.printf "%d\n" n - | Base.Result.Ok (Interpret.VClosure _) -> Printf.printf "\n" - | Base.Result.Ok (Interpret.VBuiltin (name, _)) -> - Printf.printf "\n" name - | Base.Result.Ok Interpret.VUnit -> Printf.printf "()\n" - | Base.Result.Error (`UnknownVariable name) -> - Printf.eprintf "Unbound variable: %s\n" name; - exit 1 - | Base.Result.Error `DivisionByZero -> - Printf.eprintf "Division by zero\n"; - exit 1 - | Base.Result.Error `TypeMismatch -> - Printf.eprintf "Type error\n"; - exit 1 - | Base.Result.Error `StepLimitExceeded -> - Printf.eprintf "Step limit exceeded\n"; - exit 1) + | Result.Ok (Interpret.VInt n) -> printf "%d\n" n + | Result.Ok (Interpret.VClosure _) -> printf "\n" + | Result.Ok (Interpret.VBuiltin (name, _)) -> printf "\n" name + | Result.Ok Interpret.VUnit -> printf "()\n" + | Result.Error (`UnknownVariable name) -> + eprintf "Unbound variable: %s\n" name; + Stdlib.exit 1 + | Result.Error `DivisionByZero -> + eprintf "Division by zero\n"; + Stdlib.exit 1 + | Result.Error `TypeMismatch -> + eprintf "Type error\n"; + Stdlib.exit 1 + | Result.Error `StepLimitExceeded -> + eprintf "Step limit exceeded\n"; + Stdlib.exit 1) ;; diff --git a/Krivonosov/bin/dune b/Krivonosov/bin/dune index a03fbc3b..b61cc285 100644 --- a/Krivonosov/bin/dune +++ b/Krivonosov/bin/dune @@ -2,7 +2,7 @@ (name REPL) (public_name REPL) (modules REPL) - (libraries lambda_lib) + (libraries lambda_lib base stdio) (instrumentation (backend bisect_ppx))) diff --git a/Krivonosov/lib/ast.mli b/Krivonosov/lib/ast.mli index 07d57101..510fbd3b 100644 --- a/Krivonosov/lib/ast.mli +++ b/Krivonosov/lib/ast.mli @@ -22,7 +22,7 @@ type binop = | Leq (** [<=] *) | Geq (** [>=] *) -(** The main type for our AST (дерева абстрактного синтаксиса) *) +(** The main type for our AST *) type 'name t = | Var of 'name (** Variable [x] *) | Abs of 'name * 'name t (** Abstraction [λx.t] *) diff --git a/Krivonosov/tests/tests.ml b/Krivonosov/tests/tests.ml index 9064aa04..56e4f340 100644 --- a/Krivonosov/tests/tests.ml +++ b/Krivonosov/tests/tests.ml @@ -237,5 +237,5 @@ let () = ; test_printer_deterministic ; test_parser_deterministic ] - |> ignore + |> Stdlib.exit ;;