From 67edec760472c065642952a350e263ee04ce6fa4 Mon Sep 17 00:00:00 2001 From: danya Date: Mon, 16 Mar 2026 01:05:15 +0300 Subject: [PATCH 1/8] primitive repl + parser + interpreter + tests(ain`t working) + etc... --- Goncharov/.envrc | 1 + Goncharov/.gitignore | 6 + Goncharov/.ocamlformat | 2 + Goncharov/.zanuda | 1 + Goncharov/COPYING | 674 ++++++++++++++++++++++++++++++ Goncharov/COPYING.CC0 | 121 ++++++ Goncharov/COPYING.LESSER | 165 ++++++++ Goncharov/Goncharov.opam | 42 ++ Goncharov/Goncharov.opam.template | 4 + Goncharov/Makefile | 49 +++ Goncharov/bin/REPL.ml | 23 + Goncharov/bin/REPL.mli | 7 + Goncharov/bin/dune | 10 + Goncharov/bin/repl.t | 5 + Goncharov/dune | 7 + Goncharov/dune-project | 43 ++ Goncharov/lib/Pprintast.ml | 37 ++ Goncharov/lib/Pprintast.mli | 10 + Goncharov/lib/ast.mli | 37 ++ Goncharov/lib/dune | 20 + Goncharov/lib/interpret.ml | 122 ++++++ Goncharov/lib/interpret.mli | 9 + Goncharov/lib/parser.ml | 129 ++++++ Goncharov/lib/parser.mli | 25 ++ Goncharov/lib/tests.ml | 156 +++++++ Goncharov/lib/utils.ml | 14 + Goncharov/lib/utils.mli | 16 + Goncharov/tests/.gitignore | 1 + Goncharov/tests/dune | 9 + Goncharov/tests/mini_cli.ml | 14 + Goncharov/tests/mini_ml.t | 125 ++++++ 31 files changed, 1884 insertions(+) create mode 100644 Goncharov/.envrc create mode 100644 Goncharov/.gitignore create mode 100644 Goncharov/.ocamlformat create mode 100644 Goncharov/.zanuda create mode 100644 Goncharov/COPYING create mode 100644 Goncharov/COPYING.CC0 create mode 100644 Goncharov/COPYING.LESSER create mode 100644 Goncharov/Goncharov.opam create mode 100644 Goncharov/Goncharov.opam.template create mode 100644 Goncharov/Makefile create mode 100644 Goncharov/bin/REPL.ml create mode 100644 Goncharov/bin/REPL.mli create mode 100644 Goncharov/bin/dune create mode 100644 Goncharov/bin/repl.t create mode 100644 Goncharov/dune create mode 100644 Goncharov/dune-project create mode 100644 Goncharov/lib/Pprintast.ml create mode 100644 Goncharov/lib/Pprintast.mli create mode 100644 Goncharov/lib/ast.mli create mode 100644 Goncharov/lib/dune create mode 100644 Goncharov/lib/interpret.ml create mode 100644 Goncharov/lib/interpret.mli create mode 100644 Goncharov/lib/parser.ml create mode 100644 Goncharov/lib/parser.mli create mode 100644 Goncharov/lib/tests.ml create mode 100644 Goncharov/lib/utils.ml create mode 100644 Goncharov/lib/utils.mli create mode 100644 Goncharov/tests/.gitignore create mode 100644 Goncharov/tests/dune create mode 100644 Goncharov/tests/mini_cli.ml create mode 100644 Goncharov/tests/mini_ml.t diff --git a/Goncharov/.envrc b/Goncharov/.envrc new file mode 100644 index 00000000..a62ca0ac --- /dev/null +++ b/Goncharov/.envrc @@ -0,0 +1 @@ +eval $(opam env) diff --git a/Goncharov/.gitignore b/Goncharov/.gitignore new file mode 100644 index 00000000..7102a822 --- /dev/null +++ b/Goncharov/.gitignore @@ -0,0 +1,6 @@ +_build +_coverage +/_esy +/node_modules +/esy.lock +/.melange.eobjs diff --git a/Goncharov/.ocamlformat b/Goncharov/.ocamlformat new file mode 100644 index 00000000..97f97080 --- /dev/null +++ b/Goncharov/.ocamlformat @@ -0,0 +1,2 @@ +profile=janestreet +version=0.26.2 diff --git a/Goncharov/.zanuda b/Goncharov/.zanuda new file mode 100644 index 00000000..0f09b19b --- /dev/null +++ b/Goncharov/.zanuda @@ -0,0 +1 @@ +forward mutability_check ignore REPL.ml diff --git a/Goncharov/COPYING b/Goncharov/COPYING new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/Goncharov/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/Goncharov/COPYING.CC0 b/Goncharov/COPYING.CC0 new file mode 100644 index 00000000..0e259d42 --- /dev/null +++ b/Goncharov/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/Goncharov/COPYING.LESSER b/Goncharov/COPYING.LESSER new file mode 100644 index 00000000..0a041280 --- /dev/null +++ b/Goncharov/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/Goncharov/Goncharov.opam b/Goncharov/Goncharov.opam new file mode 100644 index 00000000..7ac37f92 --- /dev/null +++ b/Goncharov/Goncharov.opam @@ -0,0 +1,42 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +version: "0.1" +synopsis: "An interpreter for miniML" +description: + "FIXME. A longer description, for example, which are the most interesing features being supported, etc." +maintainer: ["Daniil Goncharov "] +authors: ["Daniil Goncharov "] +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" + "qcheck" {with-test} + "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/Goncharov/Goncharov.opam.template b/Goncharov/Goncharov.opam.template new file mode 100644 index 00000000..480da691 --- /dev/null +++ b/Goncharov/Goncharov.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/Goncharov/Makefile b/Goncharov/Makefile new file mode 100644 index 00000000..e234db4b --- /dev/null +++ b/Goncharov/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/Goncharov/bin/REPL.ml b/Goncharov/bin/REPL.ml new file mode 100644 index 00000000..0e86326d --- /dev/null +++ b/Goncharov/bin/REPL.ml @@ -0,0 +1,23 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib + +let () = + let () = + let open Stdlib.Arg in + parse + [] + (fun _ -> + Stdlib.Format.eprintf "Positioned arguments are not supported\n"; + Stdlib.exit 1) + "Read-Eval-Print-Loop for Utyped Lambda Calculus" + in + let input = In_channel.(input_all stdin) |> String.trim in + Interpret.parse_and_run input +;; \ No newline at end of file diff --git a/Goncharov/bin/REPL.mli b/Goncharov/bin/REPL.mli new file mode 100644 index 00000000..c1135e06 --- /dev/null +++ b/Goncharov/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/Goncharov/bin/dune b/Goncharov/bin/dune new file mode 100644 index 00000000..a03fbc3b --- /dev/null +++ b/Goncharov/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/Goncharov/bin/repl.t b/Goncharov/bin/repl.t new file mode 100644 index 00000000..39044df0 --- /dev/null +++ b/Goncharov/bin/repl.t @@ -0,0 +1,5 @@ + + $ ./REPL.exe -help + Read-Eval-Print-Loop for Utyped Lambda Calculus + -help Display this list of options + --help Display this list of options diff --git a/Goncharov/dune b/Goncharov/dune new file mode 100644 index 00000000..98e54536 --- /dev/null +++ b/Goncharov/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/Goncharov/dune-project b/Goncharov/dune-project new file mode 100644 index 00000000..ba244609 --- /dev/null +++ b/Goncharov/dune-project @@ -0,0 +1,43 @@ +(lang dune 3.7) + +(generate_opam_files true) + +(cram enable) + +(license "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception") + +(authors + "Daniil Goncharov ") + +(maintainers "Daniil Goncharov ") + +(bug_reports "https://github.com/Kakadu/fp25") + +(homepage "https://github.com/Kakadu/fp25") + +(package + (name Goncharov) ; FIXME and regenerate .opam file using 'dune build @install' + (synopsis "An interpreter for miniML") + (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 + (qcheck :with-test) + (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/Goncharov/lib/Pprintast.ml b/Goncharov/lib/Pprintast.ml new file mode 100644 index 00000000..67305a74 --- /dev/null +++ b/Goncharov/lib/Pprintast.ml @@ -0,0 +1,37 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(* Pretty printer goes here *) + +open Ast +let rec pp fmt = function + | Var v -> Format.fprintf fmt "%s" v + | Fun (x,e) -> Format.fprintf fmt "(%s -> %a)" x pp e + | App (e1,e2) -> Format.fprintf fmt "(%a %a)" pp e1 pp e2 + | Int i -> Format.fprintf fmt "%d" i + | Neg e -> Format.fprintf fmt "(-%a)" pp e + | Bin (op,e1,e2) -> + let bop = match op with + | Add -> "+" + | Sub -> "-" + | Mul -> "*" + | Div -> "/" + | Eq -> "=" + | Leq -> "<=" + | Geq -> ">=" + | Neq -> "<>" + | Lt -> "<" + | Gt -> ">" + in + Format.fprintf fmt "(%a %s %a)" pp e1 bop pp e2 + | If (e1,e2,e3) -> Format.fprintf fmt "(if %a then %a else %a)" pp e1 pp e2 pp e3 + | Let (x,e1,e2) -> Format.fprintf fmt "(let %s = %a in %a)" x pp e1 pp e2 + | LetRec (f,e1,e2) -> Format.fprintf fmt "(let rec %s = %a in %a)" f pp e1 pp e2 + | Fix -> Format.fprintf fmt "fix" +;; +let pp_hum = pp \ No newline at end of file diff --git a/Goncharov/lib/Pprintast.mli b/Goncharov/lib/Pprintast.mli new file mode 100644 index 00000000..1d7898f0 --- /dev/null +++ b/Goncharov/lib/Pprintast.mli @@ -0,0 +1,10 @@ +[@@@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 diff --git a/Goncharov/lib/ast.mli b/Goncharov/lib/ast.mli new file mode 100644 index 00000000..38665f3a --- /dev/null +++ b/Goncharov/lib/ast.mli @@ -0,0 +1,37 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) +type binop = + | Add + | Sub + | Mul + | Div + | Eq + | Leq + | Geq + | Lt + | Gt + | Neq + +[@@@ocaml.text "/*"] + +type name = string + +(** The main type for our AST (дерева абстрактного синтаксиса) *) +type 'name t = + | Var of 'name (** Variable [x] *) + | Fun of 'name * 'name t (** fun **) + | App of 'name t * 'name t (** Application [f g] *) + | Int of int + | Neg of 'name t + | Bin of binop * 'name t * 'name t + | If of 'name t * 'name t * 'name t + | Let of 'name * 'name t * 'name t + | LetRec of 'name * 'name t * 'name t + | Fix + +(* Application [f g ] *) +(** In type definition above the 3rd constructor is intentionally without documentation + to test linter *) diff --git a/Goncharov/lib/dune b/Goncharov/lib/dune new file mode 100644 index 00000000..b22e7cf7 --- /dev/null +++ b/Goncharov/lib/dune @@ -0,0 +1,20 @@ +(library + (name lambda_lib) + (public_name Goncharov.Lib) + (modules Ast Interpret Parser 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 qcheck) + (preprocess + (pps ppx_expect ppx_deriving.show)) + (instrumentation + (backend bisect_ppx)) + (inline_tests)) diff --git a/Goncharov/lib/interpret.ml b/Goncharov/lib/interpret.ml new file mode 100644 index 00000000..9f672873 --- /dev/null +++ b/Goncharov/lib/interpret.ml @@ -0,0 +1,122 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(** Real monadic interpreter goes here *) +open Ast +open Utils + +type error = [ `UnknownVariable of string | `Type_error of string | `Unbound | `DivisionByZero] + + +module Interpret (M : MONAD_FAIL) : sig + val run : int-> 'name Ast.t -> (int, [> error ]) M.t +end = struct + let ( let* ) m f = M.bind m ~f + type 'name value = + | VInt of int + | VClosure of 'name * 'name Ast.t * 'name env + | VFix + + and 'name env = ('name * 'name value) list + + let run (max_steps:int) (e: 'name Ast.t):(int,[> error]) M.t = + let rec eval steps env e = + if steps > max_steps then M.fail (`UnknownVariable "steps limit exceeded") + else ( + match e with + | Var v -> eval_var steps env v + | Fun (x,e) -> M.return (VClosure (x,e,env)) + | App (e1,e2) -> eval_app steps env e1 e2 + | Int i -> M.return (VInt i) + | Neg e -> eval_neg steps env e + | Bin (op,e1,e2) -> eval_bin steps env op e1 e2 + | If (e1,e2,e3) -> eval_if steps env e1 e2 e3 + | Let (x,e1,e2) -> eval_let steps env x e1 e2 + | Fix -> M.return VFix + | LetRec (f,Fun(x,b),e2) -> eval_letrec steps env f x b e2 + | LetRec _ -> M.fail (`Type_error "expected function on the right")) + and eval_var steps env e = + match env with + |[] -> M.fail (`Unbound) + |(y,v) :: rest -> if y = e then M.return v else eval_var (steps+1) rest e + and eval_neg steps env e = + let* v = eval (steps+1) env e in + match v with + | VInt x -> M.return (VInt(-x)) + | _ -> M.fail (`Type_error "not integer in Ast.Neg") + and eval_bin steps env op e1 e2 = + let* v1 = eval (steps+1) env e1 in + let* v2 = eval (steps+1) env e2 in + match op, v1, v2 with + | Add, VInt a, VInt b -> M.return (VInt (a + b)) + | Sub, VInt a, VInt b -> M.return (VInt (a - b)) + | Mul, VInt a, VInt b -> M.return (VInt (a * b)) + | Div, VInt _, VInt 0 -> M.fail (`DivisionByZero) + | Div, VInt a, VInt b -> M.return (VInt (a / b)) + | Leq, VInt a, VInt b -> M.return (VInt (if a <= b then 1 else 0)) + | Eq, VInt a, VInt b -> M.return (VInt (if a = b then 1 else 0)) + | Geq, VInt a, VInt b -> M.return (VInt (if a >= b then 1 else 0)) + | Lt, VInt a, VInt b -> M.return (VInt (if a< b then 1 else 0)) + | Gt, VInt a, VInt b -> M.return (VInt (if a > b then 1 else 0)) + | Neq, VInt a, VInt b -> M.return (VInt (if a <> b then 1 else 0)) + | _ -> M.fail (`Type_error "no such binary operation or operands are not integers") + and eval_let steps env x e1 e2 = + let* v1 = eval (steps+1) env e1 in eval (steps+1) ((x,v1)::env) e2 + and eval_if steps env e1 e2 e3 = + let* v1 = eval (steps+1) env e1 in + match v1 with + | VInt i -> if i = 1 then eval (steps+1) env e2 else eval (steps+1) env e3 + | _ -> M.fail (`Type_error "condition is not integer") + and eval_letrec steps env f x b e2 = + let rec env' = (f,VClosure(x,b,env'))::env in + eval (steps+1) env' e2 + and eval_app steps env e1 e2 = + let* f = eval (steps+1) env e1 in + match f with + |VClosure(x,body,denv) -> + let* arg = eval (steps+1) env e2 in + eval (steps+1) ((x,arg)::denv) body + |VFix -> eval_fix (steps+1) env e2 + | _ -> M.fail (`Type_error "error during app") + and eval_fix steps env e = + let* f = eval (steps+1) env e in + match f with + |VClosure (fx,fbody,denv) -> + (match fbody with + |Fun(x,body)-> + let rec self = VClosure(x,body,((fx,self)::denv)) in M.return self + | _ -> M.fail (`Type_error "fix expects function returning function")) + | _ -> M.fail (`Type_error "expected function") + and int_of_value = function + | VInt i -> M.return i + | VClosure _ -> M.fail (`UnknownVariable "cannot represent function as integer") + | VFix -> M.fail (`UnknownVariable "cannot represent fix as a value") + in + let* v = eval 0 [] e in + int_of_value v + ;; +end + +let parse_and_run ?(max_steps=10000) str = + let module I = Interpret (Base.Result) in + let rez = Base.Result.(Parser.parse str >>= I.run max_steps) 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 as err) -> + Format.eprintf "Interpreter error: %a\n%!" + (fun fmt -> function + | `UnknownVariable msg -> Format.fprintf fmt "Unknown variable: %s" msg + | `Type_error msg -> Format.fprintf fmt "Type error: %s" msg + | `Unbound -> Format.fprintf fmt "Unbound variable" + | `DivisionByZero -> Format.fprintf fmt "Division by zero") + err; + exit 1 +;; diff --git a/Goncharov/lib/interpret.mli b/Goncharov/lib/interpret.mli new file mode 100644 index 00000000..ca8c3aa4 --- /dev/null +++ b/Goncharov/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 : ?max_steps:int ->string -> unit diff --git a/Goncharov/lib/parser.ml b/Goncharov/lib/parser.ml new file mode 100644 index 00000000..94c45582 --- /dev/null +++ b/Goncharov/lib/parser.ml @@ -0,0 +1,129 @@ +(** Copyright 2021-2023, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +(* TODO: implement parser here *) +open Ast +open Angstrom + +let is_space = function + | ' ' | '\t' | '\n' | '\r' -> true + | _ -> false +;; + +let spaces = skip_while is_space +let spaces1 = take_while1 is_space + +let token p = spaces *> p +let token1 p = spaces1 *> p + + +let varname = + let* var = + take_while1 (function + | 'a' .. 'z' | '_' | '0' .. '9' | '\'' -> true + | _ -> false) + in + match var with + | s when s.[0] >= '0' && s.[0] <= '9' -> fail "variable starts with number" + | s when s.[0] = '\'' -> fail "variable starts with wrong symbol" + | "_" | "fun" | "if" | "then" | "else" | "let" | "in" | "rec" | "fix" -> fail"key word instead of variable" + | _ -> return var +;; + + +let is_digit = function + | '0' .. '9' -> true + | _ -> false +;; + +let integer = take_while1 is_digit >>| int_of_string + +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 + ; unary : dispatch -> string Ast.t Angstrom.t + ; mul_div : dispatch -> string Ast.t Angstrom.t + ; add_sub : dispatch -> string Ast.t Angstrom.t + ; comp : dispatch -> string Ast.t Angstrom.t + } + +let chainl1 p op = + let rec iter acc = + (let* f = op + and+ y = p in + iter (f acc y)) + <|> return acc + in + let* x = p in + iter x +;; +let mk_args args body = + List.fold_right (fun arg acc -> Ast.Fun (arg, acc)) args body +;; + +type error = [ `Parsing_error of string ] + + +let parse_lam = + let single pack = + fix (fun _ -> + conde + [ (token (char '(') *> pack.comp pack <* token (char ')')) "Parentheses expected" + ; (token (string "let") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.Let(name,mk_args args bind,body)) + ; (token (string "fun") *> many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body)) + ; ((many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body))) + ; (token (string "if") *> pack.comp pack >>= fun cond -> token (string "then")*> pack.comp pack>>= fun e1 -> token (string "else") *> pack.comp pack >>| fun e2 ->Ast.If(cond,e1,e2)) + ; (token (string "fix") *> return Ast.Fix) + ; (token (string "let") *> token (string "rec") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.LetRec(name,mk_args args bind,body)) + ; (token varname >>| fun var -> Ast.Var(var)) + ; ((token integer) >>| fun num -> Ast.Int(num)) + ]) + 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 + and unary pack = + fix(fun _ -> + (token (char '-')*> pack.apps pack >>| fun e ->Ast.Neg(e)) + <|> token (char '+')*> pack.apps pack <|> pack.apps pack) + and mul_div pack = + let op = + conde + [(token (char '*') *> return (fun l r -> Ast.Bin(Ast.Mul,l,r))) + ;(token (char '/') *> return (fun l r -> Ast.Bin(Ast.Div,l,r)))] + in chainl1 (pack.unary pack) op + and add_sub pack = + let op = + conde + [(token (char '+') *> return (fun l r -> Ast.Bin(Ast.Add,l,r))) + ;(token (char '-') *> return (fun l r -> Ast.Bin(Ast.Sub,l,r)))] + in chainl1 (pack.mul_div pack) op + and comp pack = + let op = + conde + [(token (string "<=")*> return (fun l r -> Ast.Bin(Ast.Leq,l,r))) + ;(token (string "=")*> return (fun l r -> Ast.Bin(Ast.Eq,l,r))) + ;(token (string ">=")*> return (fun l r -> Ast.Bin(Ast.Geq,l,r))) + ;(token (string "<")*> return (fun l r -> Ast.Bin(Ast.Lt,l,r))) + ;(token (string "<>")*> return (fun l r -> Ast.Bin(Ast.Neq,l,r))) + ;(token (string ">")*> return (fun l r -> Ast.Bin(Ast.Gt,l,r)))] + in chainl1(pack.add_sub pack) op + in + { single; apps; unary; mul_div; add_sub; comp } +;; + +let parse str = + match + Angstrom.parse_string (parse_lam.comp parse_lam) ~consume:Angstrom.Consume.All str + with + | Result.Ok x -> Result.Ok x + | Error er -> Result.Error (`Parsing_error er) +;; \ No newline at end of file diff --git a/Goncharov/lib/parser.mli b/Goncharov/lib/parser.mli new file mode 100644 index 00000000..86a1b841 --- /dev/null +++ b/Goncharov/lib/parser.mli @@ -0,0 +1,25 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +type error = [ `Parsing_error of string ] + + +(** 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 + ; unary : dispatch -> Ast.name Ast.t Angstrom.t + ; mul_div : dispatch -> Ast.name Ast.t Angstrom.t + ; add_sub : dispatch -> Ast.name Ast.t Angstrom.t + ; comp : dispatch -> string Ast.t Angstrom.t + } + +(* A collection of miniparsers *) +val parse_lam : dispatch \ No newline at end of file diff --git a/Goncharov/lib/tests.ml b/Goncharov/lib/tests.ml new file mode 100644 index 00000000..5f696314 --- /dev/null +++ b/Goncharov/lib/tests.ml @@ -0,0 +1,156 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib + +(* Property-based tests (QuickCheck) *) +open QCheck2 + +let binop_to_string = + Ast.( + function + | Add -> "+" + | Sub -> "-" + | Mul -> "*" + | Div -> "/" + | Leq -> "<=" + | Eq -> "=" + | Geq -> ">=" + | Neq -> "<>" + | Lt -> "<" + | Gt -> ">") +;; + + +let rec to_src = function + | Ast.Var v -> v + | Int i -> string_of_int i + | Neg e -> "(-" ^ to_src e ^ ")" + | Bin (op, l, r) -> "(" ^ to_src l ^ " " ^ binop_to_string op ^ " " ^ to_src r ^ ")" + | Fun (x, e) -> "fun " ^ x ^ " -> " ^ to_src e + | App (f, a) -> "(" ^ to_src f ^ " " ^ to_src a ^ ")" + | Let (x, e1, e2) -> "(let " ^ x ^ " = " ^ to_src e1 ^ " in " ^ to_src e2 ^ ")" + | LetRec (f, e1, e2) -> "(let rec " ^ f ^ " = " ^ to_src e1 ^ " in " ^ to_src e2 ^ ")" + | If (c, t, e) -> "(if " ^ to_src c ^ " then " ^ to_src t ^ " else " ^ to_src e ^ ")" + | Fix -> "fix" +;; + +let rec equal a b = + match a, b with + | Ast.Var x, Ast.Var y -> String.equal x y + | Int x, Int y -> x = y + | Neg x, Neg y -> equal x y + | Fun (x1, b1), Fun (x2, b2) -> String.equal x1 x2 && equal b1 b2 + | App (f1, a1), App (f2, a2) -> equal f1 f2 && equal a1 a2 + | Bin (op1, l1, r1), Bin (op2, l2, r2) -> op1 = op2 && equal l1 l2 && equal r1 r2 + | Let (x1, e1, b1), Let (x2, e2, b2) -> String.equal x1 x2 && equal e1 e2 && equal b1 b2 + | LetRec (f1, e1, b1), LetRec (f2, e2, b2) -> + String.equal f1 f2 && equal e1 e2 && equal b1 b2 + | If (c1, t1, e1), If (c2, t2, e2) -> equal c1 c2 && equal t1 t2 && equal e1 e2 + | Fix, Fix -> true + | _ -> false +;; + +let var_gen = + let names = [ "x"; "y"; "z"; "n"; "m"; "f" ] in + Gen.oneofl names +;; + +let binop_gen = Gen.oneofl Ast.[ Add; Sub; Mul; Div; Leq; Eq; Geq; Lt; Gt; Neq ] +let pprint_to_string ast = Format.asprintf "%a" Pprintast.pp ast + +let rec gen_ast depth = + let open QCheck2.Gen in + let base = + oneof [ + map (fun v -> Ast.Var v) var_gen; + map (fun i -> Ast.Int i) (int_bound 10); (* можно чуть увеличить *) + return Ast.Fix; + ] + in + + if depth <= 0 then base + else + oneof [ + base; + + (* fun только с одним аргументом *) + map2 (fun x body -> Ast.Fun (x, body)) + var_gen + (gen_ast (depth - 1)); + + (* приложение *) + map2 (fun f a -> Ast.App (f, a)) + (gen_ast (depth - 1)) + (gen_ast (depth - 1)); + + (* бинарные операции *) + map3 (fun op l r -> Ast.Bin (op, l, r)) + binop_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)); + + (* let *) + map3 (fun x e1 e2 -> Ast.Let (x, e1, e2)) + var_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)); + + (* let rec — тоже только один аргумент в функции *) + map4 (fun f x body e2 -> Ast.LetRec (f, Ast.Fun (x, body), e2)) + var_gen + var_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)); + + (* if *) + map3 (fun c t e -> Ast.If (c, t, e)) + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + (gen_ast (depth - 1)); + + (* унарный минус — добавим для полноты *) + map (fun e -> Ast.Neg e) (gen_ast (depth - 1)); + ] + +let gen_ast_sized = + let open Gen in + sized (fun s -> gen_ast (3 + (s mod 3))) +;; + +let prop_parse_print_roundtrip = + QCheck2.Test.make + ~count:200 + ~name:"parser/to_src roundtrip" + ~print:to_src + gen_ast_sized + (fun ast -> + match Parser.parse (to_src ast) with + | Result.Ok ast' -> equal ast ast' + | Result.Error _ -> false) +;; + +let prop_parse_pprint_roundtrip = + QCheck2.Test.make + ~count:200 + ~name:"parser/pprint roundtrip" + ~print:pprint_to_string + gen_ast_sized + (fun ast -> + match Parser.parse (pprint_to_string ast) with + | Result.Ok ast' -> equal ast ast' + | Result.Error _ -> false) +;; + +let%test_unit "parser/to_src roundtrip" = + QCheck2.Test.check_exn prop_parse_print_roundtrip +;; + +let%test_unit "parser/pprint roundtrip" = + QCheck2.Test.check_exn prop_parse_pprint_roundtrip +;; \ No newline at end of file diff --git a/Goncharov/lib/utils.ml b/Goncharov/lib/utils.ml new file mode 100644 index 00000000..e7a203af --- /dev/null +++ b/Goncharov/lib/utils.ml @@ -0,0 +1,14 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +(* TODO: rework this *) +module type MONAD_FAIL = sig + include Base.Monad.S2 + + val fail : 'e -> ('a, 'e) t +end diff --git a/Goncharov/lib/utils.mli b/Goncharov/lib/utils.mli new file mode 100644 index 00000000..eacdb868 --- /dev/null +++ b/Goncharov/lib/utils.mli @@ -0,0 +1,16 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + + +(** Smart constructors *) + +module type MONAD_FAIL = sig + include Base.Monad.S2 + + val fail : 'e -> ('a, 'e) t +end diff --git a/Goncharov/tests/.gitignore b/Goncharov/tests/.gitignore new file mode 100644 index 00000000..26685e79 --- /dev/null +++ b/Goncharov/tests/.gitignore @@ -0,0 +1 @@ +lam*.txt \ No newline at end of file diff --git a/Goncharov/tests/dune b/Goncharov/tests/dune new file mode 100644 index 00000000..7d7d9cf7 --- /dev/null +++ b/Goncharov/tests/dune @@ -0,0 +1,9 @@ +(executable + (name mini_cli) + (modules mini_cli) + (libraries lambda_lib base) + (instrumentation + (backend bisect_ppx))) +(cram + (applies_to mini_ml) + (deps ./mini_cli.exe)) \ No newline at end of file diff --git a/Goncharov/tests/mini_cli.ml b/Goncharov/tests/mini_cli.ml new file mode 100644 index 00000000..7c04064d --- /dev/null +++ b/Goncharov/tests/mini_cli.ml @@ -0,0 +1,14 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + +open Lambda_lib + +let () = + let input = In_channel.input_all In_channel.stdin |> String.trim in + Interpret.parse_and_run input +;; \ No newline at end of file diff --git a/Goncharov/tests/mini_ml.t b/Goncharov/tests/mini_ml.t new file mode 100644 index 00000000..5c7a9368 --- /dev/null +++ b/Goncharov/tests/mini_ml.t @@ -0,0 +1,125 @@ + $ ./mini_cli.exe << 'EOF' + > 1 + 2 * 3 + > EOF + Success: 7 + + $ ./mini_cli.exe <<'EOF' + > let rec fact = fun n -> if n = 1 then 1 else n * fact (n-1) in fact 4 + > EOF + Success: 24 + + $ ./mini_cli.exe <<'EOF' + > fix (fun fib -> fun n -> if n = 0 then 0 else if n = 1 then 1 else fib (n-1) + fib (n-2)) 6 + > EOF + Success: 8 + + $ ./mini_cli.exe <<'EOF' + > -3 + 10 / 2 + > EOF + Success: 2 + + $ ./mini_cli.exe <<'EOF' + > let add = fun x -> fun y -> x + y in add 2 3 + > EOF + Success: 5 + + $ ./mini_cli.exe <<'EOF' + > let x = 5 in let y = 2 in x - y + > EOF + Success: 3 + + $ ./mini_cli.exe <<'EOF' + > if 2 <= 3 then 7 else 9 + > EOF + Success: 7 + + $ ./mini_cli.exe <<'EOF' + > if 3 >= 4 then 1 else 0 + > EOF + Success: 0 + + $ ./mini_cli.exe <<'EOF' + > fix (fun f -> fun x -> x + 1) 4 + > EOF + Success: 5 + + $ ./mini_cli.exe <<'EOF' + > fix (fun f -> fun n -> f n) 0 + > EOF + Interpreter error: Unknown variable: steps limit exceeded + + $ ./mini_cli.exe <<'EOF' + > x + > EOF + Interpreter error: Unbound variable + + $ ./mini_cli.exe <<'EOF' + > x -> x -> x + x + > EOF + Interpreter error: Unknown variable: cannot represent function as integer + + $ ./mini_cli.exe <<'EOF' + > 1 / 0 + > EOF + Interpreter error: Division by zero + + $ ./mini_cli.exe <<'EOF' + > - (fun x -> x) + > EOF + Interpreter error: Type error: not integer in Ast.Neg + + $ ./mini_cli.exe <<'EOF' + > (fun x -> x) + 1 + > EOF + Interpreter error: Type error: no such binary operation or operands are not integers + + $ ./mini_cli.exe <<'EOF' + > 1 2 + > EOF + Interpreter error: Type error: error during app + + $ ./mini_cli.exe <<'EOF' + > if (fun x -> x) then 1 else 2 + > EOF + Interpreter error: Type error: condition is not integer + + $ ./mini_cli.exe <<'EOF' + > let rec f = 1 in f + > EOF + Interpreter error: Type error: expected function on the right + + $ ./mini_cli.exe <<'EOF' + > fix (fun f -> 1) + > EOF + Interpreter error: Type error: fix expects function returning function + + $ ./mini_cli.exe <<'EOF' + > fix 1 + > EOF + Interpreter error: Type error: expected function + + $ ./mini_cli.exe << 'EOF' + > let fun = 1 in fun + > EOF + Parsing error + + $ ./mini_cli.exe << 'EOF' + > let ifx a b = a+b in + > let theny = 2 in + > let elsez = 1 in + > ifx theny elsez + > EOF + Success: 3 + + $ ./mini_cli.exe << 'EOF' + > let x a b = a+b in + > let theny = 0 in + > let elsez = 1 in + > ifx theny elsez then 1 else 2 + > EOF + Parsing error + + $ ./mini_cli.exe << 'EOF' + > let x = 1 inx + > EOF + Parsing error From 1ea26b3cc284af4826686da76b6715a4e709dc3b Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 14:09:23 +0300 Subject: [PATCH 2/8] =added builtin functions, fixed tests, extended repl --- Goncharov/bin/REPL.ml | 40 +++-- Goncharov/bin/repl.t | 5 - Goncharov/lib/Pprintast.ml | 3 +- Goncharov/lib/ast.mli | 5 +- Goncharov/lib/dune | 2 +- Goncharov/lib/interpret.ml | 157 +++++++++-------- Goncharov/lib/parser.ml | 21 ++- Goncharov/lib/parser.mli | 4 +- Goncharov/lib/tests.ml | 20 +-- Goncharov/lib/utils.ml | 14 -- Goncharov/lib/utils.mli | 16 -- Goncharov/tests/mini_ml.t | 336 ++++++++++++++++++++++++++++++++----- 12 files changed, 435 insertions(+), 188 deletions(-) delete mode 100644 Goncharov/bin/repl.t delete mode 100644 Goncharov/lib/utils.ml delete mode 100644 Goncharov/lib/utils.mli diff --git a/Goncharov/bin/REPL.ml b/Goncharov/bin/REPL.ml index 0e86326d..fd4f00e3 100644 --- a/Goncharov/bin/REPL.ml +++ b/Goncharov/bin/REPL.ml @@ -8,16 +8,34 @@ open Lambda_lib -let () = - let () = - let open Stdlib.Arg in - parse - [] - (fun _ -> - Stdlib.Format.eprintf "Positioned arguments are not supported\n"; - Stdlib.exit 1) - "Read-Eval-Print-Loop for Utyped Lambda Calculus" +let extract_steps line = + let prefix = ":max_steps" in + let rest = + String.sub line (String.length prefix) (String.length line - String.length prefix) + |> String.trim in - let input = In_channel.(input_all stdin) |> String.trim in - Interpret.parse_and_run input + int_of_string rest +;; + + +let run_line max_steps line = Interpret.parse_and_run ~max_steps line + +let rec repl ~(max_steps : int) = + print_string "repl_miniml> "; + Out_channel.flush stdout; + match In_channel.input_line stdin with + | None -> () + | Some line -> + (match String.trim line with + | line when String.equal line "" -> repl ~max_steps + | line when String.equal line ":quit" || String.equal line ":q" -> () + | line when String.starts_with ~prefix:":max_steps" line -> + repl ~max_steps:(extract_steps line) + | _ -> + run_line max_steps line; + repl ~max_steps) +;; + +let () = + repl ~max_steps:10000 ;; \ No newline at end of file diff --git a/Goncharov/bin/repl.t b/Goncharov/bin/repl.t deleted file mode 100644 index 39044df0..00000000 --- a/Goncharov/bin/repl.t +++ /dev/null @@ -1,5 +0,0 @@ - - $ ./REPL.exe -help - Read-Eval-Print-Loop for Utyped Lambda Calculus - -help Display this list of options - --help Display this list of options diff --git a/Goncharov/lib/Pprintast.ml b/Goncharov/lib/Pprintast.ml index 67305a74..e535c6aa 100644 --- a/Goncharov/lib/Pprintast.ml +++ b/Goncharov/lib/Pprintast.ml @@ -32,6 +32,5 @@ let rec pp fmt = function | If (e1,e2,e3) -> Format.fprintf fmt "(if %a then %a else %a)" pp e1 pp e2 pp e3 | Let (x,e1,e2) -> Format.fprintf fmt "(let %s = %a in %a)" x pp e1 pp e2 | LetRec (f,e1,e2) -> Format.fprintf fmt "(let rec %s = %a in %a)" f pp e1 pp e2 - | Fix -> Format.fprintf fmt "fix" ;; -let pp_hum = pp \ No newline at end of file +let pp_hum = pp diff --git a/Goncharov/lib/ast.mli b/Goncharov/lib/ast.mli index 38665f3a..a415d17f 100644 --- a/Goncharov/lib/ast.mli +++ b/Goncharov/lib/ast.mli @@ -30,8 +30,5 @@ type 'name t = | If of 'name t * 'name t * 'name t | Let of 'name * 'name t * 'name t | LetRec of 'name * 'name t * 'name t - | Fix -(* Application [f g ] *) -(** In type definition above the 3rd constructor is intentionally without documentation - to test linter *) + diff --git a/Goncharov/lib/dune b/Goncharov/lib/dune index b22e7cf7..1ef16fde 100644 --- a/Goncharov/lib/dune +++ b/Goncharov/lib/dune @@ -1,7 +1,7 @@ (library (name lambda_lib) (public_name Goncharov.Lib) - (modules Ast Interpret Parser Pprintast utils) + (modules Ast Interpret Parser Pprintast) (modules_without_implementation ast) (libraries base angstrom) (preprocess diff --git a/Goncharov/lib/interpret.ml b/Goncharov/lib/interpret.ml index 9f672873..94bcce29 100644 --- a/Goncharov/lib/interpret.ml +++ b/Goncharov/lib/interpret.ml @@ -8,70 +8,98 @@ (** Real monadic interpreter goes here *) open Ast -open Utils +open Pprintast -type error = [ `UnknownVariable of string | `Type_error of string | `Unbound | `DivisionByZero] +type error = UnknownVariable of string | Type_error of string | Unbound | DivisionByZero +type output = OUnit | OInt of int | OFun of string * string Ast.t | OBuiltin of string -module Interpret (M : MONAD_FAIL) : sig - val run : int-> 'name Ast.t -> (int, [> error ]) M.t +module Interpret : sig + val run : int -> string Ast.t -> (output, error) result end = struct - let ( let* ) m f = M.bind m ~f - type 'name value = + let ( let* ) m f = + match m with + | Ok x -> f x + | Error e -> Error e + ;; + let return x = Ok x + let fail x = Error x + let (>>=) = (let*) + + type value = | VInt of int - | VClosure of 'name * 'name Ast.t * 'name env - | VFix + | VUnit + | VClosure of string * string Ast.t * env + | VBuiltin of (value -> (value, error) result) + + and env = (string * value) list - and 'name env = ('name * 'name value) list + let builtin_print : value = + VBuiltin (function + | VInt n -> + print_int n; + print_newline (); + return (VInt 0) + | _ -> fail (Type_error "print expects integer")) + ;; + + let builtin_fix : value = + VClosure ("f",App (Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v")))),Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v"))))),[]) + ;; + + let initial_env : env = [ + ("print", builtin_print); + ("fix", builtin_fix); + ] - let run (max_steps:int) (e: 'name Ast.t):(int,[> error]) M.t = + let run (max_steps:int) (e: string Ast.t):(output, error) result = let rec eval steps env e = - if steps > max_steps then M.fail (`UnknownVariable "steps limit exceeded") + if steps > max_steps then fail (UnknownVariable "steps limit exceeded") else ( match e with | Var v -> eval_var steps env v - | Fun (x,e) -> M.return (VClosure (x,e,env)) + | Fun (x,e) -> return (VClosure (x,e,env)) | App (e1,e2) -> eval_app steps env e1 e2 - | Int i -> M.return (VInt i) + | Int i -> return (VInt i) | Neg e -> eval_neg steps env e | Bin (op,e1,e2) -> eval_bin steps env op e1 e2 | If (e1,e2,e3) -> eval_if steps env e1 e2 e3 | Let (x,e1,e2) -> eval_let steps env x e1 e2 - | Fix -> M.return VFix | LetRec (f,Fun(x,b),e2) -> eval_letrec steps env f x b e2 - | LetRec _ -> M.fail (`Type_error "expected function on the right")) + | LetRec _ -> fail (Type_error "expected function on the right")) + and eval_var steps env e = match env with - |[] -> M.fail (`Unbound) - |(y,v) :: rest -> if y = e then M.return v else eval_var (steps+1) rest e + |[] -> fail (Unbound) + |(y,v) :: rest -> if y = e then return v else eval_var (steps+1) rest e and eval_neg steps env e = let* v = eval (steps+1) env e in match v with - | VInt x -> M.return (VInt(-x)) - | _ -> M.fail (`Type_error "not integer in Ast.Neg") + | VInt x -> return (VInt(-x)) + | _ -> fail (Type_error "not integer in Ast.Neg") and eval_bin steps env op e1 e2 = let* v1 = eval (steps+1) env e1 in let* v2 = eval (steps+1) env e2 in match op, v1, v2 with - | Add, VInt a, VInt b -> M.return (VInt (a + b)) - | Sub, VInt a, VInt b -> M.return (VInt (a - b)) - | Mul, VInt a, VInt b -> M.return (VInt (a * b)) - | Div, VInt _, VInt 0 -> M.fail (`DivisionByZero) - | Div, VInt a, VInt b -> M.return (VInt (a / b)) - | Leq, VInt a, VInt b -> M.return (VInt (if a <= b then 1 else 0)) - | Eq, VInt a, VInt b -> M.return (VInt (if a = b then 1 else 0)) - | Geq, VInt a, VInt b -> M.return (VInt (if a >= b then 1 else 0)) - | Lt, VInt a, VInt b -> M.return (VInt (if a< b then 1 else 0)) - | Gt, VInt a, VInt b -> M.return (VInt (if a > b then 1 else 0)) - | Neq, VInt a, VInt b -> M.return (VInt (if a <> b then 1 else 0)) - | _ -> M.fail (`Type_error "no such binary operation or operands are not integers") + | Add, VInt a, VInt b -> return (VInt (a + b)) + | Sub, VInt a, VInt b -> return (VInt (a - b)) + | Mul, VInt a, VInt b -> return (VInt (a * b)) + | Div, VInt _, VInt 0 -> fail (DivisionByZero) + | Div, VInt a, VInt b -> return (VInt (a / b)) + | Leq, VInt a, VInt b -> return (VInt (if a <= b then 1 else 0)) + | Eq, VInt a, VInt b -> return (VInt (if a = b then 1 else 0)) + | Geq, VInt a, VInt b -> return (VInt (if a >= b then 1 else 0)) + | Lt, VInt a, VInt b -> return (VInt (if a< b then 1 else 0)) + | Gt, VInt a, VInt b -> return (VInt (if a > b then 1 else 0)) + | Neq, VInt a, VInt b -> return (VInt (if a <> b then 1 else 0)) + | _ -> fail (Type_error "no such binary operation or operands are not integers") and eval_let steps env x e1 e2 = let* v1 = eval (steps+1) env e1 in eval (steps+1) ((x,v1)::env) e2 and eval_if steps env e1 e2 e3 = let* v1 = eval (steps+1) env e1 in match v1 with - | VInt i -> if i = 1 then eval (steps+1) env e2 else eval (steps+1) env e3 - | _ -> M.fail (`Type_error "condition is not integer") + | VInt i -> if i <> 0 then eval (steps+1) env e2 else eval (steps+1) env e3 + | _ -> fail (Type_error "condition is not integer") and eval_letrec steps env f x b e2 = let rec env' = (f,VClosure(x,b,env'))::env in eval (steps+1) env' e2 @@ -81,42 +109,39 @@ end = struct |VClosure(x,body,denv) -> let* arg = eval (steps+1) env e2 in eval (steps+1) ((x,arg)::denv) body - |VFix -> eval_fix (steps+1) env e2 - | _ -> M.fail (`Type_error "error during app") - and eval_fix steps env e = - let* f = eval (steps+1) env e in - match f with - |VClosure (fx,fbody,denv) -> - (match fbody with - |Fun(x,body)-> - let rec self = VClosure(x,body,((fx,self)::denv)) in M.return self - | _ -> M.fail (`Type_error "fix expects function returning function")) - | _ -> M.fail (`Type_error "expected function") - and int_of_value = function - | VInt i -> M.return i - | VClosure _ -> M.fail (`UnknownVariable "cannot represent function as integer") - | VFix -> M.fail (`UnknownVariable "cannot represent fix as a value") + |VBuiltin g -> + let* arg = eval (steps+1) env e2 in g arg + | _ -> fail (Type_error "error during app") + and print = function + | VInt i -> return (OInt i) + | VClosure (x,e,_) -> return (OFun(x,e)) + | VBuiltin _ -> return (OBuiltin "") + | VUnit -> return OUnit in - let* v = eval 0 [] e in - int_of_value v + let* v = eval 0 initial_env e in + print v ;; end +open Interpret + let parse_and_run ?(max_steps=10000) str = - let module I = Interpret (Base.Result) in - let rez = Base.Result.(Parser.parse str >>= I.run max_steps) 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 as err) -> - Format.eprintf "Interpreter error: %a\n%!" - (fun fmt -> function - | `UnknownVariable msg -> Format.fprintf fmt "Unknown variable: %s" msg - | `Type_error msg -> Format.fprintf fmt "Type error: %s" msg - | `Unbound -> Format.fprintf fmt "Unbound variable" - | `DivisionByZero -> Format.fprintf fmt "Division by zero") - err; + match Parser.parse str with + | Ok ast -> + (match run max_steps ast with + | Ok n -> + (match n with + | OUnit -> Printf.printf "Success: Unit\n" + | OInt n -> Printf.printf "Success: %d\n" n + | OFun (p, b) -> Printf.printf "Success: fun %s -> %s\n" p (Format.asprintf "%a" pp b) + | OBuiltin name -> Printf.printf "Success: \n" name) + | Error err -> + (match err with + | UnknownVariable x -> Printf.eprintf "Interpreter error: Unknown variable: %s\n%!" x + | Type_error msg -> Printf.eprintf "Interpreter error: Type error: %s\n%!" msg + | DivisionByZero -> Printf.eprintf "Interpreter error: Division by zero\n%!" + | Unbound -> Printf.eprintf "Interpreter error: Unbound variable\n%!" )) + | Error _ -> + Printf.eprintf "Parsing error\n%!"; exit 1 -;; +;; \ No newline at end of file diff --git a/Goncharov/lib/parser.ml b/Goncharov/lib/parser.ml index 94c45582..0c64c3d2 100644 --- a/Goncharov/lib/parser.ml +++ b/Goncharov/lib/parser.ml @@ -27,7 +27,7 @@ let varname = match var with | s when s.[0] >= '0' && s.[0] <= '9' -> fail "variable starts with number" | s when s.[0] = '\'' -> fail "variable starts with wrong symbol" - | "_" | "fun" | "if" | "then" | "else" | "let" | "in" | "rec" | "fix" -> fail"key word instead of variable" + | "fun" | "if" | "then" | "else" | "let" | "in" | "rec" -> fail"key word instead of variable" | _ -> return var ;; @@ -67,7 +67,7 @@ let mk_args args body = List.fold_right (fun arg acc -> Ast.Fun (arg, acc)) args body ;; -type error = [ `Parsing_error of string ] +type error = Parsing_error of string let parse_lam = @@ -75,12 +75,11 @@ let parse_lam = fix (fun _ -> conde [ (token (char '(') *> pack.comp pack <* token (char ')')) "Parentheses expected" - ; (token (string "let") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.Let(name,mk_args args bind,body)) - ; (token (string "fun") *> many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body)) + ; (token (string "let" *> spaces1) *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.Let(name,mk_args args bind,body)) + ; (token (string "fun"*> spaces1) *> many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body)) ; ((many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body))) - ; (token (string "if") *> pack.comp pack >>= fun cond -> token (string "then")*> pack.comp pack>>= fun e1 -> token (string "else") *> pack.comp pack >>| fun e2 ->Ast.If(cond,e1,e2)) - ; (token (string "fix") *> return Ast.Fix) - ; (token (string "let") *> token (string "rec") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.LetRec(name,mk_args args bind,body)) + ; (token (string "if" *> spaces1) *> pack.comp pack >>= fun cond -> token (string "then")*> pack.comp pack>>= fun e1 -> token (string "else") *> pack.comp pack >>| fun e2 ->Ast.If(cond,e1,e2)) + ; (token (string "let") *> token1 (string "rec") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.LetRec(name,mk_args args bind,body)) ; (token varname >>| fun var -> Ast.Var(var)) ; ((token integer) >>| fun num -> Ast.Int(num)) ]) @@ -93,7 +92,7 @@ let parse_lam = and unary pack = fix(fun _ -> (token (char '-')*> pack.apps pack >>| fun e ->Ast.Neg(e)) - <|> token (char '+')*> pack.apps pack <|> pack.apps pack) + <|> (token (char '+')*> pack.apps pack <|> pack.apps pack)) and mul_div pack = let op = conde @@ -110,10 +109,10 @@ let parse_lam = let op = conde [(token (string "<=")*> return (fun l r -> Ast.Bin(Ast.Leq,l,r))) - ;(token (string "=")*> return (fun l r -> Ast.Bin(Ast.Eq,l,r))) + ;(token (string "<>")*> return (fun l r -> Ast.Bin(Ast.Neq,l,r))) ;(token (string ">=")*> return (fun l r -> Ast.Bin(Ast.Geq,l,r))) ;(token (string "<")*> return (fun l r -> Ast.Bin(Ast.Lt,l,r))) - ;(token (string "<>")*> return (fun l r -> Ast.Bin(Ast.Neq,l,r))) + ;(token (string "=")*> return (fun l r -> Ast.Bin(Ast.Eq,l,r))) ;(token (string ">")*> return (fun l r -> Ast.Bin(Ast.Gt,l,r)))] in chainl1(pack.add_sub pack) op in @@ -125,5 +124,5 @@ let parse str = Angstrom.parse_string (parse_lam.comp parse_lam) ~consume:Angstrom.Consume.All str with | Result.Ok x -> Result.Ok x - | Error er -> Result.Error (`Parsing_error er) + | Error er -> Result.Error (Parsing_error er) ;; \ No newline at end of file diff --git a/Goncharov/lib/parser.mli b/Goncharov/lib/parser.mli index 86a1b841..5e8381e0 100644 --- a/Goncharov/lib/parser.mli +++ b/Goncharov/lib/parser.mli @@ -6,11 +6,11 @@ [@@@ocaml.text "/*"] -type error = [ `Parsing_error of string ] +type error = Parsing_error of string (** Main entry of parser *) -val parse : string -> (Ast.name Ast.t, [> error ]) result +val parse : string -> (Ast.name Ast.t, error) result type dispatch = { apps : dispatch -> Ast.name Ast.t Angstrom.t diff --git a/Goncharov/lib/tests.ml b/Goncharov/lib/tests.ml index 5f696314..7f2eba9b 100644 --- a/Goncharov/lib/tests.ml +++ b/Goncharov/lib/tests.ml @@ -32,12 +32,11 @@ let rec to_src = function | Int i -> string_of_int i | Neg e -> "(-" ^ to_src e ^ ")" | Bin (op, l, r) -> "(" ^ to_src l ^ " " ^ binop_to_string op ^ " " ^ to_src r ^ ")" - | Fun (x, e) -> "fun " ^ x ^ " -> " ^ to_src e + | Fun (x, e) -> "(fun " ^ x ^ " -> " ^ to_src e ^ ")" | App (f, a) -> "(" ^ to_src f ^ " " ^ to_src a ^ ")" | Let (x, e1, e2) -> "(let " ^ x ^ " = " ^ to_src e1 ^ " in " ^ to_src e2 ^ ")" | LetRec (f, e1, e2) -> "(let rec " ^ f ^ " = " ^ to_src e1 ^ " in " ^ to_src e2 ^ ")" | If (c, t, e) -> "(if " ^ to_src c ^ " then " ^ to_src t ^ " else " ^ to_src e ^ ")" - | Fix -> "fix" ;; let rec equal a b = @@ -52,7 +51,6 @@ let rec equal a b = | LetRec (f1, e1, b1), LetRec (f2, e2, b2) -> String.equal f1 f2 && equal e1 e2 && equal b1 b2 | If (c1, t1, e1), If (c2, t2, e2) -> equal c1 c2 && equal t1 t2 && equal e1 e2 - | Fix, Fix -> true | _ -> false ;; @@ -69,8 +67,7 @@ let rec gen_ast depth = let base = oneof [ map (fun v -> Ast.Var v) var_gen; - map (fun i -> Ast.Int i) (int_bound 10); (* можно чуть увеличить *) - return Ast.Fix; + map (fun i -> Ast.Int i) (int_bound 10); ] in @@ -79,42 +76,41 @@ let rec gen_ast depth = oneof [ base; - (* fun только с одним аргументом *) map2 (fun x body -> Ast.Fun (x, body)) var_gen (gen_ast (depth - 1)); - (* приложение *) + map2 (fun f a -> Ast.App (f, a)) (gen_ast (depth - 1)) (gen_ast (depth - 1)); - (* бинарные операции *) + map3 (fun op l r -> Ast.Bin (op, l, r)) binop_gen (gen_ast (depth - 1)) (gen_ast (depth - 1)); - (* let *) + map3 (fun x e1 e2 -> Ast.Let (x, e1, e2)) var_gen (gen_ast (depth - 1)) (gen_ast (depth - 1)); - (* let rec — тоже только один аргумент в функции *) + map4 (fun f x body e2 -> Ast.LetRec (f, Ast.Fun (x, body), e2)) var_gen var_gen (gen_ast (depth - 1)) (gen_ast (depth - 1)); - (* if *) + map3 (fun c t e -> Ast.If (c, t, e)) (gen_ast (depth - 1)) (gen_ast (depth - 1)) (gen_ast (depth - 1)); - (* унарный минус — добавим для полноты *) + map (fun e -> Ast.Neg e) (gen_ast (depth - 1)); ] diff --git a/Goncharov/lib/utils.ml b/Goncharov/lib/utils.ml deleted file mode 100644 index e7a203af..00000000 --- a/Goncharov/lib/utils.ml +++ /dev/null @@ -1,14 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - -(* TODO: rework this *) -module type MONAD_FAIL = sig - include Base.Monad.S2 - - val fail : 'e -> ('a, 'e) t -end diff --git a/Goncharov/lib/utils.mli b/Goncharov/lib/utils.mli deleted file mode 100644 index eacdb868..00000000 --- a/Goncharov/lib/utils.mli +++ /dev/null @@ -1,16 +0,0 @@ -[@@@ocaml.text "/*"] - -(** Copyright 2021-2024, Kakadu and contributors *) - -(** SPDX-License-Identifier: LGPL-3.0-or-later *) - -[@@@ocaml.text "/*"] - - -(** Smart constructors *) - -module type MONAD_FAIL = sig - include Base.Monad.S2 - - val fail : 'e -> ('a, 'e) t -end diff --git a/Goncharov/tests/mini_ml.t b/Goncharov/tests/mini_ml.t index 5c7a9368..b7a043ac 100644 --- a/Goncharov/tests/mini_ml.t +++ b/Goncharov/tests/mini_ml.t @@ -1,17 +1,75 @@ - $ ./mini_cli.exe << 'EOF' +Copyright 2021-2024, Kakadu and contributors +SPDX-License-Identifier: LGPL-3.0-or-later + +Cram tests for miniML interpreter + + $ ./mini_cli.exe <<'EOF' > 1 + 2 * 3 > EOF Success: 7 $ ./mini_cli.exe <<'EOF' - > let rec fact = fun n -> if n = 1 then 1 else n * fact (n-1) in fact 4 + > (1 + 2) * 3 > EOF - Success: 24 + Success: 9 $ ./mini_cli.exe <<'EOF' - > fix (fun fib -> fun n -> if n = 0 then 0 else if n = 1 then 1 else fib (n-1) + fib (n-2)) 6 + > 10 - 3 - 2 > EOF - Success: 8 + Success: 5 + + $ ./mini_cli.exe <<'EOF' + > 8 / 2 + 1 + > EOF + Success: 5 + +=== Basic lambdas === + + $ ./mini_cli.exe <<'EOF' + > fun x -> x + > EOF + Success: fun x -> x + + $ ./mini_cli.exe <<'EOF' + > (fun x -> x) 42 + > EOF + Success: 42 + + $ ./mini_cli.exe <<'EOF' + > (fun x -> fun y -> x) 1 2 + > EOF + Success: 1 + + $ ./mini_cli.exe <<'EOF' + > (fun x -> fun x -> x) 1 2 + > EOF + Success: 2 + +=== Multi-argument functions (desugaring) === + + $ ./mini_cli.exe <<'EOF' + > let add x y = x + y in add 3 4 + > EOF + Success: 7 + + $ ./mini_cli.exe <<'EOF' + > (fun x y z -> x + y + z) 1 2 3 + > EOF + Success: 6 + +=== CBV evaluation order === + + $ ./mini_cli.exe <<'EOF' + > (fun x -> x + x) (1 + 2) + > EOF + Success: 6 + + $ ./mini_cli.exe <<'EOF' + > (fun x -> 5) (1 / 0) + > EOF + Interpreter error: Division by zero + +=== Arithmetic with negatives === $ ./mini_cli.exe <<'EOF' > -3 + 10 / 2 @@ -19,14 +77,16 @@ Success: 2 $ ./mini_cli.exe <<'EOF' - > let add = fun x -> fun y -> x + y in add 2 3 + > -(5 - 3) > EOF - Success: 5 + Success: -2 $ ./mini_cli.exe <<'EOF' - > let x = 5 in let y = 2 in x - y + > -(-4) > EOF - Success: 3 + Success: 4 + +=== Comparison operators === $ ./mini_cli.exe <<'EOF' > if 2 <= 3 then 7 else 9 @@ -39,34 +99,175 @@ Success: 0 $ ./mini_cli.exe <<'EOF' - > fix (fun f -> fun x -> x + 1) 4 + > if 5 = 5 then 1 else 0 + > EOF + Success: 1 + + $ ./mini_cli.exe <<'EOF' + > if 5 <> 5 then 1 else 0 + > EOF + Success: 0 + + $ ./mini_cli.exe <<'EOF' + > if 3 < 5 then 1 else 0 + > EOF + Success: 1 + + $ ./mini_cli.exe <<'EOF' + > if 5 > 3 then 1 else 0 + > EOF + Success: 1 + +=== Nested conditions === + + $ ./mini_cli.exe <<'EOF' + > if 1 then if 0 then 2 else 3 else 4 + > EOF + Success: 3 + + $ ./mini_cli.exe <<'EOF' + > if (if 1 then 0 else 1) then 5 else 6 + > EOF + Success: 6 + +=== If with functions === + + $ ./mini_cli.exe <<'EOF' + > (if 1 then fun x -> x + 1 else fun x -> x + 2) 4 > EOF Success: 5 $ ./mini_cli.exe <<'EOF' - > fix (fun f -> fun n -> f n) 0 + > (if 0 then fun x -> x * 2 else fun x -> x * 3) 5 > EOF - Interpreter error: Unknown variable: steps limit exceeded + Success: 15 + +=== Let expressions === $ ./mini_cli.exe <<'EOF' - > x + > let x = 5 in let y = 2 in x - y > EOF - Interpreter error: Unbound variable + Success: 3 $ ./mini_cli.exe <<'EOF' - > x -> x -> x + x + > let f = fun x -> x + 1 in f 10 > EOF - Interpreter error: Unknown variable: cannot represent function as integer + Success: 11 $ ./mini_cli.exe <<'EOF' - > 1 / 0 + > let x = 1 in let x = 2 in x > EOF - Interpreter error: Division by zero + Success: 2 $ ./mini_cli.exe <<'EOF' - > - (fun x -> x) + > let x = 1 in (let x = 2 in x) + x > EOF - Interpreter error: Type error: not integer in Ast.Neg + Success: 3 + +=== Recursive functions (let rec) === + + $ ./mini_cli.exe <<'EOF' + > let rec fact = fun n -> if n <= 1 then 1 else n * fact (n - 1) in fact 4 + > EOF + Success: 24 + + $ ./mini_cli.exe <<'EOF' + > let rec fact n = if n <= 1 then 1 else n * fact (n - 1) in fact 5 + > EOF + Success: 120 + + $ ./mini_cli.exe <<'EOF' + > let rec fib n = if n <= 1 then n else fib (n - 1) + fib (n - 2) in fib 10 + > EOF + Success: 55 + + $ ./mini_cli.exe <<'EOF' + > let rec sum n = if n <= 0 then 0 else n + sum (n - 1) in sum 100 + > EOF + Success: 5050 + +=== Fix combinator === + + $ ./mini_cli.exe <<'EOF' + > fix (fun fib n -> if n <= 1 then n else fib (n - 1) + fib (n - 2)) 6 + > EOF + Success: 8 + + $ ./mini_cli.exe <<'EOF' + > let fact = fix (fun self n -> if n <= 1 then 1 else n * self (n - 1)) in fact 5 + > EOF + Success: 120 + + $ ./mini_cli.exe <<'EOF' + > fix (fun f x -> if x <= 0 then 1 else x * f (x - 1)) 4 + > EOF + Success: 24 + +=== Print builtin === + + $ ./mini_cli.exe <<'EOF' + > let a = 10 in let _ = print (a * a) in a + > EOF + 100 + Success: 10 + + $ ./mini_cli.exe <<'EOF' + > print 42 + > EOF + 42 + Success: 0 + + $ ./mini_cli.exe <<'EOF' + > if 1 then print 1 else print 0 + > EOF + 1 + Success: 0 + +=== Overriding builtins (requirement: users can shadow print/fix) === + + $ ./mini_cli.exe <<'EOF' + > let print = 42 in print + 1 + > EOF + Success: 43 + + $ ./mini_cli.exe <<'EOF' + > let fix = 10 in fix * 2 + > EOF + Success: 20 + + $ ./mini_cli.exe <<'EOF' + > let print = fun x -> x + 1 in print 5 + > EOF + Success: 6 + +=== Application and operator precedence === + + $ ./mini_cli.exe <<'EOF' + > (fun x -> x) 4 + 5 + > EOF + Success: 9 + + $ ./mini_cli.exe <<'EOF' + > (fun x -> x + 1) 2 * 3 + > EOF + Success: 9 + + $ ./mini_cli.exe <<'EOF' + > fun x -> x + 1 * 2 + > EOF + Success: fun x -> (x + (1 * 2)) + +=== Error cases === + + $ ./mini_cli.exe <<'EOF' + > x + > EOF + Interpreter error: Unbound variable + + $ ./mini_cli.exe <<'EOF' + > 1 / 0 + > EOF + Interpreter error: Division by zero $ ./mini_cli.exe <<'EOF' > (fun x -> x) + 1 @@ -74,9 +275,9 @@ Interpreter error: Type error: no such binary operation or operands are not integers $ ./mini_cli.exe <<'EOF' - > 1 2 + > - (fun x -> x) > EOF - Interpreter error: Type error: error during app + Interpreter error: Type error: not integer in Ast.Neg $ ./mini_cli.exe <<'EOF' > if (fun x -> x) then 1 else 2 @@ -84,42 +285,89 @@ Interpreter error: Type error: condition is not integer $ ./mini_cli.exe <<'EOF' - > let rec f = 1 in f + > 1 2 + > EOF + Interpreter error: Type error: error during app + + $ ./mini_cli.exe <<'EOF' + > let rec f = 5 in f 1 > EOF Interpreter error: Type error: expected function on the right +=== Parsing errors (keywords cannot be variable names) === + $ ./mini_cli.exe <<'EOF' - > fix (fun f -> 1) + > let fun = 1 in fun > EOF - Interpreter error: Type error: fix expects function returning function + Parsing error + [1] $ ./mini_cli.exe <<'EOF' - > fix 1 + > let if = 1 in if > EOF - Interpreter error: Type error: expected function + Parsing error + [1] - $ ./mini_cli.exe << 'EOF' - > let fun = 1 in fun + $ ./mini_cli.exe <<'EOF' + > let then = 1 in then > EOF Parsing error + [1] - $ ./mini_cli.exe << 'EOF' - > let ifx a b = a+b in - > let theny = 2 in - > let elsez = 1 in - > ifx theny elsez +=== Infinite loop detection === + + $ ./mini_cli.exe <<'EOF' + > fix (fun f -> f) 0 > EOF - Success: 3 + Interpreter error: Unknown variable: steps limit exceeded - $ ./mini_cli.exe << 'EOF' - > let x a b = a+b in - > let theny = 0 in - > let elsez = 1 in - > ifx theny elsez then 1 else 2 + $ ./mini_cli.exe <<'EOF' + > let rec loop = fun x -> loop x in loop 1 > EOF - Parsing error + Interpreter error: Unknown variable: steps limit exceeded + +=== Complex expressions === - $ ./mini_cli.exe << 'EOF' - > let x = 1 inx + $ ./mini_cli.exe <<'EOF' + > (fun x -> (fun y -> x + y) 3) 4 > EOF - Parsing error + Success: 7 + + $ ./mini_cli.exe <<'EOF' + > let f = fun x -> if x <= 0 then 1 else x * f (x - 1) in f 5 + > EOF + Interpreter error: Unbound variable + + $ ./mini_cli.exe <<'EOF' + > let rec f = fun x -> if x <= 0 then 1 else x * f (x - 1) in f 5 + > EOF + Success: 120 + +=== Parentheses and associativity === + + $ ./mini_cli.exe <<'EOF' + > 1 + (2 + 3) + > EOF + Success: 6 + + $ ./mini_cli.exe <<'EOF' + > (1 + 2) + 3 + > EOF + Success: 6 + + $ ./mini_cli.exe <<'EOF' + > 2 * 3 + 4 * 5 + > EOF + Success: 26 + +=== Functions as values === + + $ ./mini_cli.exe <<'EOF' + > let id = fun x -> x in id id 5 + > EOF + Success: 5 + + $ ./mini_cli.exe <<'EOF' + > let compose f g x = f (g x) in compose (fun x -> x + 1) (fun x -> x * 2) 3 + > EOF + Success: 7 From 2767b800ed2fbc352684ad7b6580f25080a63067 Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 14:19:31 +0300 Subject: [PATCH 3/8] =fixed formatting --- Goncharov/bin/REPL.ml | 2 +- Goncharov/lib/ast.mli | 2 -- Goncharov/lib/interpret.ml | 2 +- Goncharov/lib/parser.ml | 2 +- Goncharov/lib/parser.mli | 2 +- Goncharov/lib/tests.ml | 2 +- Goncharov/tests/.gitignore | 2 +- Goncharov/tests/dune | 3 ++- Goncharov/tests/mini_cli.ml | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Goncharov/bin/REPL.ml b/Goncharov/bin/REPL.ml index fd4f00e3..0b82857d 100644 --- a/Goncharov/bin/REPL.ml +++ b/Goncharov/bin/REPL.ml @@ -38,4 +38,4 @@ let rec repl ~(max_steps : int) = let () = repl ~max_steps:10000 -;; \ No newline at end of file +;; diff --git a/Goncharov/lib/ast.mli b/Goncharov/lib/ast.mli index a415d17f..4f9050a2 100644 --- a/Goncharov/lib/ast.mli +++ b/Goncharov/lib/ast.mli @@ -30,5 +30,3 @@ type 'name t = | If of 'name t * 'name t * 'name t | Let of 'name * 'name t * 'name t | LetRec of 'name * 'name t * 'name t - - diff --git a/Goncharov/lib/interpret.ml b/Goncharov/lib/interpret.ml index 94bcce29..1db5acc2 100644 --- a/Goncharov/lib/interpret.ml +++ b/Goncharov/lib/interpret.ml @@ -144,4 +144,4 @@ let parse_and_run ?(max_steps=10000) str = | Error _ -> Printf.eprintf "Parsing error\n%!"; exit 1 -;; \ No newline at end of file +;; diff --git a/Goncharov/lib/parser.ml b/Goncharov/lib/parser.ml index 0c64c3d2..bdd1e720 100644 --- a/Goncharov/lib/parser.ml +++ b/Goncharov/lib/parser.ml @@ -125,4 +125,4 @@ let parse str = with | Result.Ok x -> Result.Ok x | Error er -> Result.Error (Parsing_error er) -;; \ No newline at end of file +;; diff --git a/Goncharov/lib/parser.mli b/Goncharov/lib/parser.mli index 5e8381e0..0e5774c3 100644 --- a/Goncharov/lib/parser.mli +++ b/Goncharov/lib/parser.mli @@ -22,4 +22,4 @@ type dispatch = } (* A collection of miniparsers *) -val parse_lam : dispatch \ No newline at end of file +val parse_lam : dispatch diff --git a/Goncharov/lib/tests.ml b/Goncharov/lib/tests.ml index 7f2eba9b..280b428a 100644 --- a/Goncharov/lib/tests.ml +++ b/Goncharov/lib/tests.ml @@ -149,4 +149,4 @@ let%test_unit "parser/to_src roundtrip" = let%test_unit "parser/pprint roundtrip" = QCheck2.Test.check_exn prop_parse_pprint_roundtrip -;; \ No newline at end of file +;; diff --git a/Goncharov/tests/.gitignore b/Goncharov/tests/.gitignore index 26685e79..c31b4acb 100644 --- a/Goncharov/tests/.gitignore +++ b/Goncharov/tests/.gitignore @@ -1 +1 @@ -lam*.txt \ No newline at end of file +lam*.txt diff --git a/Goncharov/tests/dune b/Goncharov/tests/dune index 7d7d9cf7..9a041be4 100644 --- a/Goncharov/tests/dune +++ b/Goncharov/tests/dune @@ -6,4 +6,5 @@ (backend bisect_ppx))) (cram (applies_to mini_ml) - (deps ./mini_cli.exe)) \ No newline at end of file + (deps ./mini_cli.exe)) + \ No newline at end of file diff --git a/Goncharov/tests/mini_cli.ml b/Goncharov/tests/mini_cli.ml index 7c04064d..2f37d3a5 100644 --- a/Goncharov/tests/mini_cli.ml +++ b/Goncharov/tests/mini_cli.ml @@ -11,4 +11,4 @@ open Lambda_lib let () = let input = In_channel.input_all In_channel.stdin |> String.trim in Interpret.parse_and_run input -;; \ No newline at end of file +;; From a426ba93db3924726f3711e095d9fc5391595409 Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 14:22:56 +0300 Subject: [PATCH 4/8] =fixed formatting --- Goncharov/tests/dune | 1 - 1 file changed, 1 deletion(-) diff --git a/Goncharov/tests/dune b/Goncharov/tests/dune index 9a041be4..401939b0 100644 --- a/Goncharov/tests/dune +++ b/Goncharov/tests/dune @@ -7,4 +7,3 @@ (cram (applies_to mini_ml) (deps ./mini_cli.exe)) - \ No newline at end of file From 55dbd432624cdf131c0155102895b8bf5dd3b33a Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 14:54:30 +0300 Subject: [PATCH 5/8] fixed format --- Goncharov/bin/REPL.ml | 5 +- Goncharov/lib/Pprintast.ml | 41 ++++++------ Goncharov/lib/ast.mli | 10 +-- Goncharov/lib/interpret.ml | 127 ++++++++++++++++++++---------------- Goncharov/lib/interpret.mli | 2 +- Goncharov/lib/parser.ml | 104 ++++++++++++++++++----------- Goncharov/lib/parser.mli | 3 +- Goncharov/lib/tests.ml | 80 +++++++++-------------- Goncharov/tests/dune | 1 + 9 files changed, 198 insertions(+), 175 deletions(-) diff --git a/Goncharov/bin/REPL.ml b/Goncharov/bin/REPL.ml index 0b82857d..fa51f004 100644 --- a/Goncharov/bin/REPL.ml +++ b/Goncharov/bin/REPL.ml @@ -17,7 +17,6 @@ let extract_steps line = int_of_string rest ;; - let run_line max_steps line = Interpret.parse_and_run ~max_steps line let rec repl ~(max_steps : int) = @@ -36,6 +35,4 @@ let rec repl ~(max_steps : int) = repl ~max_steps) ;; -let () = - repl ~max_steps:10000 -;; +let () = repl ~max_steps:10000 diff --git a/Goncharov/lib/Pprintast.ml b/Goncharov/lib/Pprintast.ml index e535c6aa..e52f9881 100644 --- a/Goncharov/lib/Pprintast.ml +++ b/Goncharov/lib/Pprintast.ml @@ -9,28 +9,31 @@ (* Pretty printer goes here *) open Ast + let rec pp fmt = function | Var v -> Format.fprintf fmt "%s" v - | Fun (x,e) -> Format.fprintf fmt "(%s -> %a)" x pp e - | App (e1,e2) -> Format.fprintf fmt "(%a %a)" pp e1 pp e2 + | Fun (x, e) -> Format.fprintf fmt "(%s -> %a)" x pp e + | App (e1, e2) -> Format.fprintf fmt "(%a %a)" pp e1 pp e2 | Int i -> Format.fprintf fmt "%d" i | Neg e -> Format.fprintf fmt "(-%a)" pp e - | Bin (op,e1,e2) -> - let bop = match op with - | Add -> "+" - | Sub -> "-" - | Mul -> "*" - | Div -> "/" - | Eq -> "=" - | Leq -> "<=" - | Geq -> ">=" - | Neq -> "<>" - | Lt -> "<" - | Gt -> ">" - in - Format.fprintf fmt "(%a %s %a)" pp e1 bop pp e2 - | If (e1,e2,e3) -> Format.fprintf fmt "(if %a then %a else %a)" pp e1 pp e2 pp e3 - | Let (x,e1,e2) -> Format.fprintf fmt "(let %s = %a in %a)" x pp e1 pp e2 - | LetRec (f,e1,e2) -> Format.fprintf fmt "(let rec %s = %a in %a)" f pp e1 pp e2 + | Bin (op, e1, e2) -> + let bop = + match op with + | Add -> "+" + | Sub -> "-" + | Mul -> "*" + | Div -> "/" + | Eq -> "=" + | Leq -> "<=" + | Geq -> ">=" + | Neq -> "<>" + | Lt -> "<" + | Gt -> ">" + in + Format.fprintf fmt "(%a %s %a)" pp e1 bop pp e2 + | If (e1, e2, e3) -> Format.fprintf fmt "(if %a then %a else %a)" pp e1 pp e2 pp e3 + | Let (x, e1, e2) -> Format.fprintf fmt "(let %s = %a in %a)" x pp e1 pp e2 + | LetRec (f, e1, e2) -> Format.fprintf fmt "(let rec %s = %a in %a)" f pp e1 pp e2 ;; + let pp_hum = pp diff --git a/Goncharov/lib/ast.mli b/Goncharov/lib/ast.mli index 4f9050a2..d42de237 100644 --- a/Goncharov/lib/ast.mli +++ b/Goncharov/lib/ast.mli @@ -3,7 +3,7 @@ (** Copyright 2021-2024, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) -type binop = +type binop = | Add | Sub | Mul @@ -11,7 +11,7 @@ type binop = | Eq | Leq | Geq - | Lt + | Lt | Gt | Neq @@ -24,9 +24,9 @@ type 'name t = | Var of 'name (** Variable [x] *) | Fun of 'name * 'name t (** fun **) | App of 'name t * 'name t (** Application [f g] *) - | Int of int + | Int of int | Neg of 'name t | Bin of binop * 'name t * 'name t | If of 'name t * 'name t * 'name t - | Let of 'name * 'name t * 'name t - | LetRec of 'name * 'name t * 'name t + | Let of 'name * 'name t * 'name t + | LetRec of 'name * 'name t * 'name t diff --git a/Goncharov/lib/interpret.ml b/Goncharov/lib/interpret.ml index 1db5acc2..ed566324 100644 --- a/Goncharov/lib/interpret.ml +++ b/Goncharov/lib/interpret.ml @@ -8,11 +8,19 @@ (** Real monadic interpreter goes here *) open Ast + open Pprintast -type error = UnknownVariable of string | Type_error of string | Unbound | DivisionByZero +type error = + | UnknownVariable of string + | Type_error of string + | Unbound + | DivisionByZero -type output = OUnit | OInt of int | OFun of string * string Ast.t | OBuiltin of string +type output = + | OInt of int + | OFun of string * string Ast.t + | OBuiltin of string module Interpret : sig val run : int -> string Ast.t -> (output, error) result @@ -22,101 +30,105 @@ end = struct | Ok x -> f x | Error e -> Error e ;; + let return x = Ok x let fail x = Error x - let (>>=) = (let*) + let ( >>= ) = ( let* ) type value = | VInt of int - | VUnit | VClosure of string * string Ast.t * env | VBuiltin of (value -> (value, error) result) and env = (string * value) list let builtin_print : value = - VBuiltin (function - | VInt n -> - print_int n; - print_newline (); + VBuiltin + (function + | VInt n -> + print_int n; + print_newline (); return (VInt 0) - | _ -> fail (Type_error "print expects integer")) + | _ -> fail (Type_error "print expects integer")) ;; let builtin_fix : value = - VClosure ("f",App (Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v")))),Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v"))))),[]) + VClosure + ( "f" + , App + ( Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v")))) + , Fun ("x", App (Var "f", Fun ("v", App (App (Var "x", Var "x"), Var "v")))) ) + , [] ) ;; - let initial_env : env = [ - ("print", builtin_print); - ("fix", builtin_fix); - ] - - let run (max_steps:int) (e: string Ast.t):(output, error) result = - let rec eval steps env e = - if steps > max_steps then fail (UnknownVariable "steps limit exceeded") + let initial_env : env = [ "print", builtin_print; "fix", builtin_fix ] + + let run (max_steps : int) (e : string Ast.t) : (output, error) result = + let rec eval steps env e = + if steps > max_steps + then fail (UnknownVariable "steps limit exceeded") else ( match e with | Var v -> eval_var steps env v - | Fun (x,e) -> return (VClosure (x,e,env)) - | App (e1,e2) -> eval_app steps env e1 e2 + | Fun (x, e) -> return (VClosure (x, e, env)) + | App (e1, e2) -> eval_app steps env e1 e2 | Int i -> return (VInt i) | Neg e -> eval_neg steps env e - | Bin (op,e1,e2) -> eval_bin steps env op e1 e2 - | If (e1,e2,e3) -> eval_if steps env e1 e2 e3 - | Let (x,e1,e2) -> eval_let steps env x e1 e2 - | LetRec (f,Fun(x,b),e2) -> eval_letrec steps env f x b e2 + | Bin (op, e1, e2) -> eval_bin steps env op e1 e2 + | If (e1, e2, e3) -> eval_if steps env e1 e2 e3 + | Let (x, e1, e2) -> eval_let steps env x e1 e2 + | LetRec (f, Fun (x, b), e2) -> eval_letrec steps env f x b e2 | LetRec _ -> fail (Type_error "expected function on the right")) - and eval_var steps env e = match env with - |[] -> fail (Unbound) - |(y,v) :: rest -> if y = e then return v else eval_var (steps+1) rest e - and eval_neg steps env e = - let* v = eval (steps+1) env e in + | [] -> fail Unbound + | (y, v) :: rest -> if y = e then return v else eval_var (steps + 1) rest e + and eval_neg steps env e = + let* v = eval (steps + 1) env e in match v with - | VInt x -> return (VInt(-x)) + | VInt x -> return (VInt (-x)) | _ -> fail (Type_error "not integer in Ast.Neg") - and eval_bin steps env op e1 e2 = - let* v1 = eval (steps+1) env e1 in - let* v2 = eval (steps+1) env e2 in + and eval_bin steps env op e1 e2 = + let* v1 = eval (steps + 1) env e1 in + let* v2 = eval (steps + 1) env e2 in match op, v1, v2 with | Add, VInt a, VInt b -> return (VInt (a + b)) | Sub, VInt a, VInt b -> return (VInt (a - b)) | Mul, VInt a, VInt b -> return (VInt (a * b)) - | Div, VInt _, VInt 0 -> fail (DivisionByZero) + | Div, VInt _, VInt 0 -> fail DivisionByZero | Div, VInt a, VInt b -> return (VInt (a / b)) | Leq, VInt a, VInt b -> return (VInt (if a <= b then 1 else 0)) | Eq, VInt a, VInt b -> return (VInt (if a = b then 1 else 0)) | Geq, VInt a, VInt b -> return (VInt (if a >= b then 1 else 0)) - | Lt, VInt a, VInt b -> return (VInt (if a< b then 1 else 0)) + | Lt, VInt a, VInt b -> return (VInt (if a < b then 1 else 0)) | Gt, VInt a, VInt b -> return (VInt (if a > b then 1 else 0)) | Neq, VInt a, VInt b -> return (VInt (if a <> b then 1 else 0)) | _ -> fail (Type_error "no such binary operation or operands are not integers") - and eval_let steps env x e1 e2 = - let* v1 = eval (steps+1) env e1 in eval (steps+1) ((x,v1)::env) e2 - and eval_if steps env e1 e2 e3 = - let* v1 = eval (steps+1) env e1 in + and eval_let steps env x e1 e2 = + let* v1 = eval (steps + 1) env e1 in + eval (steps + 1) ((x, v1) :: env) e2 + and eval_if steps env e1 e2 e3 = + let* v1 = eval (steps + 1) env e1 in match v1 with - | VInt i -> if i <> 0 then eval (steps+1) env e2 else eval (steps+1) env e3 + | VInt i -> if i <> 0 then eval (steps + 1) env e2 else eval (steps + 1) env e3 | _ -> fail (Type_error "condition is not integer") - and eval_letrec steps env f x b e2 = - let rec env' = (f,VClosure(x,b,env'))::env in - eval (steps+1) env' e2 - and eval_app steps env e1 e2 = - let* f = eval (steps+1) env e1 in + and eval_letrec steps env f x b e2 = + let rec env' = (f, VClosure (x, b, env')) :: env in + eval (steps + 1) env' e2 + and eval_app steps env e1 e2 = + let* f = eval (steps + 1) env e1 in match f with - |VClosure(x,body,denv) -> - let* arg = eval (steps+1) env e2 in - eval (steps+1) ((x,arg)::denv) body - |VBuiltin g -> - let* arg = eval (steps+1) env e2 in g arg + | VClosure (x, body, denv) -> + let* arg = eval (steps + 1) env e2 in + eval (steps + 1) ((x, arg) :: denv) body + | VBuiltin g -> + let* arg = eval (steps + 1) env e2 in + g arg | _ -> fail (Type_error "error during app") and print = function | VInt i -> return (OInt i) - | VClosure (x,e,_) -> return (OFun(x,e)) + | VClosure (x, e, _) -> return (OFun (x, e)) | VBuiltin _ -> return (OBuiltin "") - | VUnit -> return OUnit in let* v = eval 0 initial_env e in print v @@ -125,22 +137,23 @@ end open Interpret -let parse_and_run ?(max_steps=10000) str = +let parse_and_run ?(max_steps = 10000) str = match Parser.parse str with | Ok ast -> (match run max_steps ast with | Ok n -> (match n with - | OUnit -> Printf.printf "Success: Unit\n" | OInt n -> Printf.printf "Success: %d\n" n - | OFun (p, b) -> Printf.printf "Success: fun %s -> %s\n" p (Format.asprintf "%a" pp b) + | OFun (p, b) -> + Printf.printf "Success: fun %s -> %s\n" p (Format.asprintf "%a" pp b) | OBuiltin name -> Printf.printf "Success: \n" name) | Error err -> (match err with - | UnknownVariable x -> Printf.eprintf "Interpreter error: Unknown variable: %s\n%!" x + | UnknownVariable x -> + Printf.eprintf "Interpreter error: Unknown variable: %s\n%!" x | Type_error msg -> Printf.eprintf "Interpreter error: Type error: %s\n%!" msg | DivisionByZero -> Printf.eprintf "Interpreter error: Division by zero\n%!" - | Unbound -> Printf.eprintf "Interpreter error: Unbound variable\n%!" )) + | Unbound -> Printf.eprintf "Interpreter error: Unbound variable\n%!")) | Error _ -> Printf.eprintf "Parsing error\n%!"; exit 1 diff --git a/Goncharov/lib/interpret.mli b/Goncharov/lib/interpret.mli index ca8c3aa4..d6dfb6ff 100644 --- a/Goncharov/lib/interpret.mli +++ b/Goncharov/lib/interpret.mli @@ -6,4 +6,4 @@ [@@@ocaml.text "/*"] -val parse_and_run : ?max_steps:int ->string -> unit +val parse_and_run : ?max_steps:int -> string -> unit diff --git a/Goncharov/lib/parser.ml b/Goncharov/lib/parser.ml index bdd1e720..96e58d40 100644 --- a/Goncharov/lib/parser.ml +++ b/Goncharov/lib/parser.ml @@ -3,7 +3,6 @@ (** SPDX-License-Identifier: LGPL-3.0-or-later *) (* TODO: implement parser here *) -open Ast open Angstrom let is_space = function @@ -13,11 +12,9 @@ let is_space = function let spaces = skip_while is_space let spaces1 = take_while1 is_space - let token p = spaces *> p let token1 p = spaces1 *> p - let varname = let* var = take_while1 (function @@ -27,11 +24,11 @@ let varname = match var with | s when s.[0] >= '0' && s.[0] <= '9' -> fail "variable starts with number" | s when s.[0] = '\'' -> fail "variable starts with wrong symbol" - | "fun" | "if" | "then" | "else" | "let" | "in" | "rec" -> fail"key word instead of variable" + | "fun" | "if" | "then" | "else" | "let" | "in" | "rec" -> + fail "key word instead of variable" | _ -> return var ;; - let is_digit = function | '0' .. '9' -> true | _ -> false @@ -63,25 +60,47 @@ let chainl1 p op = let* x = p in iter x ;; -let mk_args args body = - List.fold_right (fun arg acc -> Ast.Fun (arg, acc)) args body -;; -type error = Parsing_error of string +let mk_args args body = List.fold_right (fun arg acc -> Ast.Fun (arg, acc)) args body +type error = Parsing_error of string let parse_lam = let single pack = fix (fun _ -> conde - [ (token (char '(') *> pack.comp pack <* token (char ')')) "Parentheses expected" - ; (token (string "let" *> spaces1) *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.Let(name,mk_args args bind,body)) - ; (token (string "fun"*> spaces1) *> many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body)) - ; ((many1(token varname) <* token (string "->") >>= fun args -> pack.comp pack >>| fun body -> (mk_args args body))) - ; (token (string "if" *> spaces1) *> pack.comp pack >>= fun cond -> token (string "then")*> pack.comp pack>>= fun e1 -> token (string "else") *> pack.comp pack >>| fun e2 ->Ast.If(cond,e1,e2)) - ; (token (string "let") *> token1 (string "rec") *> token varname >>= fun name -> many(token varname) >>= fun args -> token (char '=') *> pack.comp pack >>= fun bind -> token (string "in") *> pack.comp pack >>| fun body -> Ast.LetRec(name,mk_args args bind,body)) - ; (token varname >>| fun var -> Ast.Var(var)) - ; ((token integer) >>| fun num -> Ast.Int(num)) + [ token (char '(') *> pack.comp pack + <* token (char ')') + "Parentheses expected" + ; (token (string "let" *> spaces1) *> token varname + >>= fun name -> + many (token varname) + >>= fun args -> + token (char '=') *> pack.comp pack + >>= fun bind -> + token (string "in") *> pack.comp pack + >>| fun body -> Ast.Let (name, mk_args args bind, body)) + ; (token (string "fun" *> spaces1) *> many1 (token varname) + <* token (string "->") + >>= fun args -> pack.comp pack >>| fun body -> mk_args args body) + ; (many1 (token varname) + <* token (string "->") + >>= fun args -> pack.comp pack >>| fun body -> mk_args args body) + ; (token (string "if" *> spaces1) *> pack.comp pack + >>= fun cond -> + token (string "then") *> pack.comp pack + >>= fun e1 -> + token (string "else") *> pack.comp pack >>| fun e2 -> Ast.If (cond, e1, e2)) + ; (token (string "let") *> token1 (string "rec") *> token varname + >>= fun name -> + many (token varname) + >>= fun args -> + token (char '=') *> pack.comp pack + >>= fun bind -> + token (string "in") *> pack.comp pack + >>| fun body -> Ast.LetRec (name, mk_args args bind, body)) + ; (token varname >>| fun var -> Ast.Var var) + ; (token integer >>| fun num -> Ast.Int num) ]) in let apps pack = @@ -89,32 +108,39 @@ let parse_lam = >>= function | [] -> fail "bad syntax" | x :: xs -> return @@ List.fold_left (fun l r -> Ast.App (l, r)) x xs - and unary pack = - fix(fun _ -> - (token (char '-')*> pack.apps pack >>| fun e ->Ast.Neg(e)) - <|> (token (char '+')*> pack.apps pack <|> pack.apps pack)) - and mul_div pack = - let op = + and unary pack = + fix (fun _ -> + token (char '-') *> pack.apps pack + >>| (fun e -> Ast.Neg e) + <|> (token (char '+') *> pack.apps pack <|> pack.apps pack)) + and mul_div pack = + let op = conde - [(token (char '*') *> return (fun l r -> Ast.Bin(Ast.Mul,l,r))) - ;(token (char '/') *> return (fun l r -> Ast.Bin(Ast.Div,l,r)))] - in chainl1 (pack.unary pack) op - and add_sub pack = - let op = + [ token (char '*') *> return (fun l r -> Ast.Bin (Ast.Mul, l, r)) + ; token (char '/') *> return (fun l r -> Ast.Bin (Ast.Div, l, r)) + ] + in + chainl1 (pack.unary pack) op + and add_sub pack = + let op = conde - [(token (char '+') *> return (fun l r -> Ast.Bin(Ast.Add,l,r))) - ;(token (char '-') *> return (fun l r -> Ast.Bin(Ast.Sub,l,r)))] - in chainl1 (pack.mul_div pack) op + [ token (char '+') *> return (fun l r -> Ast.Bin (Ast.Add, l, r)) + ; token (char '-') *> return (fun l r -> Ast.Bin (Ast.Sub, l, r)) + ] + in + chainl1 (pack.mul_div pack) op and comp pack = - let op = + let op = conde - [(token (string "<=")*> return (fun l r -> Ast.Bin(Ast.Leq,l,r))) - ;(token (string "<>")*> return (fun l r -> Ast.Bin(Ast.Neq,l,r))) - ;(token (string ">=")*> return (fun l r -> Ast.Bin(Ast.Geq,l,r))) - ;(token (string "<")*> return (fun l r -> Ast.Bin(Ast.Lt,l,r))) - ;(token (string "=")*> return (fun l r -> Ast.Bin(Ast.Eq,l,r))) - ;(token (string ">")*> return (fun l r -> Ast.Bin(Ast.Gt,l,r)))] - in chainl1(pack.add_sub pack) op + [ token (string "<=") *> return (fun l r -> Ast.Bin (Ast.Leq, l, r)) + ; token (string "<>") *> return (fun l r -> Ast.Bin (Ast.Neq, l, r)) + ; token (string ">=") *> return (fun l r -> Ast.Bin (Ast.Geq, l, r)) + ; token (string "<") *> return (fun l r -> Ast.Bin (Ast.Lt, l, r)) + ; token (string "=") *> return (fun l r -> Ast.Bin (Ast.Eq, l, r)) + ; token (string ">") *> return (fun l r -> Ast.Bin (Ast.Gt, l, r)) + ] + in + chainl1 (pack.add_sub pack) op in { single; apps; unary; mul_div; add_sub; comp } ;; diff --git a/Goncharov/lib/parser.mli b/Goncharov/lib/parser.mli index 0e5774c3..ff44923d 100644 --- a/Goncharov/lib/parser.mli +++ b/Goncharov/lib/parser.mli @@ -6,8 +6,7 @@ [@@@ocaml.text "/*"] -type error = Parsing_error of string - +type error = Parsing_error of string (** Main entry of parser *) val parse : string -> (Ast.name Ast.t, error) result diff --git a/Goncharov/lib/tests.ml b/Goncharov/lib/tests.ml index 280b428a..18370db7 100644 --- a/Goncharov/lib/tests.ml +++ b/Goncharov/lib/tests.ml @@ -26,7 +26,6 @@ let binop_to_string = | Gt -> ">") ;; - let rec to_src = function | Ast.Var v -> v | Int i -> string_of_int i @@ -64,55 +63,40 @@ let pprint_to_string ast = Format.asprintf "%a" Pprintast.pp ast let rec gen_ast depth = let open QCheck2.Gen in - let base = - oneof [ - map (fun v -> Ast.Var v) var_gen; - map (fun i -> Ast.Int i) (int_bound 10); - ] + let base = + oneof [ map (fun v -> Ast.Var v) var_gen; map (fun i -> Ast.Int i) (int_bound 10) ] in - - if depth <= 0 then base + if depth <= 0 + then base else - oneof [ - base; - - map2 (fun x body -> Ast.Fun (x, body)) - var_gen - (gen_ast (depth - 1)); - - - map2 (fun f a -> Ast.App (f, a)) - (gen_ast (depth - 1)) - (gen_ast (depth - 1)); - - - map3 (fun op l r -> Ast.Bin (op, l, r)) - binop_gen - (gen_ast (depth - 1)) - (gen_ast (depth - 1)); - - - map3 (fun x e1 e2 -> Ast.Let (x, e1, e2)) - var_gen - (gen_ast (depth - 1)) - (gen_ast (depth - 1)); - - - map4 (fun f x body e2 -> Ast.LetRec (f, Ast.Fun (x, body), e2)) - var_gen - var_gen - (gen_ast (depth - 1)) - (gen_ast (depth - 1)); - - - map3 (fun c t e -> Ast.If (c, t, e)) - (gen_ast (depth - 1)) - (gen_ast (depth - 1)) - (gen_ast (depth - 1)); - - - map (fun e -> Ast.Neg e) (gen_ast (depth - 1)); - ] + oneof + [ base + ; map2 (fun x body -> Ast.Fun (x, body)) var_gen (gen_ast (depth - 1)) + ; map2 (fun f a -> Ast.App (f, a)) (gen_ast (depth - 1)) (gen_ast (depth - 1)) + ; map3 + (fun op l r -> Ast.Bin (op, l, r)) + binop_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + ; map3 + (fun x e1 e2 -> Ast.Let (x, e1, e2)) + var_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + ; map4 + (fun f x body e2 -> Ast.LetRec (f, Ast.Fun (x, body), e2)) + var_gen + var_gen + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + ; map3 + (fun c t e -> Ast.If (c, t, e)) + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + (gen_ast (depth - 1)) + ; map (fun e -> Ast.Neg e) (gen_ast (depth - 1)) + ] +;; let gen_ast_sized = let open Gen in diff --git a/Goncharov/tests/dune b/Goncharov/tests/dune index 401939b0..13d066fd 100644 --- a/Goncharov/tests/dune +++ b/Goncharov/tests/dune @@ -4,6 +4,7 @@ (libraries lambda_lib base) (instrumentation (backend bisect_ppx))) + (cram (applies_to mini_ml) (deps ./mini_cli.exe)) From bbe204a632478a48f43d1128d6c43ad9b1a4dfda Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 15:03:31 +0300 Subject: [PATCH 6/8] =fixed format --- Goncharov/lib/Pprintast.ml | 2 -- Goncharov/lib/interpret.ml | 1 - Goncharov/lib/tests.ml | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Goncharov/lib/Pprintast.ml b/Goncharov/lib/Pprintast.ml index e52f9881..84b52402 100644 --- a/Goncharov/lib/Pprintast.ml +++ b/Goncharov/lib/Pprintast.ml @@ -35,5 +35,3 @@ let rec pp fmt = function | Let (x, e1, e2) -> Format.fprintf fmt "(let %s = %a in %a)" x pp e1 pp e2 | LetRec (f, e1, e2) -> Format.fprintf fmt "(let rec %s = %a in %a)" f pp e1 pp e2 ;; - -let pp_hum = pp diff --git a/Goncharov/lib/interpret.ml b/Goncharov/lib/interpret.ml index ed566324..19b81db4 100644 --- a/Goncharov/lib/interpret.ml +++ b/Goncharov/lib/interpret.ml @@ -33,7 +33,6 @@ end = struct let return x = Ok x let fail x = Error x - let ( >>= ) = ( let* ) type value = | VInt of int diff --git a/Goncharov/lib/tests.ml b/Goncharov/lib/tests.ml index 18370db7..23c7534b 100644 --- a/Goncharov/lib/tests.ml +++ b/Goncharov/lib/tests.ml @@ -1,3 +1,5 @@ +[@@@alert "-deprecated"] + [@@@ocaml.text "/*"] (** Copyright 2021-2024, Kakadu and contributors *) From 65a145e42932bb0df00fd86a9e2f683c1101983a Mon Sep 17 00:00:00 2001 From: danya Date: Sat, 21 Mar 2026 15:35:31 +0300 Subject: [PATCH 7/8] =fixed lints --- Goncharov/lib/ast.mli | 35 +++++++++++++++++++---------------- Goncharov/lib/tests.mli | 7 +++++++ 2 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 Goncharov/lib/tests.mli diff --git a/Goncharov/lib/ast.mli b/Goncharov/lib/ast.mli index d42de237..a7a8dde3 100644 --- a/Goncharov/lib/ast.mli +++ b/Goncharov/lib/ast.mli @@ -3,17 +3,20 @@ (** Copyright 2021-2024, Kakadu and contributors *) (** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] + type binop = - | Add - | Sub - | Mul - | Div - | Eq - | Leq - | Geq - | Lt - | Gt - | Neq + | Add (** + **) + | Sub (** - **) + | Mul (** * **) + | Div (** / **) + | Eq (** = **) + | Leq (** <= **) + | Geq (** >= **) + | Lt (** < **) + | Gt (** > **) + | Neq (** <> **) [@@@ocaml.text "/*"] @@ -24,9 +27,9 @@ type 'name t = | Var of 'name (** Variable [x] *) | Fun of 'name * 'name t (** fun **) | App of 'name t * 'name t (** Application [f g] *) - | Int of int - | Neg of 'name t - | Bin of binop * 'name t * 'name t - | If of 'name t * 'name t * 'name t - | Let of 'name * 'name t * 'name t - | LetRec of 'name * 'name t * 'name t + | Int of int (** Int **) + | Neg of 'name t (** Negative int -x **) + | Bin of binop * 'name t * 'name t (** binary operation x * y **) + | If of 'name t * 'name t * 'name t (** if then else **) + | Let of 'name * 'name t * 'name t (** let x = body in e **) + | LetRec of 'name * 'name t * 'name t (** let rec x = body in e **) diff --git a/Goncharov/lib/tests.mli b/Goncharov/lib/tests.mli new file mode 100644 index 00000000..c1135e06 --- /dev/null +++ b/Goncharov/lib/tests.mli @@ -0,0 +1,7 @@ +[@@@ocaml.text "/*"] + +(** Copyright 2021-2024, Kakadu and contributors *) + +(** SPDX-License-Identifier: LGPL-3.0-or-later *) + +[@@@ocaml.text "/*"] From 6f982a678bf50f3df20119cba0ff23041bb5dba4 Mon Sep 17 00:00:00 2001 From: danya Date: Fri, 27 Mar 2026 14:41:53 +0300 Subject: [PATCH 8/8] =fixed lints --- Goncharov/lib/tests.mli | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Goncharov/lib/tests.mli b/Goncharov/lib/tests.mli index c1135e06..e6081b82 100644 --- a/Goncharov/lib/tests.mli +++ b/Goncharov/lib/tests.mli @@ -1,3 +1,5 @@ +[@@@alert "-deprecated"] + [@@@ocaml.text "/*"] (** Copyright 2021-2024, Kakadu and contributors *)