diff --git a/gui/Cargo.toml b/gui/Cargo.toml
index 276e2f1f73..cbbb971ba1 100644
--- a/gui/Cargo.toml
+++ b/gui/Cargo.toml
@@ -7,6 +7,7 @@ members = [
"lib/core/msdf-sys",
"lib/data",
"lib/eval-tt",
+ "lib/logger",
"lib/optics",
"lib/prelude",
"lib/code-builder",
@@ -15,16 +16,16 @@ members = [
]
[profile.dev]
-opt-level = 1
+opt-level = 3
lto = false
debug = true
[profile.release]
opt-level = 3
lto = true
-# TODO: consider if we need it here. See discussion here: https://github.com/luna/basegl/pull/105
-debug = true
+debug = false
[profile.bench]
opt-level = 3
lto = true
+debug = false
diff --git a/gui/LICENSE b/gui/LICENSE
index 1e9ffa7076..0ad25db4bd 100644
--- a/gui/LICENSE
+++ b/gui/LICENSE
@@ -1,21 +1,661 @@
-The MIT License
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
-Copyright (c) 2019 Luna Team, Inc. http://luna-lang.org
+ 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.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Preamble
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.
diff --git a/gui/README.md b/gui/README.md
index 90938f640b..624b861968 100644
--- a/gui/README.md
+++ b/gui/README.md
@@ -61,6 +61,13 @@ please use the `npm run prod-server` command.
**Please remember to disable the cache in your browser during development!**
+### Minimizing the WASM binary size.
+After building the project you can use the `scripts/minimize_wasm.sh` to optimize
+the binary and compress it by using `gzip`. After the script is complete, the
+final size is printed to stdout. Please note that in order to run the script, the
+[Binaryen](https://github.com/WebAssembly/binaryen) toolkit has to be installed
+on your system.
+
### Running tests
The sources use both unit tests and web test, which are run in a browser and
produce visual results. To run them, use the `scripts/test.sh` script and follow
diff --git a/gui/examples/webpack.common.js b/gui/examples/webpack.common.js
index 35d90843cd..f718c32b50 100644
--- a/gui/examples/webpack.common.js
+++ b/gui/examples/webpack.common.js
@@ -25,6 +25,6 @@ module.exports = {
},
performance: {
hints: 'error',
- maxAssetSize: 3.8 * mb,
+ maxAssetSize: 4.0 * mb,
},
};
diff --git a/gui/lib/core/Cargo.toml b/gui/lib/core/Cargo.toml
index 0bc772a292..b239c6ce48 100644
--- a/gui/lib/core/Cargo.toml
+++ b/gui/lib/core/Cargo.toml
@@ -8,35 +8,37 @@ edition = "2018"
crate-type = ["rlib", "cdylib"]
[features]
-default = ["no_unboxed_callbacks"]
+default = ["statistics", "no_unboxed_callbacks"]
+statistics = []
no_unboxed_callbacks = []
[dependencies]
-data = { version = "0.1.0" , path = "../data" }
-basegl-prelude = { version = "0.1.0" , path = "../prelude" }
-eval-tt = { version = "0.1.0" , path = "../eval-tt" }
-optics = { version = "0.1.0" , path = "../optics" }
-basegl-system-web = { version = "0.1.0" , path = "../system/web" }
basegl-core-embedded-fonts = { version = "0.1.0" , path = "embedded-fonts" }
basegl-core-msdf-sys = { version = "0.1.0" , path = "msdf-sys" }
-shapely = { version = "0.1.0" , path = "../shapely/impl" }
+basegl-prelude = { version = "0.1.0" , path = "../prelude" }
+basegl-system-web = { version = "0.1.0" , path = "../system/web" }
code-builder = { version = "0.1.0" , path = "../code-builder" }
-wasm-bindgen = { version = "^0.2" , features = ["nightly"] }
-js-sys = { version = "0.3.28" }
-failure = { version = "0.1.5" }
-derive_more = { version = "0.15.0" }
-shrinkwraprs = { version = "0.3.0" }
-itertools = { version = "0.8" }
-nalgebra = { version = "0.19.0" }
+data = { version = "0.1.0" , path = "../data" }
+eval-tt = { version = "0.1.0" , path = "../eval-tt" }
+logger = { version = "0.1.0" , path = "../logger" }
+optics = { version = "0.1.0" , path = "../optics" }
+shapely = { version = "0.1.0" , path = "../shapely/impl" }
+
bit_field = { version = "0.10.0" }
-paste = { version = "0.1.6" }
-enum_dispatch = { version = "0.2.0" }
-typenum = { version = "1.11.2" }
-rustc-hash = { version = "1.0.1" }
console_error_panic_hook = { version = "0.1.6" }
-num_enum = { version = "0.4.2" }
-smallvec = { version = "1.0.0" }
+enum_dispatch = { version = "0.2.0" }
+failure = { version = "0.1.5" }
Inflector = { version = "0.11.4" }
+itertools = { version = "0.8" }
+js-sys = { version = "0.3.28" }
+nalgebra = { version = "0.19.0" }
+num_enum = { version = "0.4.2" }
+paste = { version = "0.1.6" }
+rustc-hash = { version = "1.0.1" }
+shrinkwraprs = { version = "0.3.0" }
+smallvec = { version = "1.0.0" }
+typenum = { version = "1.11.2" }
+wasm-bindgen = { version = "^0.2" , features = ["nightly"] }
[dependencies.web-sys]
version = "0.3.4"
@@ -50,7 +52,10 @@ features = [
'HtmlCanvasElement',
'HtmlCollection',
'HtmlElement',
+ 'HtmlImageElement',
+ 'Location',
'Node',
+ 'Url',
'WebGlBuffer',
'WebGlProgram',
'WebGlRenderingContext',
diff --git a/gui/lib/core/src/animation/physics/inertia.rs b/gui/lib/core/src/animation/physics/inertia.rs
index 075fe0d862..eda86ca913 100644
--- a/gui/lib/core/src/animation/physics/inertia.rs
+++ b/gui/lib/core/src/animation/physics/inertia.rs
@@ -8,7 +8,6 @@ use crate::prelude::*;
use crate::animation::animator::Animator;
use crate::animation::animator::fixed_step::IntervalCounter;
-use crate::math::utils::linear_interpolation;
use crate::animation::position::HasPosition;
use crate::system::web::animation_frame_loop::AnimationFrameLoop;
@@ -20,6 +19,7 @@ use nalgebra::zero;
// ====================
// === PhysicsForce ===
// ====================
+
/// A trait for implementing 3 dimensional forces.
pub trait PhysicsForce {
fn force(&self, kinematics:&KinematicsProperties) -> Vector3;
@@ -291,3 +291,19 @@ fn simulate(properties:&mut PhysicsProperties, delta_ms:f32) -> Vector3 {
});
properties.kinematics().position()
}
+
+
+
+// =============
+// === Utils ===
+// =============
+
+use nalgebra::clamp;
+use std::ops::Mul;
+use std::ops::Add;
+
+pub fn linear_interpolation(a:T, b:T, t:f32) -> T
+ where T : Mul + Add {
+ let t = clamp(t, 0.0, 1.0);
+ a * (1.0 - t) + b * t
+}
diff --git a/gui/lib/core/src/control.rs b/gui/lib/core/src/control.rs
index a889d1c843..3f40a50218 100644
--- a/gui/lib/core/src/control.rs
+++ b/gui/lib/core/src/control.rs
@@ -1,6 +1,4 @@
-#![allow(missing_docs)]
-
//! Root module for all control abstractions, like event loops or event systems.
pub mod callback;
-pub mod mouse_manager;
+pub mod io;
diff --git a/gui/lib/core/src/control/callback.rs b/gui/lib/core/src/control/callback.rs
index 28307085a9..feb4d1408b 100644
--- a/gui/lib/core/src/control/callback.rs
+++ b/gui/lib/core/src/control/callback.rs
@@ -8,6 +8,18 @@ use crate::prelude::*;
// === Callback ===
// ================
+/// Immutable callback type.
+pub trait CallbackFn = Fn() + 'static;
+
+/// Immutable callback object.
+pub type Callback = Box;
+
+/// Callback object smart constructor.
+#[allow(non_snake_case)]
+pub fn Callback(f:F) -> Callback {
+ Box::new(f)
+}
+
/// Callback accepted by the `CallbackRegistry`.
pub trait CallbackMut = FnMut() + 'static;
diff --git a/gui/lib/core/src/control/io.rs b/gui/lib/core/src/control/io.rs
new file mode 100644
index 0000000000..fbe048208a
--- /dev/null
+++ b/gui/lib/core/src/control/io.rs
@@ -0,0 +1,3 @@
+//! Root module for all Input / Output events and devices.
+
+pub mod mouse;
diff --git a/gui/lib/core/src/control/mouse_manager.rs b/gui/lib/core/src/control/io/mouse.rs
similarity index 99%
rename from gui/lib/core/src/control/mouse_manager.rs
rename to gui/lib/core/src/control/io/mouse.rs
index db1e3b2fd1..62097b6505 100644
--- a/gui/lib/core/src/control/mouse_manager.rs
+++ b/gui/lib/core/src/control/io/mouse.rs
@@ -1,4 +1,6 @@
-use crate::display::render::css3d::DOMContainer;
+#![allow(missing_docs)]
+
+use crate::system::web::dom::DOMContainer;
use crate::system::web::dyn_into;
use crate::system::web::Result;
use crate::system::web::Error;
@@ -359,4 +361,4 @@ where T : FnMut(WheelEvent) + 'static {
},
Err(_) => Err(Error::FailedToAddEventListener)
}
-}
\ No newline at end of file
+}
diff --git a/gui/lib/core/src/data.rs b/gui/lib/core/src/data.rs
index a82a1b4286..627f56a8af 100644
--- a/gui/lib/core/src/data.rs
+++ b/gui/lib/core/src/data.rs
@@ -4,3 +4,5 @@ pub mod container;
pub mod dirty;
pub mod function;
pub mod seq;
+
+pub use data::opt_vec::OptVec;
diff --git a/gui/lib/core/src/data/dirty.rs b/gui/lib/core/src/data/dirty.rs
index 3593f5b61e..4a6026ee29 100644
--- a/gui/lib/core/src/data/dirty.rs
+++ b/gui/lib/core/src/data/dirty.rs
@@ -9,8 +9,6 @@
use crate::prelude::*;
use crate::data::function::callback::*;
-use crate::system::web::group;
-use crate::system::web::Logger;
use rustc_hash::FxHashSet;
use std::hash::Hash;
use std::mem;
@@ -69,18 +67,18 @@ use traits::*;
/// logging and callback utilities to the underlying data. Moreover, it
/// implements public API for working with dirty flags.
#[derive(Derivative)]
-#[derivative(Debug(bound = "T:Debug"))]
-pub struct DirtyFlag {
+#[derivative(Debug(bound="T:Debug"))]
+pub struct DirtyFlag {
pub data : T,
- on_set : Callback,
+ on_set : Function,
logger : Logger,
}
// === Basics ===
-impl DirtyFlag {
- pub fn new(logger: Logger, on_set:Callback) -> Self {
+impl DirtyFlag {
+ pub fn new(logger: Logger, on_set: Function) -> Self {
let data = default();
Self {data,on_set,logger}
}
@@ -93,36 +91,36 @@ impl DirtyFlag {
// === Arguments ===
-impl
-HasArg for DirtyFlag {
+impl
+HasArg for DirtyFlag {
type Arg = Arg;
}
// === Global Operations ===
-impl
-HasCheckAll for DirtyFlag {
+impl
+HasCheckAll for DirtyFlag {
fn check_all(&self) -> bool { self.data.check_all() }
}
-impl
-HasUnsetAll for DirtyFlag {
+impl
+HasUnsetAll for DirtyFlag {
fn unset_all(&mut self) { self.data.unset_all() }
}
// === Check ===
-impl
-HasCheck0 for DirtyFlag {
+impl
+HasCheck0 for DirtyFlag {
fn check(&self) -> bool {
self.data.check()
}
}
-impl
-HasCheck1 for DirtyFlag {
+impl
+HasCheck1 for DirtyFlag {
fn check(&self, arg: &Self::Arg) -> bool {
self.data.check(arg)
}
@@ -131,8 +129,8 @@ HasCheck1 for DirtyFlag {
// === Set ===
-impl
-HasSet0 for DirtyFlag {
+impl
+HasSet0 for DirtyFlag {
fn set(&mut self) {
let is_set = self.data.check_all();
if !is_set {
@@ -144,14 +142,14 @@ HasSet0 for DirtyFlag {
}
}
-impl
-HasSet1 for DirtyFlag {
+impl
+HasSet1 for DirtyFlag {
fn set(&mut self, arg: Self::Arg) {
let first_set = !self.check_all();
let is_set = self.data.check(&arg);
if !is_set {
self.data.set(arg);
- group!(self.logger, format!("Setting to {}.", self.data), {
+ group!(self.logger, "Setting to {self.data}.", {
if first_set { self.on_set.call() }
})
}
@@ -161,19 +159,19 @@ HasSet1 for DirtyFlag {
// === Unset ===
-impl
-HasUnset0 for DirtyFlag {
+impl
+HasUnset0 for DirtyFlag {
fn unset(&mut self) {
- self.logger.info("Unsetting.");
+ info!(self.logger, "Unsetting.");
self.data.unset()
}
}
-impl
-HasUnset1 for DirtyFlag
+impl
+HasUnset1 for DirtyFlag
where Arg:Display {
fn unset(&mut self, arg: &Self::Arg) {
- self.logger.info(|| format!("Unsetting {}.", arg));
+ info!(self.logger, "Unsetting {arg}.");
self.data.unset(arg)
}
}
@@ -189,19 +187,19 @@ HasUnset1 for DirtyFlag
/// A version of `DirtyFlag` which uses internal mutability pattern. It is meant to expose the same
/// API but without requiring `self` reference to be mutable.
#[derive(Derivative)]
-#[derivative(Debug(bound = "T:Debug"))]
-#[derivative(Clone(bound = ""))]
-pub struct SharedDirtyFlag {
- rc: Rc>>
+#[derivative(Debug(bound="T:Debug"))]
+#[derivative(Clone(bound=""))]
+pub struct SharedDirtyFlag {
+ rc: Rc>>
}
// === API ===
-impl
-SharedDirtyFlag {
- pub fn new(logger: Logger, on_set: OnSet) -> Self {
- let callback = Callback(on_set);
+impl
+SharedDirtyFlag {
+ pub fn new(logger:Logger, on_set:OnMut) -> Self {
+ let callback = Function(on_set);
let rc = Rc::new(RefCell::new(DirtyFlag::new(logger,callback)));
Self { rc }
}
@@ -211,23 +209,23 @@ SharedDirtyFlag {
}
}
-impl
-SharedDirtyFlag {
+impl
+SharedDirtyFlag {
pub fn clone_ref(&self) -> Self {
self.clone()
}
}
-impl
-SharedDirtyFlag {
- pub fn set_callback(&self, on_set:OnSet) {
- self.rc.borrow_mut().on_set = Callback(on_set);
+impl
+SharedDirtyFlag {
+ pub fn set_callback(&self, on_set:OnMut) {
+ self.rc.borrow_mut().on_set = Function(on_set);
}
}
-impl
-From>>> for SharedDirtyFlag {
- fn from(rc: Rc>>) -> Self {
+impl
+From>>> for SharedDirtyFlag {
+ fn from(rc: Rc>>) -> Self {
Self {rc}
}
}
@@ -235,22 +233,22 @@ From>>> for SharedDirtyFlag {
// === Arg ===
-impl HasArg for SharedDirtyFlag {
+impl HasArg for SharedDirtyFlag {
type Arg = Arg;
}
// === Global Operations ===
-impl
-SharedHasUnsetAll for SharedDirtyFlag {
+impl
+SharedHasUnsetAll for SharedDirtyFlag {
fn unset_all(&self) {
self.rc.borrow_mut().unset_all()
}
}
-impl
-HasCheckAll for SharedDirtyFlag {
+impl
+HasCheckAll for SharedDirtyFlag {
fn check_all(&self) -> bool {
self.rc.borrow().check_all()
}
@@ -258,39 +256,39 @@ HasCheckAll for SharedDirtyFlag {
// === Check ===
-impl
-HasCheck0 for SharedDirtyFlag {
+impl
+HasCheck0 for SharedDirtyFlag {
fn check (&self) -> bool { self.rc.borrow().check() }
}
-impl
-HasCheck1 for SharedDirtyFlag {
+impl
+HasCheck1 for SharedDirtyFlag {
fn check (&self, arg:&Arg) -> bool { self.rc.borrow().check(arg) }
}
// === Set ===
-impl
-SharedHasSet0 for SharedDirtyFlag {
+impl
+SharedHasSet0 for SharedDirtyFlag {
fn set (&self) { self.rc.borrow_mut().set() }
}
-impl
-SharedHasSet1 for SharedDirtyFlag {
+impl
+SharedHasSet1 for SharedDirtyFlag {
fn set (&self, arg: Arg) { self.rc.borrow_mut().set(arg) }
}
// === Unset ===
-impl
-SharedHasUnset0 for SharedDirtyFlag {
+impl
+SharedHasUnset0 for SharedDirtyFlag {
fn unset(&self) {
self.rc.borrow_mut().unset()
}
}
-impl
-SharedHasUnset1 for SharedDirtyFlag where Arg:Display {
+impl
+SharedHasUnset1 for SharedDirtyFlag where Arg:Display {
fn unset(&self, arg:&Self::Arg) {
self.rc.borrow_mut().unset(arg)
}
@@ -309,9 +307,9 @@ SharedHasUnset1 for SharedDirtyFlag where Arg:Display {
/// The on / off dirty flag. If you need a simple dirty / clean switch, this one
/// is the right choice.
-pub type Bool = DirtyFlag ;
-pub type SharedBool = SharedDirtyFlag ;
-pub trait BoolCtx = where OnSet: Callback0;
+pub type Bool = DirtyFlag ;
+pub type SharedBool = SharedDirtyFlag ;
+pub trait BoolCtx = where OnMut:Function0;
#[derive(Debug,Display,Default)]
pub struct BoolData { is_dirty: bool }
@@ -330,9 +328,9 @@ impl HasUnset0 for BoolData { fn unset (&mut self) { self.is_dirty
/// Dirty flag which keeps information about a range of dirty items. It does not track items
/// separately, nor you are allowed to keep multiple ranges in it. Just a single value range.
-pub type Range = DirtyFlag ,OnSet>;
-pub type SharedRange = SharedDirtyFlag ,OnSet>;
-pub trait RangeCtx = where OnSet: Callback0;
+pub type Range = DirtyFlag ,OnMut>;
+pub type SharedRange = SharedDirtyFlag ,OnMut>;
+pub trait RangeCtx = where OnMut:Function0;
pub trait RangeIx = PartialOrd + Copy + Debug;
#[derive(Debug,Default)]
@@ -384,9 +382,9 @@ impl Display for RangeData {
/// counterpart. Please note that it uses `FxHashSet` under the hood, so there
/// are no guarantees regarding attack-proof hashing algorithm here.
-pub type Set = DirtyFlag ,OnSet>;
-pub type SharedSet = SharedDirtyFlag ,OnSet>;
-pub trait SetCtx = where OnSet: Callback0;
+pub type Set = DirtyFlag ,OnMut>;
+pub type SharedSet = SharedDirtyFlag ,OnMut>;
+pub trait SetCtx = where OnMut:Function0;
pub trait SetItem = Eq + Hash + Debug;
#[derive(Derivative,Shrinkwrap)]
@@ -442,16 +440,16 @@ use bit_field::BitField as BF;
/// items must be a plain enumerator implementing `Into`. The data is
/// stored as an efficient `BitField` under the hood.
-pub type Enum = DirtyFlag ,OnSet>;
-pub type SharedEnum = SharedDirtyFlag ,OnSet>;
-pub trait EnumCtx = where OnSet: Callback0;
+pub type Enum = DirtyFlag ,OnMut>;
+pub type SharedEnum = SharedDirtyFlag ,OnMut>;
+pub trait EnumCtx = where OnMut:Function0;
pub trait EnumBase = Default + PartialEq + Copy + BF;
pub trait EnumElem = Copy+Into;
/// Dirty flag which keeps dirty indexes in a `BitField` under the hood.
-pub type BitField = Enum ;
-pub type SharedBitField = SharedEnum ;
+pub type BitField = Enum ;
+pub type SharedBitField = SharedEnum ;
#[derive(Derivative)]
#[derivative(Debug(bound="Prim:Debug"))]
diff --git a/gui/lib/core/src/data/function.rs b/gui/lib/core/src/data/function.rs
index dbfc39d2b2..2ce54d9ad7 100644
--- a/gui/lib/core/src/data/function.rs
+++ b/gui/lib/core/src/data/function.rs
@@ -3,6 +3,4 @@
#[warn(missing_docs)]
pub mod callback;
#[warn(missing_docs)]
-pub mod closure;
-#[warn(missing_docs)]
-pub mod nop;
+pub mod procedure;
diff --git a/gui/lib/core/src/data/function/callback.rs b/gui/lib/core/src/data/function/callback.rs
index 1e8a6954be..f80c141a3e 100644
--- a/gui/lib/core/src/data/function/callback.rs
+++ b/gui/lib/core/src/data/function/callback.rs
@@ -4,48 +4,17 @@ use crate::prelude::*;
use std::fmt;
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-
-// TODO
-//
-// We should refactor the whole file as soon as this gets resolved:
-// https://github.com/rust-lang/rust/issues/65918
-//
-// Then, we will be able to use unboxed closures (see the closure.rs file) and there would not be
-// a need anymore for the closures to be in `WithPhantom,P>` type. It dereferences
-// to the first type param, however, `Rc` does not implement `Fn` trait (as its
-// superclasses could not be implemented). We are using `Rc` to be able to clone the closure.
-// We could use `Box` instead but cloning boxed dyn closures is hard. Using unboxed closures will
-// solve all of these.
-//
-// After the error is solved we could define a NOP type which implements the Fn* traits and use it
-// instead of `()` when necessary. Then we would be able to use `Fn(...)` whenever we use
-// `CallbackN(...)`.
-
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-
-
-// =====================
-// === Callback Type ===
-// =====================
+// =============
+// === Types ===
+// =============
pub type NoCallback = ();
#[derive(Shrinkwrap)]
#[shrinkwrap(mutable)]
-pub struct Callback(pub Func);
+pub struct Function(pub Func);
-//impl Default for Callback {
-// fn default() -> Self {
-// Callback(NOP::nop())
-// }
-//}
-
-impl Debug for Callback {
+impl Debug for Function {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "Callback")
}
@@ -53,38 +22,22 @@ impl Debug for Callback {
-// ==========================
-// === Callback Interface ===
-// ==========================
+// =================
+// === Instances ===
+// =================
-pub trait Callback0: 'static {
+pub trait Function0 {
fn call(&mut self);
}
-pub trait Callback1 {
+pub trait Function1 {
fn call(&mut self, arg1:Arg1);
}
-//
-//pub trait Callback2 {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2);
-//}
-//
-//pub trait Callback3 {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3);
-//}
-//
-//pub trait Callback4 {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3, arg4:Arg4);
-//}
-//
-//pub trait Callback5 {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3, arg4:Arg4, arg5:Arg5);
-//}
// === Unit Implementations ===
-impl Callback0 for Option {
+impl Function0 for Option {
fn call(&mut self) {
self.iter_mut().for_each(|t| {
t.call()
@@ -92,81 +45,25 @@ impl Callback0 for Option {
}
}
-impl Callback0 for () {
+impl Function0 for () {
fn call(&mut self) {}
}
-impl Callback1 for () {
+impl Function1 for () {
fn call(&mut self, _arg1:Arg1) {}
}
-//impl Callback2 for () {
-// fn call(&mut self, _arg1:Arg1, _arg2:Arg2) {}
-//}
-//
-//impl Callback3 for () {
-// fn call(&mut self, _arg1:Arg1, _arg2:Arg2, _arg3:Arg3) {}
-//}
-//
-//impl Callback4 for () {
-// fn call(&mut self, _arg1:Arg1, _arg2:Arg2, _arg3:Arg3, _arg4:Arg4) {}
-//}
-//
-//impl Callback5 for () {
-// fn call(&mut self, _arg1:Arg1, _arg2:Arg2, _arg3:Arg3, _arg4:Arg4, _arg5:Arg5) {}
-//}
-
// === FnMut Implementations ===
-// FIXME: How to make it more generic?
-impl Callback0 for WithPhantom T>, P> {
- fn call(&mut self) {
- (self)();
- }
-}
-
-// FIXME: How to make it more generic?
-impl Callback1 for WithPhantom T>, P> {
- fn call(&mut self, arg1:Arg1) {
- (self)(arg1);
- }
-}
-
-impl T + 'static, T> Callback0 for F {
+impl T, T> Function0 for F {
fn call(&mut self) {
self();
}
}
-impl T, T> Callback1 for F {
+impl T, T> Function1 for F {
fn call(&mut self, arg1:Arg1) {
self(arg1);
}
}
-
-//impl T, T> Callback2 for F {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2) {
-// self(arg1, arg2);
-// }
-//}
-//
-//impl T, T> Callback3 for F {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3) {
-// self(arg1, arg2, arg3);
-// }
-//}
-//
-//impl T, T>
-// Callback4 for F {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3, arg4:Arg4) {
-// self(arg1, arg2, arg3, arg4);
-// }
-//}
-//
-//impl T, T>
-// Callback5 for F {
-// fn call(&mut self, arg1:Arg1, arg2:Arg2, arg3:Arg3, arg4:Arg4, arg5:Arg5) {
-// self(arg1, arg2, arg3, arg4, arg5);
-// }
-//}
diff --git a/gui/lib/core/src/data/function/nop.rs b/gui/lib/core/src/data/function/nop.rs
deleted file mode 100644
index 07b2385276..0000000000
--- a/gui/lib/core/src/data/function/nop.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![allow(missing_docs)]
-
-// ===========
-// === NOP ===
-// ===========
-
-pub trait NOP { fn nop() -> Self; }
-
-impl NOP for () { fn nop() -> Self { } }
-impl NOP for fn() { fn nop() -> Self { || {} } }
-impl NOP for fn(T1) { fn nop() -> Self { |_| {} } }
-impl NOP for fn(T1,T2) { fn nop() -> Self { |_, _| {} } }
-impl NOP for fn(T1,T2,T3) { fn nop() -> Self { |_, _, _| {} } }
-impl NOP for fn(T1,T2,T3,T4) { fn nop() -> Self { |_, _, _, _| {} } }
-impl NOP for fn(T1,T2,T3,T4,T5) { fn nop() -> Self { |_, _, _, _, _| {} } }
diff --git a/gui/lib/core/src/data/function/closure.rs b/gui/lib/core/src/data/function/procedure.rs
similarity index 51%
rename from gui/lib/core/src/data/function/closure.rs
rename to gui/lib/core/src/data/function/procedure.rs
index 92307a47ab..f04ce9fe0e 100644
--- a/gui/lib/core/src/data/function/closure.rs
+++ b/gui/lib/core/src/data/function/procedure.rs
@@ -72,100 +72,28 @@ macro_rules! closure {
$body:tt
) => { paste::item! {
#[cfg(not(feature = "no_unboxed_callbacks"))]
+ /// Closure type.
pub type $type<$($param),*> =
impl Fn($($larg_type),*) + Clone;
#[cfg(not(feature = "no_unboxed_callbacks"))]
+ /// Closure constructor.
pub fn $name<$($param:$param_type),*>
($($arg:$arg_type),*) -> $type<$($param),*> {
move |$($larg),*| $body
}
#[cfg(feature = "no_unboxed_callbacks")]
+ /// Closure type.
pub type $type<$($param),*> =
- WithPhantom, $($param),*>;
+ Box;
#[cfg(feature = "no_unboxed_callbacks")]
+ /// Closure constructor.
pub fn $name<$($param:$param_type),*>
($($arg:$arg_type),*)
- -> WithPhantom, $($param),*> {
- WithPhantom::new(Rc::new(move |$($larg),*| $body))
+ -> Box {
+ Box::new(move |$($larg),*| $body)
}
}};
}
-
-
-
-// ===============
-// === Promote ===
-// ===============
-
-/// Promotion of closures is a complex topic. Consider the following code:
-///
-/// ```compile_fail
-/// pub type Buffer = Observable, BufferOnSet