From df73353bc6a1172a1405d2b53a2a98c1ca390e68 Mon Sep 17 00:00:00 2001 From: Dominic Grimm Date: Sat, 1 Apr 2023 19:20:32 +0200 Subject: [PATCH] Add language support and massively update Forth compiler --- .vscode/launch.json | 22 + Cargo.lock | 7 + Cargo.toml | 5 + LICENSE | 674 +++++++++++++++++++++++++ examples/testforth.asm | 176 ++++--- examples/testforth.fth | 6 +- hence/Cargo.toml | 1 + hence/lib/core.asm | 86 ++-- hence/lib/main.asm | 2 +- hence/src/arg.rs | 85 ++-- hence/src/assembler.rs | 78 ++- hence/src/lexer.rs | 94 ++-- hence/src/main.rs | 6 +- hence/src/parser/ast.rs | 30 +- henceforth/src/compiler.rs | 14 +- henceforth/src/compiler/instruction.rs | 57 ++- henceforth/src/compiler/templates.rs | 1 - henceforth/src/lexer.rs | 25 +- henceforth/src/parser/ast.rs | 57 ++- henceforth/templates/default.asm | 107 +++- syntax/.vscode/launch.json | 17 + syntax/.vscodeignore | 4 + syntax/CHANGELOG.md | 9 + syntax/LICENSE | 674 +++++++++++++++++++++++++ syntax/README.md | 1 + syntax/hence.iro | 140 +++++ syntax/language-configuration.json | 30 ++ syntax/package-lock.json | 15 + syntax/package.json | 27 + syntax/syntaxes/hence.tmLanguage | 69 +++ syntax/vsc-extension-quickstart.md | 29 ++ 31 files changed, 2217 insertions(+), 331 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 LICENSE create mode 100644 syntax/.vscode/launch.json create mode 100644 syntax/.vscodeignore create mode 100644 syntax/CHANGELOG.md create mode 100644 syntax/LICENSE create mode 100644 syntax/README.md create mode 100644 syntax/hence.iro create mode 100644 syntax/language-configuration.json create mode 100644 syntax/package-lock.json create mode 100644 syntax/package.json create mode 100644 syntax/syntaxes/hence.tmLanguage create mode 100644 syntax/vsc-extension-quickstart.md diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..4725df5 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "request": "launch", + "name": "Launch Program", + "type": "node", + "program": "${workspaceFolder}/main.ts", + "cwd": "${workspaceFolder}", + "runtimeExecutable": "/home/dominic/.deno/bin/deno", + "runtimeArgs": [ + "run", + "--inspect-brk", + "--allow-all" + ], + "attachSimplePort": 9229 + } + ] +} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 6f9a8e4..a4e8add 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -200,6 +200,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "debug-ignore" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe7ed1d93f4553003e20b629abe9085e1e81b1429520f897f8f8860bc6dfc21" + [[package]] name = "digest" version = "0.10.6" @@ -268,6 +274,7 @@ dependencies = [ "anyhow", "clap", "console", + "debug-ignore", "itertools", "parse_int", "rand", diff --git a/Cargo.toml b/Cargo.toml index 06c9a23..d6bbf9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,7 @@ [workspace] members = ["hence", "henceforth"] + +[profile.release] +opt-level = 3 +lto = true +codegen-units = 1 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -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/examples/testforth.asm b/examples/testforth.asm index 2c217fe..f21bfd5 100644 --- a/examples/testforth.asm +++ b/examples/testforth.asm @@ -1,23 +1,41 @@ .include "$lib/core.asm" .include "$lib/std.asm" -.include "$lib/main.asm" +;.include "$lib/main.asm" -.define MEM_LOOP_I, CORE_MEM_MEM -.define MEM_LOOP_J, (MEM_LOOP_I + 1) +.define_eval prev, OFFSET + ts 0xffff + tlr CORE_REG_PC +.define_eval diff, (OFFSET - prev) +.define_eval MAIN_JUMPER, (CORE_MEM_PRG_END - diff) +.org prev +.delete prev, diff -.define MEM_CALL_STACK_LEN, 16 -.define MEM_CALL_STACK_PTR, (MEM_LOOP_J + 1) -.define MEM_CALL_STACK_END, (MEM_CALL_STACK_PTR + MEM_CALL_STACK_LEN) +.define_eval MAIN_JUMPER, (CORE_MEM_PRG_END - 3 - 1) -.define MEM_ALLOC_PTR, MEM_CALL_STACK_END +.define_eval MEM_LOOP_DEPTH, CORE_MEM_MEM +.define_eval MEM_LOOP_I, (MEM_LOOP_DEPTH + 1) +.define_eval MEM_LOOP_J, (MEM_LOOP_I + 1) + +.define_eval MEM_CALL_STACK_LEN, 16 +.define_eval MEM_CALL_STACK_PTR, (MEM_LOOP_J + 1) +.define_eval MEM_CALL_STACK_END, (MEM_CALL_STACK_PTR + MEM_CALL_STACK_LEN) + +.define_eval MEM_ALLOC_PTR, (MEM_CALL_STACK_END + 1) + +.macro stack_transfer_alu + .std_ld + tlr CORE_REG_B + .std_ld + tlr CORE_REG_A +.endmacro .std_rset CORE_REG_A, MEM_CALL_STACK_PTR .std_set MEM_CALL_STACK_PTR -.std_rset CORE_REG_A, (MEM_ALLOC_PTR + 1) +.std_rset CORE_REG_A, MEM_ALLOC_PTR .std_set MEM_ALLOC_PTR -.jump_main +.std_jump MAIN_JUMPER call_stack_jump: .std_get MEM_CALL_STACK_PTR @@ -48,13 +66,6 @@ return_call_stack_jump: get tlr CORE_REG_PC -.macro stack_transfer_alu - .std_ld - tlr CORE_REG_B - .std_ld - tlr CORE_REG_A -.endmacro - .macro call_stack_jump, call_stack_jump_arg_0_label, call_stack_jump_arg_1_offset .std_rset CORE_REG_C, call_stack_jump_arg_0_label .std_rset CORE_REG_D, (call_stack_jump_arg_1_offset + 7) @@ -62,87 +73,84 @@ return_call_stack_jump: tlr CORE_REG_PC .endmacro +.macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label, call_stack_jump_cond_if_arg_1_offset + .std_ld + tlr CORE_REG_A + .std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label + .std_rset CORE_REG_D, (call_stack_jump_cond_if_arg_1_offset + 7) + ts call_stack_jump + tlrc CORE_REG_PC +.endmacro + +.macro call_stack_jump_cond_if_else, call_stack_jump_cond_if_else_arg_0_if_label, call_stack_jump_cond_if_else_arg_1_else_label, call_stack_jump_cond_if_else_arg_2_offset + .std_ld + tlr CORE_REG_A + .std_rset CORE_REG_C, call_stack_jump_cond_if_else_arg_0_if_label + .define_eval call_stack_jump_cond_if_else_local_end_offset, (call_stack_jump_cond_if_else_arg_2_offset + 11) + .debug call_stack_jump_cond_if_else_local_end_offset + .std_rset CORE_REG_D, call_stack_jump_cond_if_else_local_end_offset + ts call_stack_jump + tlrc CORE_REG_PC + + .std_rset CORE_REG_C, call_stack_jump_cond_if_else_arg_1_else_label + .std_rset CORE_REG_D, (call_stack_jump_cond_if_else_arg_2_offset + 11) + ts call_stack_jump + tlr CORE_REG_PC + .debug call_stack_jump_cond_if_else_local_end_offset + + .delete call_stack_jump_cond_if_else_local_end_offset +.endmacro + .macro return_call_stack_jump .std_jump return_call_stack_jump .endmacro ; data ; strings - data_strings_0: - ; original : "test\n" - ; size : 5 - .bytes 0x74 - .bytes 0x65 - .bytes 0x73 - .bytes 0x74 - .bytes 0x0a - data_strings_end_0: - - data_strings_1: - ; original : "jdsafhjfnjfn\n" - ; size : 13 - .bytes 0x6a - .bytes 0x64 - .bytes 0x73 - .bytes 0x61 - .bytes 0x66 - .bytes 0x68 - .bytes 0x6a - .bytes 0x66 - .bytes 0x6e - .bytes 0x6a - .bytes 0x66 - .bytes 0x6e - .bytes 0x0a - data_strings_end_1: - ; conditions + ; condition: 0 + conditions_if_0: + push 42 + .std_ld + tlr CORE_REG_A + .std_set CORE_MEM_OUT + .std_rset CORE_REG_A, '\n' + .std_set CORE_MEM_CHR + .return_call_stack_jump + + conditions_else_0: + push 42 + .std_ld + tlr CORE_REG_A + .std_set CORE_MEM_OUT + .std_rset CORE_REG_A, '\n' + .std_set CORE_MEM_CHR + .return_call_stack_jump + ; words + words_0: + ; name : "test" + push 40 + push 2 + .stack_transfer_alu + .std_alu CORE_ALU_ADD + tls + .return_call_stack_jump + ; main -.def_main - ts NULL ; reset tmp +main: +.org MAIN_JUMPER + ts main + tlr CORE_REG_PC - .std_rset CORE_REG_B, data_strings_0 - loop_strings_0: - tsr CORE_REG_B - get - tlr CORE_REG_A - .std_set CORE_MEM_CHR - .std_rset CORE_REG_A, 1 - .std_alu CORE_ALU_ADD - tlr CORE_REG_B - .std_rset CORE_REG_A, data_strings_end_0 - .std_alu CORE_ALU_GT - tlr CORE_REG_A - .std_cond_jump loop_strings_0 - .std_rset CORE_REG_B, data_strings_1 - loop_strings_1: - tsr CORE_REG_B - get - tlr CORE_REG_A - .std_set CORE_MEM_CHR - .std_rset CORE_REG_A, 1 - .std_alu CORE_ALU_ADD - tlr CORE_REG_B - .std_rset CORE_REG_A, data_strings_end_1 - .std_alu CORE_ALU_GT - tlr CORE_REG_A - .std_cond_jump loop_strings_1 - push 40 - push 2 - .stack_transfer_alu - .std_alu CORE_ALU_ADD - tls +.org main + push 0 + .call_stack_jump_cond_if_else conditions_if_0, conditions_else_0, OFFSET + .call_stack_jump words_0, OFFSET dbg - .std_ld - tlr CORE_REG_A - .std_rset CORE_REG_B, 2 - .std_alu CORE_ALU_ADD - tls - dbg - push 65456 + .call_stack_jump words_0, OFFSET dbg .std_stop diff --git a/examples/testforth.fth b/examples/testforth.fth index b37e53e..59949f2 100644 --- a/examples/testforth.fth +++ b/examples/testforth.fth @@ -1,6 +1,6 @@ : test 40 2 + ; -." test\n" -." jdsafhjfnjfn\n" +\ 42 42 = debug if 69 . else 420 . then cr -test debug 2+ debug -0x50 debug +0 if 42 . cr else 69 . cr then +test debug test debug diff --git a/hence/Cargo.toml b/hence/Cargo.toml index 8b56728..d5b75ee 100644 --- a/hence/Cargo.toml +++ b/hence/Cargo.toml @@ -17,3 +17,4 @@ anyhow = { version = "1.0.62", features = ["backtrace"] } rust-embed = "6.4.0" unescape = "0.1.0" parse_int = "0.6.0" +debug-ignore = "1.0.5" diff --git a/hence/lib/core.asm b/hence/lib/core.asm index a16af68..22f9457 100644 --- a/hence/lib/core.asm +++ b/hence/lib/core.asm @@ -1,51 +1,51 @@ ; hence core lib -.define NULL, 0 -.define VOID, NULL +.define_eval NULL, 0 +.define_eval VOID, NULL -.define FALSE, NULL -.define TRUE, 1 +.define_eval FALSE, NULL +.define_eval TRUE, 1 -.define CORE_U8_MAX, 0x00ff -.define CORE_U16_MAX, 0xffff +.define_eval CORE_U8_MAX, 0x00ff +.define_eval CORE_U16_MAX, 0xffff -.define CORE_KB, 1024 +.define_eval CORE_KB, 1024 -.define CORE_MEM_PRG, (0 * CORE_KB) -.define CORE_MEM_PRG_END, (32 * CORE_KB) -.define CORE_MEM_ST, CORE_MEM_PRG_END -.define CORE_MEM_MEM, (40 * CORE_KB) -.define CORE_MEM_OUT, (48 * CORE_KB) -.define CORE_MEM_CHR, (CORE_MEM_OUT + 1) -.define CORE_MEM_KEY, (CORE_MEM_CHR + 2) +.define_eval CORE_MEM_PRG, (0 * CORE_KB) +.define_eval CORE_MEM_PRG_END, (32 * CORE_KB) +.define_eval CORE_MEM_ST, CORE_MEM_PRG_END +.define_eval CORE_MEM_MEM, (40 * CORE_KB) +.define_eval CORE_MEM_OUT, (48 * CORE_KB) +.define_eval CORE_MEM_CHR, (CORE_MEM_OUT + 1) +.define_eval CORE_MEM_KEY, (CORE_MEM_CHR + 2) -.define CORE_REG_PC, 0x0 -.define CORE_REG_OPC, 0x1 -.define CORE_REG_ARG, 0x2 -.define CORE_REG_S, 0x3 -.define CORE_REG_SP, 0x4 -.define CORE_REG_A, 0x5 -.define CORE_REG_B, 0x6 -.define CORE_REG_C, 0x7 -.define CORE_REG_D, 0x8 +.define_eval CORE_REG_PC, 0x0 +.define_eval CORE_REG_OPC, 0x1 +.define_eval CORE_REG_ARG, 0x2 +.define_eval CORE_REG_S, 0x3 +.define_eval CORE_REG_SP, 0x4 +.define_eval CORE_REG_A, 0x5 +.define_eval CORE_REG_B, 0x6 +.define_eval CORE_REG_C, 0x7 +.define_eval CORE_REG_D, 0x8 -.define CORE_ALU_NOT, 0x00 -.define CORE_ALU_AND, 0x01 -.define CORE_ALU_OR, 0x02 -.define CORE_ALU_XOR, 0x03 -.define CORE_ALU_LSH, 0x04 -.define CORE_ALU_RSH, 0x05 -.define CORE_ALU_ADD, 0x06 -.define CORE_ALU_SUB, 0x07 -.define CORE_ALU_MUL, 0x08 -.define CORE_ALU_DIV, 0x09 -.define CORE_ALU_CMP, 0x0a -.define CORE_ALU_EQ, 0x0b -.define CORE_ALU_LT, 0x0c -.define CORE_ALU_GT, 0x0d -.define CORE_ALU_LEQ, 0x0e -.define CORE_ALU_GEQ, 0x0f -.define CORE_ALU_BOL, 0x10 -.define CORE_ALU_INV, 0x11 -.define CORE_ALU_RND, 0x12 -.define CORE_ALU_TME, 0x13 +.define_eval CORE_ALU_NOT, 0x00 +.define_eval CORE_ALU_AND, 0x01 +.define_eval CORE_ALU_OR, 0x02 +.define_eval CORE_ALU_XOR, 0x03 +.define_eval CORE_ALU_LSH, 0x04 +.define_eval CORE_ALU_RSH, 0x05 +.define_eval CORE_ALU_ADD, 0x06 +.define_eval CORE_ALU_SUB, 0x07 +.define_eval CORE_ALU_MUL, 0x08 +.define_eval CORE_ALU_DIV, 0x09 +.define_eval CORE_ALU_CMP, 0x0a +.define_eval CORE_ALU_EQ, 0x0b +.define_eval CORE_ALU_LT, 0x0c +.define_eval CORE_ALU_GT, 0x0d +.define_eval CORE_ALU_LEQ, 0x0e +.define_eval CORE_ALU_GEQ, 0x0f +.define_eval CORE_ALU_BOL, 0x10 +.define_eval CORE_ALU_INV, 0x11 +.define_eval CORE_ALU_RND, 0x12 +.define_eval CORE_ALU_TME, 0x13 diff --git a/hence/lib/main.asm b/hence/lib/main.asm index e0cd4d4..23de85a 100644 --- a/hence/lib/main.asm +++ b/hence/lib/main.asm @@ -3,7 +3,7 @@ .requires "$lib/core.asm" .requires "$lib/std.asm" -.define lib_main_local_jump_main, (CORE_MEM_PRG_END - 3 - 1) +.define_eval lib_main_local_jump_main, (CORE_MEM_PRG_END - 3 - 1) .macro jump_main .std_jump lib_main_local_jump_main diff --git a/hence/src/arg.rs b/hence/src/arg.rs index 36dc012..ce1862f 100644 --- a/hence/src/arg.rs +++ b/hence/src/arg.rs @@ -2,6 +2,7 @@ use anyhow::{bail, Result}; use parse_int; use rand; use std::cmp::Ordering; +use std::fmt; use unescape::unescape; use crate::arg; @@ -28,22 +29,24 @@ pub enum Arg { }, } -impl assembler::ToCode for Arg { - fn to_code(&self) -> String { +impl fmt::Display for Arg { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Arg::Char(x) => format!("'{}'", x.escape_default()), - Arg::String(x) => format!("\"{}\"", x.escape_default()), - Arg::Number(x) => x.to_string(), - Arg::Variable(x) => x.clone(), + Arg::Char(x) => write!(f, "'{}'", x.escape_default()), + Arg::String(x) => write!(f, "\"{}\"", x.escape_default()), + Arg::Number(x) => write!(f, "{}", x), + Arg::Variable(x) => write!(f, "{}", x.clone()), Arg::BinaryExpression { left, right, op } => { - format!("({} {} {})", left.to_code(), op.to_code(), right.to_code()) + write!(f, "({} {} {})", left, op, right) } } } } -impl assembler::ByteResolvable for Arg { - fn resolve_number(&self, data: &mut assembler::Data) -> Result { +impl assembler::ToCode for Arg {} + +impl assembler::ByteResolvable for Arg { + fn resolve_number(&self, data: &mut assembler::Assembler) -> Result { match self { Arg::Char(x) => Ok(*x as u16), Arg::String(x) => { @@ -115,7 +118,7 @@ impl assembler::ByteResolvable for Arg { } } - fn resolve_bytes(&self, data: &mut assembler::Data) -> Result> { + fn resolve_bytes(&self, data: &mut assembler::Assembler) -> Result> { match self { Arg::Char(x) => Ok(vec![*x as u8]), Arg::String(x) => Ok(unescape_string(x).bytes().collect()), @@ -152,7 +155,7 @@ impl assembler::ByteResolvable for Arg { } } - fn resolve_string(&self, data: &mut assembler::Data) -> Result { + fn resolve_string(&self, data: &mut assembler::Assembler) -> Result { match self { Arg::Char(x) => Ok(x.to_string()), Arg::String(x) => Ok(x.clone()), @@ -195,37 +198,39 @@ pub enum BinaryExpressionOperator { Rnd, } -impl assembler::ToCode for BinaryExpressionOperator { - fn to_code(&self) -> String { +impl fmt::Display for BinaryExpressionOperator { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - BinaryExpressionOperator::Not => "~".to_string(), - BinaryExpressionOperator::And => "&".to_string(), - BinaryExpressionOperator::Nand => "~&".to_string(), - BinaryExpressionOperator::Or => "|".to_string(), - BinaryExpressionOperator::Nor => "~|".to_string(), - BinaryExpressionOperator::Xor => "^".to_string(), - BinaryExpressionOperator::Xnor => "~^".to_string(), - BinaryExpressionOperator::Lsh => "<<".to_string(), - BinaryExpressionOperator::Rsh => ">>".to_string(), - BinaryExpressionOperator::Add => "+".to_string(), - BinaryExpressionOperator::Sub => "-".to_string(), - BinaryExpressionOperator::Mul => "*".to_string(), - BinaryExpressionOperator::Div => "/".to_string(), - BinaryExpressionOperator::Pow => "**".to_string(), - BinaryExpressionOperator::Cmp => "<=>".to_string(), - BinaryExpressionOperator::Eq => "==".to_string(), - BinaryExpressionOperator::Neq => "!=".to_string(), - BinaryExpressionOperator::Lt => "<".to_string(), - BinaryExpressionOperator::Gt => ">".to_string(), - BinaryExpressionOperator::Leq => "<=".to_string(), - BinaryExpressionOperator::Geq => ">=".to_string(), - BinaryExpressionOperator::Bol => "!!".to_string(), - BinaryExpressionOperator::Inv => "!".to_string(), - BinaryExpressionOperator::Rnd => "?".to_string(), + BinaryExpressionOperator::Not => write!(f, "~"), + BinaryExpressionOperator::And => write!(f, "&"), + BinaryExpressionOperator::Nand => write!(f, "~&"), + BinaryExpressionOperator::Or => write!(f, "|"), + BinaryExpressionOperator::Nor => write!(f, "~|"), + BinaryExpressionOperator::Xor => write!(f, "^"), + BinaryExpressionOperator::Xnor => write!(f, "~^"), + BinaryExpressionOperator::Lsh => write!(f, "<<"), + BinaryExpressionOperator::Rsh => write!(f, ">>"), + BinaryExpressionOperator::Add => write!(f, "+"), + BinaryExpressionOperator::Sub => write!(f, "-"), + BinaryExpressionOperator::Mul => write!(f, "*"), + BinaryExpressionOperator::Div => write!(f, "/"), + BinaryExpressionOperator::Pow => write!(f, "**"), + BinaryExpressionOperator::Cmp => write!(f, "<=>"), + BinaryExpressionOperator::Eq => write!(f, "=="), + BinaryExpressionOperator::Neq => write!(f, "!="), + BinaryExpressionOperator::Lt => write!(f, "<"), + BinaryExpressionOperator::Gt => write!(f, ">"), + BinaryExpressionOperator::Leq => write!(f, "<="), + BinaryExpressionOperator::Geq => write!(f, ">="), + BinaryExpressionOperator::Bol => write!(f, "!!"), + BinaryExpressionOperator::Inv => write!(f, "!"), + BinaryExpressionOperator::Rnd => write!(f, "?"), } } } +impl assembler::ToCode for BinaryExpressionOperator {} + pub fn parse_binary_operation(token: &lexer::Token) -> Result { match token { lexer::Token::Not => Ok(BinaryExpressionOperator::Not), @@ -315,7 +320,11 @@ pub fn parse_args(tokens: Vec<&lexer::Token>) -> Result> { args.push(Arg::Variable(x.clone())); } lexer::Token::Number(x) => { - args.push(Arg::Number(parse_int::parse(x)?)); + args.push(Arg::Number(if x.starts_with('-') { + -parse_int::parse::(&x[1..])? as u16 + } else { + parse_int::parse(x)? + })); } lexer::Token::LParen => { let mut depth: usize = 1; diff --git a/hence/src/assembler.rs b/hence/src/assembler.rs index 770bba0..bcc8079 100644 --- a/hence/src/assembler.rs +++ b/hence/src/assembler.rs @@ -1,24 +1,21 @@ use anyhow::{bail, Result}; +use debug_ignore::DebugIgnore; use itertools::Itertools; use rust_embed::RustEmbed; use std::collections::{HashMap, HashSet}; +use std::fmt; use std::fs; use std::path::Path; -use std::vec; use crate::arg; use crate::lexer; use crate::parser; -pub trait ToCode { - fn to_code(&self) -> String; -} +pub trait ToCode: fmt::Display {} pub trait ByteResolvable { fn resolve_number(&self, data: &mut T) -> Result; - fn resolve_bytes(&self, data: &mut T) -> Result>; - fn resolve_string(&self, data: &mut T) -> Result; } @@ -39,34 +36,34 @@ pub struct Macro { } #[derive(Debug)] -pub struct Data { +pub struct Assembler { pub dir: String, - pub ast: parser::ast::AST, - pub program: Program, + pub ast: DebugIgnore, + pub program: DebugIgnore, pub offset: u16, pub body_stack: Vec, pub constants: HashMap, - pub macros: HashMap, + pub macros: DebugIgnore>, pub includes: HashSet, - pub tmp: Vec, - pub tmp_offset: u16, - pub tmp_enabled: bool, + // pub tmp: Vec, + // pub tmp_offset: u16, + // pub tmp_enabled: bool, } -impl Data { +impl Assembler { pub fn new(dir: String, ast: parser::ast::AST) -> Self { Self { dir, body_stack: ast.body.iter().rev().cloned().collect(), - ast, - program: [0; PROGRAM_SIZE as usize], + ast: ast.into(), + program: [0; PROGRAM_SIZE as usize].into(), offset: 0, constants: HashMap::new(), - macros: HashMap::new(), + macros: HashMap::new().into(), includes: HashSet::new(), - tmp: vec![], - tmp_offset: 0, - tmp_enabled: false, + // tmp: vec![], + // tmp_offset: 0, + // tmp_enabled: false, } } @@ -113,7 +110,7 @@ impl Data { parser::ast::Node::MacroCall { name, args } => match name.as_str() { "debug" => { for arg in args { - let assembly = arg.to_code().replace('\n', "\\n"); + let assembly = arg.to_string().replace('\n', "\\n"); let num = arg.resolve_number(self)?; let bytes = arg.resolve_bytes(self)?; @@ -129,6 +126,11 @@ impl Data { Ok(None) } + "debug_assembler" => { + println!("{:#?}", self); + + Ok(None) + } "define" => { let name = match &args[0] { arg::Arg::Variable(x) | arg::Arg::String(x) => x, @@ -140,7 +142,7 @@ impl Data { Ok(None) } - "define_num_no_lazy" => { + "define_eval" => { let name = match &args[0] { arg::Arg::Variable(x) => x, _ => { @@ -152,6 +154,18 @@ impl Data { Ok(None) } + "delete" => { + for arg in args { + match arg { + arg::Arg::Variable(x) => { + self.constants.remove(&x); + } + _ => bail!("Arguments need to be variables"), + } + } + + Ok(None) + } "macro" => { let name = match &args[0] { arg::Arg::Variable(x) | arg::Arg::String(x) => x, @@ -162,7 +176,7 @@ impl Data { let args = args[1..] .iter() .map(|a| match a { - arg::Arg::Variable(x) => Ok(x.clone()), + arg::Arg::Variable(x) => Ok(x.to_owned()), _ => bail!("Macro arguments need to be variables"), }) .collect::>>()?; @@ -332,12 +346,24 @@ impl Data { call_args = if args.is_empty() { "".to_string() } else { - format!(" {}", args.iter().map(|a| a.to_code()).join(", ")) + format!(" {}", args.iter().map(|a| a.to_string()).join(", ")) } ); } + for (i, arg) in args.iter().enumerate() { - self.constants.insert(m.args[i].clone(), arg.clone()); + self.constants.insert(m.args[i].to_owned(), arg.to_owned()); + } + + if !args.is_empty() { + self.body_stack.push(parser::ast::Node::MacroCall { + name: "delete".to_string(), + args: args + .iter() + .enumerate() + .map(|(i, _)| arg::Arg::Variable(m.args[i].to_owned())) + .collect::>(), + }); } self.body_stack .append(&mut m.body.iter().rev().cloned().collect()); @@ -366,6 +392,6 @@ impl Data { } } - Ok(self.program) + Ok(*self.program) } } diff --git a/hence/src/lexer.rs b/hence/src/lexer.rs index 1260dbe..d90e7e1 100644 --- a/hence/src/lexer.rs +++ b/hence/src/lexer.rs @@ -1,5 +1,6 @@ use anyhow::{bail, Result}; use itertools::Itertools; +use std::fmt; use crate::assembler; @@ -47,48 +48,50 @@ pub enum Token { Whitespace(String), } -impl assembler::ToCode for Token { - fn to_code(&self) -> String { +impl fmt::Display for Token { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Token::Comment(x) => format!(";{}", x), - Token::CharLiteral(x) => format!("'{}'", x), - Token::StringLiteral(x) => format!("\"{}\"", x), - Token::MacroLiteral(x) => x.clone(), - Token::Literal(x) => x.clone(), - Token::Number(x) => x.clone(), - Token::Comma => ",".to_string(), - Token::Colon => ":".to_string(), - Token::LParen => "(".to_string(), - Token::RParen => ")".to_string(), - Token::Not => "~".to_string(), - Token::And => "&".to_string(), - Token::Nand => "~&".to_string(), - Token::Or => "|".to_string(), - Token::Nor => "~|".to_string(), - Token::Xor => "^".to_string(), - Token::Xnor => "~^".to_string(), - Token::Lsh => "<<".to_string(), - Token::Rsh => ">>".to_string(), - Token::Add => "+".to_string(), - Token::Sub => "-".to_string(), - Token::Mul => "*".to_string(), - Token::Div => "/".to_string(), - Token::Pow => "**".to_string(), - Token::Cmp => "<=>".to_string(), - Token::Eq => "==".to_string(), - Token::Neq => "!=".to_string(), - Token::Lt => "<".to_string(), - Token::Gt => ">".to_string(), - Token::Leq => "<=".to_string(), - Token::Geq => ">=".to_string(), - Token::Bol => "!!".to_string(), - Token::Inv => "!".to_string(), - Token::Rnd => "?".to_string(), - Token::Newline(x) | Token::Whitespace(x) => x.clone(), + Token::Comment(x) => write!(f, ";{}", x), + Token::CharLiteral(x) => write!(f, "'{}'", x), + Token::StringLiteral(x) => write!(f, "\"{}\"", x), + Token::MacroLiteral(x) => write!(f, "{}", x), + Token::Literal(x) => write!(f, "{}", x), + Token::Number(x) => write!(f, "{}", x), + Token::Comma => write!(f, ","), + Token::Colon => write!(f, ":"), + Token::LParen => write!(f, "("), + Token::RParen => write!(f, ")"), + Token::Not => write!(f, "~"), + Token::And => write!(f, "&"), + Token::Nand => write!(f, "~&"), + Token::Or => write!(f, "|"), + Token::Nor => write!(f, "~|"), + Token::Xor => write!(f, "^"), + Token::Xnor => write!(f, "~^"), + Token::Lsh => write!(f, "<<"), + Token::Rsh => write!(f, ">>"), + Token::Add => write!(f, "+"), + Token::Sub => write!(f, "-"), + Token::Mul => write!(f, "*"), + Token::Div => write!(f, "/"), + Token::Pow => write!(f, "**"), + Token::Cmp => write!(f, "<=>"), + Token::Eq => write!(f, "=="), + Token::Neq => write!(f, "!="), + Token::Lt => write!(f, "<"), + Token::Gt => write!(f, ">"), + Token::Leq => write!(f, "<="), + Token::Geq => write!(f, ">="), + Token::Bol => write!(f, "!!"), + Token::Inv => write!(f, "!"), + Token::Rnd => write!(f, "?"), + Token::Newline(x) | Token::Whitespace(x) => write!(f, "{}", x), } } } +impl assembler::ToCode for Token {} + pub fn lex(source: &str) -> Result> { let mut chars = source.chars().peekable(); let mut tokens: Vec = vec![]; @@ -125,14 +128,14 @@ pub fn lex(source: &str) -> Result> { .collect::() )) } - ch if ch.is_alphabetic() => { + _ if ch.is_alphabetic() => { let name: String = chars .peeking_take_while(|c| c.is_alphabetic() || c.is_numeric() || *c == '_') .collect(); Token::Literal(name) } - ch if ch.is_numeric() => Token::Number( + _ if ch.is_numeric() => Token::Number( chars .peeking_take_while(|c| c.is_alphanumeric() || *c == '_') .collect(), @@ -227,7 +230,16 @@ pub fn lex(source: &str) -> Result> { } '-' => { chars.next(); - Token::Sub + + match chars.peek() { + Some(ch) if ch.is_numeric() => Token::Number(format!( + "-{}", + chars + .peeking_take_while(|c| c.is_alphanumeric() || *c == '_') + .collect::(), + )), + _ => Token::Sub, + } } '*' => { chars.next(); @@ -268,7 +280,7 @@ pub fn lex(source: &str) -> Result> { Token::Rnd } '\n' => Token::Newline(chars.peeking_take_while(|c| *c == '\n').collect()), - ch if ch.is_whitespace() => Token::Whitespace( + _ if ch.is_whitespace() => Token::Whitespace( chars .peeking_take_while(|c| c.is_whitespace() && *c != '\n') .collect(), diff --git a/hence/src/main.rs b/hence/src/main.rs index d27e503..ca05da5 100644 --- a/hence/src/main.rs +++ b/hence/src/main.rs @@ -65,7 +65,7 @@ fn main() -> Result<()> { let tokens = lexer::lex(&assembly)?; let ast = parser::parse(tokens)?; - let mut data = assembler::Data::new( + let mut data = assembler::Assembler::new( match match Path::new(&src).parent() { Some(x) => x.to_str().map(|y| y.to_string()), None => None, @@ -78,10 +78,10 @@ fn main() -> Result<()> { data.assemble()?; if let Some(x) = bin { - File::create(x)?.write_all(&data.program)?; + File::create(x)?.write_all(&*data.program)?; } if dump { - println!("{}", rhexdump::hexdump(&data.program)); + println!("{}", rhexdump::hexdump(&*data.program)); } Ok(()) diff --git a/hence/src/parser/ast.rs b/hence/src/parser/ast.rs index 7963d5a..7233cbb 100644 --- a/hence/src/parser/ast.rs +++ b/hence/src/parser/ast.rs @@ -1,7 +1,7 @@ use itertools::Itertools; +use std::fmt; -use crate::arg; -use crate::assembler; +use crate::{arg, assembler}; #[derive(Debug, Clone)] pub enum Node { @@ -11,29 +11,31 @@ pub enum Node { MacroCall { name: String, args: Vec }, } -impl assembler::ToCode for Node { - fn to_code(&self) -> String { +impl fmt::Display for Node { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Node::Comment(x) => format!("; {x}"), - Node::Label(x) => format!("{x}:"), + Node::Comment(x) => write!(f, "; {}", x), + Node::Label(x) => write!(f, "{}:", x), Node::Call { name, arg } => { if let Some(a) = arg { - format!("{name} {arg}", arg = a.to_code()) + write!(f, "{} {}", name, a) } else { - name.clone() + write!(f, "{}", name) } } Node::MacroCall { name, args } => { if args.is_empty() { - format!(".{name}") + write!(f, ".{}", name) } else { - format!(".{name} {}", args.iter().map(|a| a.to_code()).join(", ")) + write!(f, ".{} {}", name, args.iter().join(", ")) } } } } } +impl assembler::ToCode for Node {} + pub type Body = Vec; #[derive(Debug, Clone)] @@ -41,8 +43,10 @@ pub struct AST { pub body: Vec, } -impl assembler::ToCode for AST { - fn to_code(&self) -> String { - self.body.iter().map(|n| n.to_code()).join("\n") +impl fmt::Display for AST { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", itertools::free::join(&self.body, "\n")) } } + +impl assembler::ToCode for AST {} diff --git a/henceforth/src/compiler.rs b/henceforth/src/compiler.rs index 686d75a..4208dda 100644 --- a/henceforth/src/compiler.rs +++ b/henceforth/src/compiler.rs @@ -27,6 +27,12 @@ pub struct Condition { pub else_instructions: Vec, } +impl Condition { + pub fn only_if(&self) -> bool { + self.else_instructions.is_empty() + } +} + #[derive(Debug)] pub enum CallableId { Word(String), @@ -206,13 +212,13 @@ impl Compiler { } pub fn compile(ast: parser::ast::AST, optimize: bool) -> Result { - let mut data = Compiler::default(); - let instructions = data.generate_instructions(ast.body, optimize)?; + let mut compiler = Compiler::default(); + let instructions = compiler.generate_instructions(ast.body, optimize)?; - Ok(data.embed( + Ok(compiler.embed( instructions .iter() - .map(|ins| ins.compile(&data)) + .map(|ins| ins.compile(&compiler)) .collect::>>()? .into_iter() .flatten() diff --git a/henceforth/src/compiler/instruction.rs b/henceforth/src/compiler/instruction.rs index 498f31d..6ca5e29 100644 --- a/henceforth/src/compiler/instruction.rs +++ b/henceforth/src/compiler/instruction.rs @@ -76,7 +76,7 @@ pub enum Instruction { } impl compiler::Compilable for Instruction { - fn compile(&self, data: &compiler::Compiler) -> Result { + fn compile(&self, compiler: &compiler::Compiler) -> Result { match self { Instruction::Nop => Ok(vec![hence::parser::ast::Node::Call { name: "nop".to_string(), @@ -1223,7 +1223,7 @@ impl compiler::Compilable for Inst }, ]), Instruction::Mod => Ok(vec![]), - Instruction::Call(x) => match data.words.get(x) { + Instruction::Call(x) => match compiler.words.get(x) { Some(w) => { if w.times_used > 1 { Ok(vec![hence::parser::ast::Node::MacroCall { @@ -1236,7 +1236,7 @@ impl compiler::Compilable for Inst } else { Ok(w.instructions .iter() - .map(|ins| ins.compile(data)) + .map(|ins| ins.compile(compiler)) .collect::>>()? .into_iter() .flatten() @@ -1248,22 +1248,39 @@ impl compiler::Compilable for Inst // Instruction::Call(x) => bail!("Unknown word: {}", x), Instruction::AsmQuote(x) => Ok(hence::parser::parse(hence::lexer::lex(x)?)?.body), // Instruction::Condition(x) => Ok(vec![]), - Instruction::Condition(x) => { - // dbg!(x); - Ok(vec![]) - } + Instruction::Condition(x) => match compiler.conditions.get(*x) { + Some(cond) => Ok(vec![if cond.only_if() { + hence::parser::ast::Node::MacroCall { + name: "call_stack_jump_cond_if".to_string(), + args: vec![ + hence::arg::Arg::Variable(format!("conditions_if_{}", x)), + hence::arg::Arg::Variable("OFFSET".to_string()), + ], + } + } else { + hence::parser::ast::Node::MacroCall { + name: "call_stack_jump_cond_if_else".to_string(), + args: vec![ + hence::arg::Arg::Variable(format!("conditions_if_{}", x)), + hence::arg::Arg::Variable(format!("conditions_else_{}", x)), + hence::arg::Arg::Variable("OFFSET".to_string()), + ], + } + }]), + None => bail!("Condition by index not found: {}", x), + }, Instruction::Multiple { instruction, count } => { if *count == 0 { Ok(vec![]) } else if *count == 1 { - Ok(instruction.compile(data)?) + Ok(instruction.compile(compiler)?) } else { match **instruction { - Instruction::Nop => Ok(Instruction::Nop.compile(data)?), - Instruction::Quit => Ok(Instruction::Quit.compile(data)?), + Instruction::Nop => Ok(Instruction::Nop.compile(compiler)?), + Instruction::Quit => Ok(Instruction::Quit.compile(compiler)?), Instruction::Push(x) => Ok([ - Instruction::Push(x).compile(data)?, + Instruction::Push(x).compile(compiler)?, [hence::parser::ast::Node::Call { name: "tls".to_string(), arg: None, @@ -1275,16 +1292,16 @@ impl compiler::Compilable for Inst ] .concat()), Instruction::Depth => Ok([ - Instruction::Depth.compile(data)?, + Instruction::Depth.compile(compiler)?, Instruction::Multiple { instruction: Box::new(Instruction::Dup), count: count - 1, } - .compile(data)?, + .compile(compiler)?, ] .concat()), Instruction::Dup => Ok([ - Instruction::Dup.compile(data)?, + Instruction::Dup.compile(compiler)?, [hence::parser::ast::Node::Call { name: "tls".to_string(), arg: None, @@ -1299,11 +1316,11 @@ impl compiler::Compilable for Inst if count % 2 == 0 { Ok(vec![]) } else { - Ok(Instruction::Swap.compile(data)?) + Ok(Instruction::Swap.compile(compiler)?) } } Instruction::Over => Ok([ - Instruction::Over.compile(data)?, + Instruction::Over.compile(compiler)?, (0..count - 1) .flat_map(|n| { if n % 2 == 0 { @@ -1339,7 +1356,7 @@ impl compiler::Compilable for Inst .concat()), Instruction::Rot => match count % 3 { 0 => Ok(vec![]), - 1 => Ok(Instruction::Rot.compile(data)?), + 1 => Ok(Instruction::Rot.compile(compiler)?), 2 => Ok(vec![ hence::parser::ast::Node::MacroCall { name: "std_ld".to_string(), @@ -1412,7 +1429,7 @@ impl compiler::Compilable for Inst ] .concat()), Instruction::I | Instruction::J => Ok([ - instruction.compile(data)?, + instruction.compile(compiler)?, [hence::parser::ast::Node::Call { name: "tls".to_string(), arg: None, @@ -1443,7 +1460,7 @@ impl compiler::Compilable for Inst ] .concat()), Instruction::Space | Instruction::Cr => Ok([ - instruction.compile(data)?, + instruction.compile(compiler)?, [hence::parser::ast::Node::Call { name: "set".to_string(), arg: None, @@ -1455,7 +1472,7 @@ impl compiler::Compilable for Inst ] .concat()), _ => { - let compiled = instruction.compile(data)?; + let compiled = instruction.compile(compiler)?; let len = compiled.len() * count; Ok(compiled.into_iter().cycle().take(len).collect()) } diff --git a/henceforth/src/compiler/templates.rs b/henceforth/src/compiler/templates.rs index 8ac9897..35d93db 100644 --- a/henceforth/src/compiler/templates.rs +++ b/henceforth/src/compiler/templates.rs @@ -1,5 +1,4 @@ use askama::Template; -use hence::assembler::ToCode; pub struct IdLike { pub id: T, diff --git a/henceforth/src/lexer.rs b/henceforth/src/lexer.rs index d5f8549..4c2fcdd 100644 --- a/henceforth/src/lexer.rs +++ b/henceforth/src/lexer.rs @@ -1,6 +1,7 @@ use anyhow::Result; use hence::assembler::ToCode; use itertools::Itertools; +use std::fmt; use crate::compiler; @@ -18,20 +19,22 @@ pub enum Token { Word(String), } -impl ToCode for Token { - fn to_code(&self) -> String { +impl fmt::Display for Token { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Token::Newline(x) => ["\n"].into_iter().cycle().take(*x).join(""), - Token::Whitespace(x) => [" "].into_iter().cycle().take(*x).join(""), - Token::ParenComment(x) => format!("( {})", x), - Token::BackslashComment(x) => format!("\\{}", x), - Token::DoubleDashComment(x) => format!("-- {}", x), - Token::StringLiteral { mode, string } => format!("{}\" {}\"", mode, string), - Token::Number(x) | Token::Word(x) => x.clone(), + Token::Newline(x) => write!(f, "{}", ["\n"].into_iter().cycle().take(*x).join("")), + Token::Whitespace(x) => write!(f, "{}", [" "].into_iter().cycle().take(*x).join("")), + Token::ParenComment(x) => write!(f, "( {})", x), + Token::BackslashComment(x) => write!(f, "\\{}", x), + Token::DoubleDashComment(x) => write!(f, "-- {}", x), + Token::StringLiteral { mode, string } => write!(f, "{}\" {}\"", mode, string), + Token::Number(x) | Token::Word(x) => write!(f, "{}", x), } } } +impl ToCode for Token {} + pub fn is_space(c: char) -> bool { c.is_whitespace() || c == '\n' } @@ -56,7 +59,9 @@ pub fn lex(source: &str) -> Result> { '\\' => Token::BackslashComment(chars.peeking_take_while(|&c| c != '\n').collect()), _ if c.is_numeric() => { // Token::Number(chars.peeking_take_while(|&c| !is_space(c)).collect()) - convert_to_word_with_number_bias(chars.peeking_take_while(|&c| !is_space(c)).collect()) + convert_to_word_with_number_bias( + chars.peeking_take_while(|&c| !is_space(c)).collect(), + ) } _ => { let x: String = chars.peeking_take_while(|&c| !is_space(c)).collect(); diff --git a/henceforth/src/parser/ast.rs b/henceforth/src/parser/ast.rs index fdc5525..66a28bf 100644 --- a/henceforth/src/parser/ast.rs +++ b/henceforth/src/parser/ast.rs @@ -1,5 +1,5 @@ use hence::assembler::ToCode; -use itertools::Itertools; +use std::fmt; #[derive(Debug, PartialEq, Eq, Clone)] pub struct StackResult { @@ -7,9 +7,10 @@ pub struct StackResult { pub after: Vec, } -impl ToCode for StackResult { - fn to_code(&self) -> String { - format!( +impl fmt::Display for StackResult { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!( + f, "{}--{}", if self.before.is_empty() { "".to_string() @@ -25,6 +26,8 @@ impl ToCode for StackResult { } } +impl ToCode for StackResult {} + #[derive(Debug, PartialEq, Eq)] pub enum Node { Comment(String), @@ -45,37 +48,49 @@ pub enum Node { Word(String), } -impl ToCode for Node { - fn to_code(&self) -> String { +impl fmt::Display for Node { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Node::Comment(x) => format!("\\ {}", x), - Node::String { mode, string } => format!("{}\" {}\"", mode, string), - Node::Number(x) => x.to_string(), - Node::WordDefinition { name, stack, body } => format!( + Node::Comment(x) => write!(f, "\\ {}", x), + Node::String { mode, string } => write!(f, "{}\" {}\"", mode, string), + Node::Number(x) => write!(f, "{}", x), + Node::WordDefinition { name, stack, body } => write!( + f, ": {}{} {} ;", name, match stack { - Some(x) => format!(" {}", x.to_code()), + Some(x) => format!(" {}", x), None => "".to_string(), }, - body.iter().map(|x| x.to_code()).join(" ") + // body.iter().map(|x| x.to_code()).join(" ") + itertools::free::join(body, " ") ), Node::Condition { if_body, else_body } => { if else_body.is_empty() { - format!("if {} then", if_body.iter().map(|x| x.to_code()).join(" ")) + write!( + f, + "if {} then", + // if_body.iter().map(|x| x.to_code()).join(" ") + itertools::free::join(if_body, " ") + ) } else { - format!( + write!( + f, "if {} else {} then", - if_body.iter().map(|x| x.to_code()).join(" "), - else_body.iter().map(|x| x.to_code()).join(" ") + // if_body.iter().map(|x| x.to_code()).join(" "), + itertools::free::join(if_body, " "), + // else_body.iter().map(|x| x.to_code()).join(" ") + itertools::free::join(else_body, " "), ) } } - Node::Word(x) => x.to_owned(), + Node::Word(x) => write!(f, "{}", x), } } } +impl ToCode for Node {} + pub type Body = Vec; #[derive(Debug)] @@ -83,8 +98,10 @@ pub struct AST { pub body: Body, } -impl ToCode for AST { - fn to_code(&self) -> String { - self.body.iter().map(|x| x.to_code()).join(" ") +impl fmt::Display for AST { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", itertools::free::join(&self.body, "\n")) } } + +impl ToCode for AST {} diff --git a/henceforth/templates/default.asm b/henceforth/templates/default.asm index d97cfa5..124294c 100644 --- a/henceforth/templates/default.asm +++ b/henceforth/templates/default.asm @@ -4,24 +4,42 @@ .include "$lib/core.asm" .include "$lib/std.asm" -.include "$lib/main.asm" +;.include "$lib/main.asm" -.define MEM_LOOP_I, CORE_MEM_MEM -.define MEM_LOOP_J, (MEM_LOOP_I + 1) +.define_eval prev, OFFSET + ts CORE_U16_MAX + tlr CORE_REG_PC +.define_eval diff, (OFFSET - prev) +.define_eval MAIN_JUMPER, (CORE_MEM_PRG_END - diff) +.org prev +.delete prev, diff -.define MEM_CALL_STACK_LEN, 16 -.define MEM_CALL_STACK_PTR, (MEM_LOOP_J + 1) -.define MEM_CALL_STACK_END, (MEM_CALL_STACK_PTR + MEM_CALL_STACK_LEN) +.define_eval MAIN_JUMPER, (CORE_MEM_PRG_END - 3 - 1) -.define MEM_ALLOC_PTR, MEM_CALL_STACK_END +.define_eval MEM_LOOP_DEPTH, CORE_MEM_MEM +.define_eval MEM_LOOP_I, (MEM_LOOP_DEPTH + 1) +.define_eval MEM_LOOP_J, (MEM_LOOP_I + 1) + +.define_eval MEM_CALL_STACK_LEN, 16 +.define_eval MEM_CALL_STACK_PTR, (MEM_LOOP_J + 1) +.define_eval MEM_CALL_STACK_END, (MEM_CALL_STACK_PTR + MEM_CALL_STACK_LEN) + +.define_eval MEM_ALLOC_PTR, (MEM_CALL_STACK_END + 1) + +.macro stack_transfer_alu + .std_ld + tlr CORE_REG_B + .std_ld + tlr CORE_REG_A +.endmacro .std_rset CORE_REG_A, MEM_CALL_STACK_PTR .std_set MEM_CALL_STACK_PTR -.std_rset CORE_REG_A, (MEM_ALLOC_PTR + 1) +.std_rset CORE_REG_A, MEM_ALLOC_PTR .std_set MEM_ALLOC_PTR -.jump_main +.std_jump MAIN_JUMPER call_stack_jump: .std_get MEM_CALL_STACK_PTR @@ -52,13 +70,6 @@ return_call_stack_jump: get tlr CORE_REG_PC -.macro stack_transfer_alu - .std_ld - tlr CORE_REG_B - .std_ld - tlr CORE_REG_A -.endmacro - .macro call_stack_jump, call_stack_jump_arg_0_label, call_stack_jump_arg_1_offset .std_rset CORE_REG_C, call_stack_jump_arg_0_label .std_rset CORE_REG_D, (call_stack_jump_arg_1_offset + 7) @@ -66,6 +77,48 @@ return_call_stack_jump: tlr CORE_REG_PC .endmacro +.macro call_stack_jump_cond_if, call_stack_jump_cond_if_arg_0_if_label, call_stack_jump_cond_if_arg_1_offset + .std_ld + tlr CORE_REG_A + .std_rset CORE_REG_C, call_stack_jump_cond_if_arg_0_if_label + .std_rset CORE_REG_D, (call_stack_jump_cond_if_arg_1_offset + 7) + ts call_stack_jump + tlrc CORE_REG_PC +.endmacro + +.define_eval prev, OFFSET + .std_ld + tlr CORE_REG_A + .std_rset CORE_REG_C, CORE_U16_MAX + .std_rset CORE_REG_D, CORE_U16_MAX + ts call_stack_jump + tlrc CORE_REG_PC + + .std_rset CORE_REG_C, CORE_U16_MAX + .std_rset CORE_REG_D, CORE_U16_MAX + ts call_stack_jump + tlr CORE_REG_PC +.define_eval CALL_STACK_JUMP_COND_IF_ELSE_SIZE, (OFFSET - prev) +.delete prev + +.macro call_stack_jump_cond_if_else, call_stack_jump_cond_if_else_arg_0_if_label, call_stack_jump_cond_if_else_arg_1_else_label, call_stack_jump_cond_if_else_arg_2_offset + .define_eval prev, OFFSET + + .std_ld + tlr CORE_REG_A + .std_rset CORE_REG_C, call_stack_jump_cond_if_else_arg_0_if_label + .std_rset CORE_REG_D, (call_stack_jump_cond_if_else_arg_2_offset) + ts call_stack_jump + tlrc CORE_REG_PC + + .std_rset CORE_REG_C, call_stack_jump_cond_if_else_arg_1_else_label + .std_rset CORE_REG_D, (call_stack_jump_cond_if_else_arg_2_offset + 11) + ts call_stack_jump + tlr CORE_REG_PC + + .delete prev +.endmacro + .macro return_call_stack_jump .std_jump return_call_stack_jump .endmacro @@ -89,13 +142,15 @@ return_call_stack_jump: ; condition: {{ c.id }} conditions_if_{{ c.id }}: {%- for ins in c.data.0 %} - {{ ins.to_code() }} + {{ ins }} {%- endfor %} + .return_call_stack_jump conditions_else_{{ c.id }}: {%- for ins in c.data.0 %} - {{ ins.to_code() }} + {{ ins }} {%- endfor %} + .return_call_stack_jump {% endfor %} ; words @@ -104,15 +159,19 @@ return_call_stack_jump: {% let name = snailquote::escape(w.data.0) -%} ; name : {% call escape_name(name) %} {%- for node in w.data.1 %} - {{ node.to_code() }} + {{ node }} {%- endfor %} - .return_call_stack_jump + .return_call_stack_jump {% endfor %} ; main -.def_main - ts NULL ; reset tmp -{% for node in main %} - {{ node.to_code() }} +main: +.org MAIN_JUMPER + ts main + tlr CORE_REG_PC + +.org main +{%- for node in main %} + {{ node }} {%- endfor %} .std_stop diff --git a/syntax/.vscode/launch.json b/syntax/.vscode/launch.json new file mode 100644 index 0000000..0e191b5 --- /dev/null +++ b/syntax/.vscode/launch.json @@ -0,0 +1,17 @@ +// A launch configuration that launches the extension inside a new window +// Use IntelliSense to learn about possible attributes. +// Hover to view descriptions of existing attributes. +// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Extension", + "type": "extensionHost", + "request": "launch", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}" + ] + } + ] +} \ No newline at end of file diff --git a/syntax/.vscodeignore b/syntax/.vscodeignore new file mode 100644 index 0000000..f369b5e --- /dev/null +++ b/syntax/.vscodeignore @@ -0,0 +1,4 @@ +.vscode/** +.vscode-test/** +.gitignore +vsc-extension-quickstart.md diff --git a/syntax/CHANGELOG.md b/syntax/CHANGELOG.md new file mode 100644 index 0000000..0337b63 --- /dev/null +++ b/syntax/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change Log + +All notable changes to the "hence" extension will be documented in this file. + +Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. + +## [Unreleased] + +- Initial release \ No newline at end of file diff --git a/syntax/LICENSE b/syntax/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/syntax/LICENSE @@ -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/syntax/README.md b/syntax/README.md new file mode 100644 index 0000000..44f981a --- /dev/null +++ b/syntax/README.md @@ -0,0 +1 @@ +# hence diff --git a/syntax/hence.iro b/syntax/hence.iro new file mode 100644 index 0000000..a65e422 --- /dev/null +++ b/syntax/hence.iro @@ -0,0 +1,140 @@ +################################################################# +## Iro +################################################################ +## +## * Press Ctrl + '+'/'-' To Zoom in +## * Press Ctrl + S to save and recalculate... +## * Documents are saved to web storage. +## * Only one save slot supported. +## * Matches cannot span lines. +## * Unicode chars must be defined in \u0000 to \uffff format. +## * All matches must be contained by a single group ( ... ) +## * Look behinds not permitted, (?<= or (? + + + + + fileTypes + + asm + + name + hence + patterns + + + include + #main + + + scopeName + source.hence + uuid + + repository + + main + + patterns + + + match + (".*") + name + text.hence + + + match + (\S*:) + name + keyword.hence + + + match + (\.\b\S*) + name + keyword.hence + + + match + (\b\S*) + name + keyword.hence + + + match + (;.*) + name + comment.hence + + + match + ([^\s]) + name + invalid.hence + + + + + + diff --git a/syntax/vsc-extension-quickstart.md b/syntax/vsc-extension-quickstart.md new file mode 100644 index 0000000..52499ef --- /dev/null +++ b/syntax/vsc-extension-quickstart.md @@ -0,0 +1,29 @@ +# Welcome to your VS Code Extension + +## What's in the folder + +* This folder contains all of the files necessary for your extension. +* `package.json` - this is the manifest file in which you declare your language support and define the location of the grammar file that has been copied into your extension. +* `syntaxes/hence.tmLanguage` - this is the Text mate grammar file that is used for tokenization. +* `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets. + +## Get up and running straight away + +* Make sure the language configuration settings in `language-configuration.json` are accurate. +* Press `F5` to open a new window with your extension loaded. +* Create a new file with a file name suffix matching your language. +* Verify that syntax highlighting works and that the language configuration settings are working. + +## Make changes + +* You can relaunch the extension from the debug toolbar after making changes to the files listed above. +* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes. + +## Add more language features + +* To add features such as IntelliSense, hovers and validators check out the VS Code extenders documentation at https://code.visualstudio.com/docs + +## Install your extension + +* To start using your extension with Visual Studio Code copy it into the `/.vscode/extensions` folder and restart Code. +* To share your extension with the world, read on https://code.visualstudio.com/docs about publishing an extension.