diff --git a/BlitzUtility.h b/BlitzUtility.h index 1c08729..285d10a 100644 --- a/BlitzUtility.h +++ b/BlitzUtility.h @@ -26,7 +26,7 @@ #include // Macros -#define DLL_FUNCTION(type) extern "C" type __stdcall +#define DLL_FUNCTION(type) extern "C" __declspec(dllexport) type __stdcall // BlitzUtility Includes #include "Container/List.h" @@ -34,7 +34,7 @@ #include "Database/SQLite/SQLite.h" #include "Time/HighResolutionClock.h" #include "Type/Double.h" -#include "Type/LongLong.h" +#include "Type/Long.h" #include "Utility/DisplayEnumerator.h" #include "Utility/IndexerV1.h" #include "Utility/IndexerV2.h" diff --git a/BlitzUtility.vcxproj b/BlitzUtility.vcxproj index 13a98a1..90d6c6c 100644 --- a/BlitzUtility.vcxproj +++ b/BlitzUtility.vcxproj @@ -42,12 +42,11 @@ $(SolutionDir)#Build\$(ProjectName)\$(Configuration)\ $(SolutionDir)#Intermediate\$(ProjectName)\$(Configuration)\ - true $(SolutionDir)#Build\$(ProjectName)\$(Configuration)\ $(SolutionDir)#Intermediate\$(ProjectName)\$(Configuration)\ - false + true @@ -78,22 +77,28 @@ true true %(PreprocessorDefinitions) + false + true + ProgramDatabase - true - 1.0 + Debug Enabled false false + false + false + + + false + true Copying Resources - - false - + @@ -109,7 +114,7 @@ Default false - false + true false false true @@ -125,24 +130,27 @@ true %(PreprocessorDefinitions) None + false + true - false + No false - - - 1.0 + false Enabled false + false + + + false + false Copying Resources - - false - + @@ -155,7 +163,7 @@ - + @@ -170,7 +178,7 @@ - + @@ -179,23 +187,17 @@ - - BlitzUtility.LICENSE - PreserveNewest - - - BlitzUtility.LICENSE.lesser - PreserveNewest - - - BlitzUtility.bb - PreserveNewest - - - BlitzUtility.decls - PreserveNewest - + + + + + + + + + + diff --git a/BlitzUtility.vcxproj.filters b/BlitzUtility.vcxproj.filters index 2c9c201..4f3f458 100644 --- a/BlitzUtility.vcxproj.filters +++ b/BlitzUtility.vcxproj.filters @@ -8,10 +8,6 @@ {48292af9-63a5-40ae-a447-ad7cecfddd8a} - - {e8e48b8c-14c2-40b5-b48d-d9b55fe6852d} - bb;decls;ipf - {ff6bcb4d-9140-40a9-80dd-3698b63bd1c1} @@ -27,6 +23,31 @@ {5a129704-2426-422d-8a40-c869f58d94cb} + + {67ecd4f9-8888-4144-a4cc-0102188b329a} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {61ad793e-f1b8-47c7-97b0-135344745ff4} + + + {fe289617-3503-42ab-bee1-85b54cae2f3c} + + + {229e6434-139d-476e-91d4-1ff4e46906ef} + + + {e54a8406-e6ab-4f0b-89a4-5a2385d61d8d} + + + {83cba243-3e88-472d-a5b8-d0339ff1d72e} + + + {35a5e71b-a977-4fa1-8428-25a0bade6db2} + + + {13f1a82e-2123-4652-a573-2dd8235ae033} + @@ -41,9 +62,6 @@ Source Files\Type - - Source Files\Type - Source Files\Utility @@ -74,62 +92,69 @@ Source Files\Time + + Source Files\Type + - - Source Files\Utility - - - Source Files\Utility - - - Source Files\Utility - - - Source Files\Type - - - Source Files\Type - - - Source Files\Utility + + Header Files - Source Files\Container + Header Files\Container - Source Files\Container - - - Source Files\Utility - - - Source Files + Header Files\Container - Source Files\Database\SQLite - - - Source Files\Time + Header Files\Database\SQLite - Source Files\Database\SQLite + Header Files\Database\SQLite + + + Header Files\Time - Source Files\Time + Header Files\Time - Source Files\Time + Header Files\Time + + + Header Files\Type + + + Header Files\Utility + + + Header Files\Utility + + + Header Files\Utility + + + Header Files\Utility + + + Header Files\Utility + + + Header Files\Type - - Blitz Files + + Resource Files - - Blitz Files + + Resource Files + + + Resource Files + + + Resource Files - - \ No newline at end of file diff --git a/LICENSE b/Resources/BlitzUtility.LICENSE similarity index 98% rename from LICENSE rename to Resources/BlitzUtility.LICENSE index c65825e..9cecc1d 100644 --- a/LICENSE +++ b/Resources/BlitzUtility.LICENSE @@ -1,674 +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. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU 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: - - {project} Copyright (C) {year} {fullname} - 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 -. + 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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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: + + {project} Copyright (C) {year} {fullname} + 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/LICENSE.lesser b/Resources/BlitzUtility.LICENSE.lesser similarity index 100% rename from LICENSE.lesser rename to Resources/BlitzUtility.LICENSE.lesser diff --git a/BlitzUtility.bb b/Resources/BlitzUtility.bb similarity index 100% rename from BlitzUtility.bb rename to Resources/BlitzUtility.bb diff --git a/BlitzUtility.decls b/Resources/BlitzUtility.decls similarity index 71% rename from BlitzUtility.decls rename to Resources/BlitzUtility.decls index b29b8ad..be422b5 100644 --- a/BlitzUtility.decls +++ b/Resources/BlitzUtility.decls @@ -163,73 +163,67 @@ BU_HighResolutionClock_DurationLL%(pHighResolutionClock%, pOther%) BU_HighResolutionClock_DurationF#(pHighResolutionClock%, pOther%) BU_HighResolutionClock_DurationD%(pHighResolutionClock%, pOther%) -; Types ----------------------------------------------------------------------- -; -- LongLong -BU_LongLong_Create%() -BU_LongLong_Destroy(LongLong%) -BU_LongLong_Copy%(LongLong%) -BU_LongLong_TempCreate%() -BU_LongLong_TempCopy%(LongLong%) -BU_LongLong_SetTemp(LongLong%) -BU_LongLong_UnsetTemp(LongLong%) -BU_LongLong_TempCleanup() -BU_LongLong_Set(LongLong%, LongLongOther%) -BU_LongLong_SetV(LongLong%, LongHigh%, LongLow%) -BU_LongLong_Add(LongLong%, LongLongOther%) -BU_LongLong_AddV(LongLong%, LongHigh%, LongLow%) -BU_LongLong_Sub(LongLong%, LongLongOther%) -BU_LongLong_SubV(LongLong%, LongHigh%, LongLow%) -BU_LongLong_Mul(LongLong%, LongLongOther%) -BU_LongLong_MulV(LongLong%, LongHigh%, LongLow%) -BU_LongLong_Div(LongLong%, LongLongOther%) -BU_LongLong_DivV(LongLong%, LongHigh%, LongLow%) -BU_LongLong_Modulo(LongLong%, pOther%) -BU_LongLong_ModuloV(LongLong%, left%, right%) -BU_LongLong_ShiftLeft(LongLong%, bits%) -BU_LongLong_ShiftRight(LongLong%, bits%) -BU_LongLong_Compare%(LongLong%, LongLongOther%) -BU_LongLong_CompareV%(LongLong%, LongHigh%, LongLow%) -BU_LongLong_ToString$(LongLong%) -BU_LongLong_FromString%(String$) -BU_LongLong_ToLong%(LongLong%, Modulus%) -BU_LongLong_FromLong%(LongHigh%, LongLow%) -BU_LongLong_ToLongHigh%(LongLong%) -BU_LongLong_ToLongLow%(LongLong%) -BU_LongLong_ToFloat#(LongLong%) -BU_LongLong_FromFloat%(Float#) -BU_LongLong_ToDouble%(LongLong%) -BU_LongLong_FromDouble%(double%) -BU_LongLong_Serialize$(LongLong%) -BU_LongLong_Deserialize%(String$) -; -- Double -BU_Double_Create%() -BU_Double_Destroy(Double%) -BU_Double_Copy%(Double%) -BU_Double_TempCreate%() -BU_Double_TempCopy%(Double%) -BU_Double_SetTemp(Double%) -BU_Double_UnsetTemp(Double%) -BU_Double_TempCleanup() -BU_Double_Set(Double%, DoubleOther%) -BU_Double_SetF(Double%, Float#) -BU_Double_Add(Double%, DoubleOther%) -BU_Double_AddF(Double%, Float#) -BU_Double_Sub(Double%, DoubleOther%) -BU_Double_SubF(Double%, Float#) -BU_Double_Mul(Double%, DoubleOther%) -BU_Double_MulF(Double%, Float#) -BU_Double_Div(Double%, DoubleOther%) -BU_Double_DivF(Double%, Float#) -BU_Double_Compare%(Double%, DoubleOther%) -BU_Double_CompareF%(Double%, Float#) -BU_Double_ToString$(Double%) -BU_Double_FromString%(String$) -BU_Double_ToFloat#(Double%) -BU_Double_FromFloat%(Float#) -BU_Double_ToLongLong%(Double%) -BU_Double_FromLongLong%(LongLong%) -BU_Double_Serialize$(Double%) -BU_Double_Deserialize%(String$) +; Types - Long ---------------------------------------------------------------- +BU_Long_New%() :"_BU_Long_New@0" +BU_Long_Copy%(pThis%) :"_BU_Long_Copy@4" +BU_Long_Destroy(pThis%) :"_BU_Long_Destroy@4" +BU_Long_ToString$(pThis%) :"_BU_Long_ToString@4" +BU_Long_FromString%(cString$) :"_BU_Long_FromString@4" +BU_Long_FromI%(iRight%) :"_BU_Long_FromI@4" +BU_Long_FromII%(iLeft%, iRight%) :"_BU_Long_FromII@8" +BU_Long_ToI%(pThis%, iShift%) :"_BU_Long_ToI@8" +BU_Long_ToIH%(pThis%) :"_BU_Long_ToIH@4" +BU_Long_ToIL%(pThis%) :"_BU_Long_ToIL@4" +BU_Long_FromF%(Float#) :"_BU_Long_FromF@4" +BU_Long_ToF#(pThis%) :"_BU_Long_ToF@4" +BU_Long_FromD(pDouble%) :"_BU_Long_FromD@4" +BU_Long_ToD(pThis%) :"_BU_Long_ToD@4" +BU_Long_Compare%(pThis%, pRight%) :"_BU_Long_Compare@8" +BU_Long_Set%(pThis%, pOther%) :"_BU_Long_Set@8" +BU_Long_Add%(pThis%, pOther%) :"_BU_Long_Add@8" +BU_Long_Sub%(pThis%, pOther%) :"_BU_Long_Sub@8" +BU_Long_Div%(pThis%, pOther%) :"_BU_Long_Div@8" +BU_Long_Mul%(pThis%, pOther%) :"_BU_Long_Mul@8" +BU_Long_Mod%(pThis%, pOther%) :"_BU_Long_Mod@8" +BU_Long_SetI%(pThis%, iRight%) :"_BU_Long_SetI@8" +BU_Long_AddI%(pThis%, iRight%) :"_BU_Long_AddI@8" +BU_Long_SubI%(pThis%, iRight%) :"_BU_Long_SubI@8" +BU_Long_DivI%(pThis%, iRight%) :"_BU_Long_DivI@8" +BU_Long_MulI%(pThis%, iRight%) :"_BU_Long_MulI@8" +BU_Long_ModI%(pThis%, iRight%) :"_BU_Long_ModI@8" +BU_Long_SetII%(pThis%, iLeft%, iRight%) :"_BU_Long_SetII@12" +BU_Long_AddII%(pThis%, iLeft%, iRight%) :"_BU_Long_AddII@12" +BU_Long_SubII%(pThis%, iLeft%, iRight%) :"_BU_Long_SubII@12" +BU_Long_DivII%(pThis%, iLeft%, iRight%) :"_BU_Long_DivII@12" +BU_Long_MulII%(pThis%, iLeft%, iRight%) :"_BU_Long_MulII@12" +BU_Long_ModII%(pThis%, iLeft%, iRight%) :"_BU_Long_ModII@12" +BU_Long_Shift%(pThis%, iRight%) :"_BU_Long_Shift@8" + +; Double ------------------------------------------------------------------------ +BU_Double_New%() :"_BU_Double_New@0" +BU_Double_Copy%(pThis%) :"_BU_Double_Copy@4" +BU_Double_Destroy(pThis%) :"_BU_Double_Destroy@4" +BU_Double_ToString$(pThis%) :"_BU_Double_ToString@4" +BU_Double_FromString%(cString$) :"_BU_Double_FromString@4" +BU_Double_FromF%(Float#) :"_BU_Double_FromF@4" +BU_Double_ToF#(pThis%) :"_BU_Double_ToF@4" +BU_Double_FromI%(iRight%) :"_BU_Double_FromI@4" +BU_Double_ToI%(pThis%) :"_BU_Double_ToI@8" +BU_Double_FromL(pDouble%) :"_BU_Double_FromL@4" +BU_Double_ToL(pThis%) :"_BU_Double_ToL@4" +BU_Double_Compare%(pThis%, pOther%) :"_BU_Double_Compare@8" +BU_Double_Set%(pThis%, pOther%) :"_BU_Double_Set@8" +BU_Double_Add%(pThis%, pOther%) :"_BU_Double_Add@8" +BU_Double_Sub%(pThis%, pOther%) :"_BU_Double_Sub@8" +BU_Double_Div%(pThis%, pOther%) :"_BU_Double_Div@8" +BU_Double_Mul%(pThis%, pOther%) :"_BU_Double_Mul@8" +BU_Double_Mod%(pThis%, pOther%) :"_BU_Double_Mod@8" +BU_Double_SetF%(pThis%, fOther%) :"_BU_Double_SetF@8" +BU_Double_AddF%(pThis%, fOther%) :"_BU_Double_AddF@8" +BU_Double_SubF%(pThis%, fOther%) :"_BU_Double_SubF@8" +BU_Double_DivF%(pThis%, fOther%) :"_BU_Double_DivF@8" +BU_Double_MulF%(pThis%, fOther%) :"_BU_Double_MulF@8" +BU_Double_ModF%(pThis%, fOther%) :"_BU_Double_ModF@8" ; Utility --------------------------------------------------------------------- ; -- Display Enumerator diff --git a/Type/Double.cpp b/Type/Double.cpp index 28e7a31..a36f812 100644 --- a/Type/Double.cpp +++ b/Type/Double.cpp @@ -14,175 +14,109 @@ // You should have received a copy of the GNU Lesser General Public License // along with this program. If not, see . -#include "Double.h" -#include +#include "Long.h" -// Templates -template< typename T > -std::string int_to_hex(T i) { - std::stringstream stream; - stream - << std::setfill('0') - << std::setw(sizeof(T) * 2) - << std::hex - << i; - return stream.str(); -} - -template< typename T > -T hex_to_int(std::string t) { - T x; - std::stringstream stream; - stream - << std::hex - << t; - stream - >> x; - return x; -} - - -std::list BU_DoubleTemporary; - -DLL_FUNCTION(double_t*) BU_Double_Create() { +DLL_FUNCTION(double_t*) BU_Double_New() { return new double_t; } - -DLL_FUNCTION(void) BU_Double_Destroy(double_t* pthis) { - delete pthis; +DLL_FUNCTION(double_t*) BU_Double_Copy(double_t* pOther) { + return new double_t(*pOther); +} +DLL_FUNCTION(void) BU_Double_Destroy(double_t* pThis) { + delete pThis; } -DLL_FUNCTION(double_t*) BU_Double_Copy(double_t* other) { - double_t* pthis = new double_t; - *pthis = *other; - return pthis; +char* BU_Double_Buffer = new char[32]; +DLL_FUNCTION(const char*) BU_Double_ToString(double_t* pThis) { + std::stringstream myStream; + myStream << (*pThis); + + const char* myBuffer = myStream.str().c_str(); + strcpy_s(BU_Double_Buffer, 32, myBuffer); + return BU_Double_Buffer; +} +DLL_FUNCTION(double_t*) BU_Double_FromString(const char* pString) { + double_t* pThis = new double_t; + std::stringstream myStream = std::stringstream(pString); + myStream >> *pThis; + return pThis; } -DLL_FUNCTION(double_t*) BU_Double_TempCreate() { - double_t* val = new double_t; - BU_DoubleTemporary.push_back(val); - return val; +DLL_FUNCTION(double_t*) BU_Double_FromF(float_t fOther) { + return new double_t(fOther); +} +DLL_FUNCTION(float_t) BU_Double_ToF(double_t* pThis) { + return (float_t)*pThis; } -DLL_FUNCTION(double_t*) BU_Double_TempCopy(double_t* other) { - double_t* val = new double_t(*other); - BU_DoubleTemporary.push_back(val); - return val; +DLL_FUNCTION(double_t*) BU_Double_FromI(int32_t iOther) { + return new double_t(iOther); +} +DLL_FUNCTION(int32_t) BU_Double_ToI(double_t* pThis) { + return (int32_t)*pThis; } -DLL_FUNCTION(void) BU_Double_SetTemp(double_t* pthis) { - BU_DoubleTemporary.push_back(pthis); +DLL_FUNCTION(double_t*) BU_Double_FromL(int64_t* pOther) { + return new double_t((double_t)*pOther); +} +DLL_FUNCTION(int64_t*) BU_Double_ToL(double_t* pThis) { + return new int64_t((int64_t)*pThis); } -DLL_FUNCTION(void) BU_Double_UnsetTemp(double_t* pthis) { - BU_DoubleTemporary.remove(pthis); +DLL_FUNCTION(int32_t) BU_Double_Compare(double_t* pThis, double_t* pOther) { + return /* It can either be Equal (0) or Smaller or Greater. Easy to check. */ + /* Greater */ + (*pThis > *pOther ? 1 : 0) + + /* Smaller */ + (*pThis < *pOther ? -1 : 0); } -DLL_FUNCTION(void) BU_Double_TempCleanup() { - auto iterEnd = BU_DoubleTemporary.end(); - for (auto iter = BU_DoubleTemporary.begin(); iter != iterEnd; ++iter) { - delete *iter; - } - BU_DoubleTemporary.clear(); +DLL_FUNCTION(double_t*) BU_Double_Set(double_t* pThis, double_t* pOther) { + *pThis = *pOther; + return pThis; +} +DLL_FUNCTION(double_t*) BU_Double_Add(double_t* pThis, double_t* pOther) { + *pThis += *pOther; + return pThis; +} +DLL_FUNCTION(double_t*) BU_Double_Sub(double_t* pThis, double_t* pOther) { + *pThis -= *pOther; + return pThis; +} +DLL_FUNCTION(double_t*) BU_Double_Div(double_t* pThis, double_t* pOther) { + *pThis /= *pOther; + return pThis; +} +DLL_FUNCTION(double_t*) BU_Double_Mul(double_t* pThis, double_t* pOther) { + *pThis *= *pOther; + return pThis; +} +DLL_FUNCTION(double_t*) BU_Double_Mod(double_t* pThis, double_t* pOther) { + *pThis = fmod(*pThis, *pOther); + return pThis; } -DLL_FUNCTION(void) BU_Double_Set(double_t* pthis, double_t* other) { - *pthis = *other; +DLL_FUNCTION(double_t*) BU_Double_SetF(double_t* pThis, float_t fOther) { + *pThis = fOther; + return pThis; } - -DLL_FUNCTION(void) BU_Double_SetF(double_t* pthis, float_t other) { - *pthis = other; +DLL_FUNCTION(double_t*) BU_Double_AddF(double_t* pThis, float_t fOther) { + *pThis += fOther; + return pThis; } - -DLL_FUNCTION(void) BU_Double_Add(double_t* pthis, double_t* other) { - *pthis += *other; +DLL_FUNCTION(double_t*) BU_Double_SubF(double_t* pThis, float_t fOther) { + *pThis -= fOther; + return pThis; } - -DLL_FUNCTION(void) BU_Double_AddF(double_t* pthis, float_t other) { - *pthis += other; +DLL_FUNCTION(double_t*) BU_Double_DivF(double_t* pThis, float_t fOther) { + *pThis /= fOther; + return pThis; } - -DLL_FUNCTION(void) BU_Double_Sub(double_t* pthis, double_t* other) { - *pthis -= *other; +DLL_FUNCTION(double_t*) BU_Double_MulF(double_t* pThis, float_t fOther) { + *pThis *= fOther; + return pThis; } - -DLL_FUNCTION(void) BU_Double_SubF(double_t* pthis, float_t other) { - *pthis -= other; -} - -DLL_FUNCTION(void) BU_Double_Mul(double_t* pthis, double_t* other) { - *pthis *= *other; -} - -DLL_FUNCTION(void) BU_Double_MulF(double_t* pthis, float_t other) { - *pthis *= other; -} - -DLL_FUNCTION(void) BU_Double_Div(double_t* pthis, double_t* other) { - *pthis /= *other; -} - -DLL_FUNCTION(void) BU_Double_DivF(double_t* pthis, float_t other) { - *pthis /= other; -} - -DLL_FUNCTION(uint32_t) BU_Double_Compare(double_t* pthis, double_t* other) { - return (*pthis == *other ? 1 : 0) + (*pthis < *other ? 2 : 0) + (*pthis > *other ? 4 : 0); -} - -DLL_FUNCTION(uint32_t) BU_Double_CompareF(double_t* pthis, float_t other) { - return ((float_t)*pthis == other ? 1 : 0) + ((float_t)*pthis < other ? 2 : 0) + ((float_t)*pthis > other ? 4 : 0); -} - -DLL_FUNCTION(const char*) BU_Double_ToString(double_t* pthis) { - std::stringstream stream; - stream << *pthis; - return stream.str().c_str(); -} - -DLL_FUNCTION(double_t*) BU_Double_FromString(const char* text) { - std::stringstream stream = std::stringstream(text); - double_t* doublePtr = new double_t; - stream >> *doublePtr; - return doublePtr; -} - -DLL_FUNCTION(float_t) BU_Double_ToFloat(double_t* pthis) { - return (float_t)*pthis; -} - -DLL_FUNCTION(double_t*) BU_Double_FromFloat(float_t other) { - double_t* val = new double_t; - *val = (double_t)other; - return val; -} - -DLL_FUNCTION(int64_t*) BU_Double_ToLongLong(double_t* pthis) { - int64_t* val = new int64_t; - *val = (int64_t)*pthis; - return val; -} - -DLL_FUNCTION(double_t*) BU_Double_FromLongLong(int64_t* other) { - double_t* val = new double_t; - *val = (double_t)*other; - return val; -} - -DLL_FUNCTION(const char*) BU_Double_Serialize(double_t* pthis) { - union { - double_t real; - int64_t integer; - } myval; - myval.real = *pthis; - return int_to_hex(myval.integer).c_str(); -} - -DLL_FUNCTION(double_t*) BU_Double_Deserialize(const char* text) { - union { - double_t real; - int64_t integer; - } myval; - myval.integer = hex_to_int(std::string(text)); - return BU_Double_Copy(&myval.real); +DLL_FUNCTION(double_t*) BU_Double_ModF(double_t* pThis, float_t fOther) { + *pThis = fmod(*pThis, fOther); + return pThis; } \ No newline at end of file diff --git a/Type/Double.h b/Type/Double.h index 2fc2382..e73e908 100644 --- a/Type/Double.h +++ b/Type/Double.h @@ -16,82 +16,36 @@ #pragma once #include "BlitzUtility.h" -#include "LongLong.h" -#include +#include -#pragma region Constructor & Destructor -DLL_FUNCTION(double_t*) BU_Double_Create(); -DLL_FUNCTION(void) BU_Double_Destroy(double_t* pthis); -DLL_FUNCTION(double_t*) BU_Double_Copy(double_t* other); -#pragma comment(linker, "/EXPORT:BU_Double_Create=_BU_Double_Create@0") -#pragma comment(linker, "/EXPORT:BU_Double_Destroy=_BU_Double_Destroy@4") -#pragma comment(linker, "/EXPORT:BU_Double_Copy=_BU_Double_Copy@4") -#pragma endregion Constructor & Destructor +DLL_FUNCTION(double_t*) BU_Double_New(); +DLL_FUNCTION(double_t*) BU_Double_Copy(double_t* pRight); +DLL_FUNCTION(void) BU_Double_Destroy(double_t* pThis); -#pragma region Temporary Objects -DLL_FUNCTION(double_t*) BU_Double_TempCreate(); -DLL_FUNCTION(double_t*) BU_Double_TempCopy(double_t* other); -DLL_FUNCTION(void) BU_Double_SetTemp(double_t* pthis); -DLL_FUNCTION(void) BU_Double_UnsetTemp(double_t* pthis); -DLL_FUNCTION(void) BU_Double_TempCleanup(); -#pragma comment(linker, "/EXPORT:BU_Double_TempCreate=_BU_Double_TempCreate@0") -#pragma comment(linker, "/EXPORT:BU_Double_TempCopy=_BU_Double_TempCopy@4") -#pragma comment(linker, "/EXPORT:BU_Double_SetTemp=_BU_Double_SetTemp@4") -#pragma comment(linker, "/EXPORT:BU_Double_UnsetTemp=_BU_Double_UnsetTemp@4") -#pragma comment(linker, "/EXPORT:BU_Double_TempCleanup=_BU_Double_TempCleanup@0") -#pragma endregion Temporary Objects +DLL_FUNCTION(const char*) BU_Double_ToString(double_t* pThis); +DLL_FUNCTION(double_t*) BU_Double_FromString(const char* pString); -#pragma region Math -DLL_FUNCTION(void) BU_Double_Set(double_t* pthis, double_t* other); -DLL_FUNCTION(void) BU_Double_SetF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Set=_BU_Double_Set@8") -#pragma comment(linker, "/EXPORT:BU_Double_SetF=_BU_Double_SetF@8") -DLL_FUNCTION(void) BU_Double_Add(double_t* pthis, double_t* other); -DLL_FUNCTION(void) BU_Double_AddF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Add=_BU_Double_Add@8") -#pragma comment(linker, "/EXPORT:BU_Double_AddF=_BU_Double_AddF@8") -DLL_FUNCTION(void) BU_Double_Sub(double_t* pthis, double_t* other); -DLL_FUNCTION(void) BU_Double_SubF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Sub=_BU_Double_Sub@8") -#pragma comment(linker, "/EXPORT:BU_Double_SubF=_BU_Double_SubF@8") -DLL_FUNCTION(void) BU_Double_Mul(double_t* pthis, double_t* other); -DLL_FUNCTION(void) BU_Double_MulF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Mul=_BU_Double_Mul@8") -#pragma comment(linker, "/EXPORT:BU_Double_MulF=_BU_Double_MulF@8") -DLL_FUNCTION(void) BU_Double_Div(double_t* pthis, double_t* other); -DLL_FUNCTION(void) BU_Double_DivF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Div=_BU_Double_Div@8") -#pragma comment(linker, "/EXPORT:BU_Double_DivF=_BU_Double_DivF@8") -#pragma endregion Math +DLL_FUNCTION(double_t*) BU_Double_FromF(float_t fOther); +DLL_FUNCTION(float_t) BU_Double_ToF(double_t* pThis); -#pragma region Comparision -DLL_FUNCTION(uint32_t) BU_Double_Compare(double_t* pthis, double_t* other); -DLL_FUNCTION(uint32_t) BU_Double_CompareF(double_t* pthis, float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_Compare=_BU_Double_Compare@8") -#pragma comment(linker, "/EXPORT:BU_Double_CompareF=_BU_Double_CompareF@8") -#pragma endregion Comparision +DLL_FUNCTION(double_t*) BU_Double_FromI(int32_t iOther); +DLL_FUNCTION(int32_t) BU_Double_ToI(double_t* pThis); -#pragma region Conversion -// String conversion -DLL_FUNCTION(const char*) BU_Double_ToString(double_t* pthis); -DLL_FUNCTION(double_t*) BU_Double_FromString(const char* text); -#pragma comment(linker, "/EXPORT:BU_Double_ToString=_BU_Double_ToString@4") -#pragma comment(linker, "/EXPORT:BU_Double_FromString=_BU_Double_FromString@4") -// 32-Bit Floating Point -DLL_FUNCTION(float_t) BU_Double_ToFloat(double_t* pthis); -DLL_FUNCTION(double_t*) BU_Double_FromFloat(float_t other); -#pragma comment(linker, "/EXPORT:BU_Double_ToFloat=_BU_Double_ToFloat@4") -#pragma comment(linker, "/EXPORT:BU_Double_FromFloat=_BU_Double_FromFloat@4") -// 64-Bit Integer -DLL_FUNCTION(int64_t*) BU_Double_ToLongLong(double_t* pthis); -DLL_FUNCTION(double_t*) BU_Double_FromLongLong(int64_t* other); -#pragma comment(linker, "/EXPORT:BU_Double_ToLongLong=_BU_Double_ToLongLong@4") -#pragma comment(linker, "/EXPORT:BU_Double_FromLongLong=_BU_Double_FromLongLong@4") -#pragma endregion Conversion +DLL_FUNCTION(double_t*) BU_Double_FromL(int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Double_ToL(double_t* pThis); -#pragma region Serialization -DLL_FUNCTION(const char*) BU_Double_Serialize(double_t* pthis); -DLL_FUNCTION(double_t*) BU_Double_Deserialize(const char* text); -#pragma comment(linker, "/EXPORT:BU_Double_Serialize=_BU_Double_Serialize@4") -#pragma comment(linker, "/EXPORT:BU_Double_Deserialize=_BU_Double_Deserialize@4") -#pragma endregion Serialization \ No newline at end of file +DLL_FUNCTION(int32_t) BU_Double_Compare(double_t* pThis, double_t* pOther); + +DLL_FUNCTION(double_t*) BU_Double_Set(double_t* pThis, double_t* pOther); +DLL_FUNCTION(double_t*) BU_Double_Add(double_t* pThis, double_t* pOther); +DLL_FUNCTION(double_t*) BU_Double_Sub(double_t* pThis, double_t* pOther); +DLL_FUNCTION(double_t*) BU_Double_Div(double_t* pThis, double_t* pOther); +DLL_FUNCTION(double_t*) BU_Double_Mul(double_t* pThis, double_t* pOther); +DLL_FUNCTION(double_t*) BU_Double_Mod(double_t* pThis, double_t* pOther); + +DLL_FUNCTION(double_t*) BU_Double_SetF(double_t* pThis, float_t fOther); +DLL_FUNCTION(double_t*) BU_Double_AddF(double_t* pThis, float_t fOther); +DLL_FUNCTION(double_t*) BU_Double_SubF(double_t* pThis, float_t fOther); +DLL_FUNCTION(double_t*) BU_Double_DivF(double_t* pThis, float_t fOther); +DLL_FUNCTION(double_t*) BU_Double_MulF(double_t* pThis, float_t fOther); +DLL_FUNCTION(double_t*) BU_Double_ModF(double_t* pThis, float_t fOther); diff --git a/Type/Long.cpp b/Type/Long.cpp new file mode 100644 index 0000000..f7cd9d2 --- /dev/null +++ b/Type/Long.cpp @@ -0,0 +1,167 @@ +// Blitz - Steam wrapper for Blitz. +// Copyright (C) 2015 Xaymar (Michael Fabian Dirks) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser 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 Lesser General Public License +// along with this program. If not, see . + +#include "Long.h" + +DLL_FUNCTION(int64_t*) BU_Long_New() { + return new int64_t; +} +DLL_FUNCTION(int64_t*) BU_Long_Copy(int64_t* pOther) { + return new int64_t(*pOther); +} +DLL_FUNCTION(void) BU_Long_Destroy(int64_t* pThis) { + delete pThis; +} + +char* BU_Long_Buffer = new char[32]; +DLL_FUNCTION(const char*) BU_Long_ToString(int64_t* pThis) { + std::stringstream myStream; + myStream << (*pThis); + + const char* myBuffer = myStream.str().c_str(); + strcpy_s(BU_Long_Buffer, 32, myBuffer); + return BU_Long_Buffer; +} +DLL_FUNCTION(int64_t*) BU_Long_FromString(const char* pString) { + int64_t* pThis = new int64_t; + std::stringstream myStream = std::stringstream(pString); + myStream >> *pThis; + return pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_FromI(int32_t iRight) { + return new int64_t(iRight); +} +DLL_FUNCTION(int64_t*) BU_Long_FromII(int32_t iLeft, int32_t iRight) { + return new int64_t(((int64_t)(iLeft) << 32) + iRight); +} +DLL_FUNCTION(int32_t) BU_Long_ToI(int64_t* pThis, int32_t iShift) { + if (iShift >= 0) + return (int32_t)(*pThis >> iShift); + else + return (int32_t)(*pThis << -iShift); +} +DLL_FUNCTION(int32_t) BU_Long_ToIH(int64_t* pThis) { + return (int32_t)(*pThis >> 32); +} +DLL_FUNCTION(int32_t) BU_Long_ToIL(int64_t* pThis) { + return (int32_t)*pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_FromF(float_t fOther) { + return new int64_t((int64_t)fOther); +} +DLL_FUNCTION(float_t) BU_Long_ToF(int64_t* pThis) { + return (float_t)*pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_FromD(double_t* pOther) { + return new int64_t((int64_t)*pOther); +} +DLL_FUNCTION(double_t*) BU_Long_ToD(int64_t* pThis) { + return new double_t((double_t)*pThis); +} + +DLL_FUNCTION(int32_t) BU_Long_Compare(int64_t* pThis, int64_t* pOther) { + return /* It can either be Equal (0) or Smaller or Greater. Easy to check. */ + /* Greater */ + (*pThis > *pOther ? 1 : 0) + + /* Smaller */ + (*pThis < *pOther ? -1 : 0); +} + +DLL_FUNCTION(int64_t*) BU_Long_Set(int64_t* pThis, int64_t* pOther) { + *pThis = *pOther; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_Add(int64_t* pThis, int64_t* pOther) { + *pThis += *pOther; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_Sub(int64_t* pThis, int64_t* pOther) { + *pThis -= *pOther; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_Div(int64_t* pThis, int64_t* pOther) { + *pThis /= *pOther; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_Mul(int64_t* pThis, int64_t* pOther) { + *pThis *= *pOther; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_Mod(int64_t* pThis, int64_t* pOther) { + *pThis %= *pOther; + return pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_SetI(int64_t* pThis, int32_t iRight) { + *pThis = iRight; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_AddI(int64_t* pThis, int32_t iRight) { + *pThis += iRight; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_SubI(int64_t* pThis, int32_t iRight) { + *pThis -= iRight; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_DivI(int64_t* pThis, int32_t iRight) { + *pThis /= iRight; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_MulI(int64_t* pThis, int32_t iRight) { + *pThis *= iRight; + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_ModI(int64_t* pThis, int32_t iRight) { + *pThis %= iRight; + return pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_SetII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis = (((int64_t)iLeft << 32) + iRight); + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_AddII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis += (((int64_t)iLeft << 32) + iRight); + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_SubII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis -= (((int64_t)iLeft << 32) + iRight); + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_DivII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis /= (((int64_t)iLeft << 32) + iRight); + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_MulII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis *= (((int64_t)iLeft << 32) + iRight); + return pThis; +} +DLL_FUNCTION(int64_t*) BU_Long_ModII(int64_t* pThis, int32_t iLeft, int32_t iRight) { + *pThis %= (((int64_t)iLeft << 32) + iRight); + return pThis; +} + +DLL_FUNCTION(int64_t*) BU_Long_Shift(int64_t* pThis, int32_t iRight) { + if (iRight >= 0) + *pThis >>= iRight; + else + *pThis <<= -iRight; + return pThis; +} \ No newline at end of file diff --git a/Type/Long.h b/Type/Long.h new file mode 100644 index 0000000..d08e123 --- /dev/null +++ b/Type/Long.h @@ -0,0 +1,63 @@ +// Blitz - Steam wrapper for Blitz. +// Copyright (C) 2015 Xaymar (Michael Fabian Dirks) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser 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 Lesser General Public License +// along with this program. If not, see . + +#pragma once +#include "BlitzUtility.h" +#include + +DLL_FUNCTION(int64_t*) BU_Long_New(); +DLL_FUNCTION(int64_t*) BU_Long_Copy(int64_t* pRight); +DLL_FUNCTION(void) BU_Long_Destroy(int64_t* pThis); + +DLL_FUNCTION(const char*) BU_Long_ToString(int64_t* pThis); +DLL_FUNCTION(int64_t*) BU_Long_FromString(const char* pString); + +DLL_FUNCTION(int64_t*) BU_Long_FromI(int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_FromII(int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int32_t) BU_Long_ToI(int64_t* pThis, int32_t iShift); +DLL_FUNCTION(int32_t) BU_Long_ToIH(int64_t* pThis); +DLL_FUNCTION(int32_t) BU_Long_ToIL(int64_t* pThis); + +DLL_FUNCTION(int64_t*) BU_Long_FromF(float_t fOther); +DLL_FUNCTION(float_t) BU_Long_ToF(int64_t* pThis); + +DLL_FUNCTION(int64_t*) BU_Long_FromD(double_t* pOther); +DLL_FUNCTION(double_t*) BU_Long_ToD(int64_t* pThis); + +DLL_FUNCTION(int32_t) BU_Long_Compare(int64_t* pThis, int64_t* pOther); + +DLL_FUNCTION(int64_t*) BU_Long_Set(int64_t* pThis, int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Long_Add(int64_t* pThis, int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Long_Sub(int64_t* pThis, int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Long_Div(int64_t* pThis, int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Long_Mul(int64_t* pThis, int64_t* pOther); +DLL_FUNCTION(int64_t*) BU_Long_Mod(int64_t* pThis, int64_t* pOther); + +DLL_FUNCTION(int64_t*) BU_Long_SetI(int64_t* pThis, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_AddI(int64_t* pThis, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_SubI(int64_t* pThis, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_DivI(int64_t* pThis, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_MulI(int64_t* pThis, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_ModI(int64_t* pThis, int32_t iRight); + +DLL_FUNCTION(int64_t*) BU_Long_SetII(int64_t* pThis, int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_AddII(int64_t* pThis, int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_SubII(int64_t* pThis, int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_DivII(int64_t* pThis, int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_MulII(int64_t* pThis, int32_t iLeft, int32_t iRight); +DLL_FUNCTION(int64_t*) BU_Long_ModII(int64_t* pThis, int32_t iLeft, int32_t iRight); + +DLL_FUNCTION(int64_t*) BU_Long_Shift(int64_t* pThis, int32_t iShift); \ No newline at end of file diff --git a/Type/LongLong.cpp b/Type/LongLong.cpp deleted file mode 100644 index 13bc5b0..0000000 --- a/Type/LongLong.cpp +++ /dev/null @@ -1,256 +0,0 @@ -// Blitz - Steam wrapper for Blitz. -// Copyright (C) 2015 Xaymar (Michael Fabian Dirks) -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser 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 Lesser General Public License -// along with this program. If not, see . - -#pragma once -#include "LongLong.h" -#include - -// Templates -template< typename T > -std::string int_to_hex(T i) { - std::stringstream stream; - stream - << std::setfill('0') - << std::setw(sizeof(T) * 2) - << std::hex - << i; - return stream.str(); -} - -template< typename T > -T hex_to_int(std::string t) { - T x; - std::stringstream stream; - stream - << std::hex - << t; - stream - >> x; - return x; -} - - -std::list blitzLLTemporary; - -DLL_FUNCTION(int64_t*) BU_LongLong_Create() { -#pragma comment(linker, "/EXPORT:BU_LongLong_Create=_BU_LongLong_Create@0") - return new int64_t; -} - -DLL_FUNCTION(void) BU_LongLong_Destroy(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Destroy=_BU_LongLong_Destroy@4") - delete pthis; -} - -DLL_FUNCTION(int64_t*) BU_LongLong_Copy(int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Copy=_BU_LongLong_Copy@4") - return new int64_t(*other); -} - - -DLL_FUNCTION(int64_t*) BU_LongLong_TempCreate() { -#pragma comment(linker, "/EXPORT:BU_LongLong_TempCreate=_BU_LongLong_TempCreate@0") - int64_t* val = new int64_t; - blitzLLTemporary.push_back(val); - return val; -} - -DLL_FUNCTION(int64_t*) BU_LongLong_TempCopy(int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_TempCopy=_BU_LongLong_TempCopy@4") - int64_t* val = new int64_t(*other); - blitzLLTemporary.push_back(val); - return val; -} - -DLL_FUNCTION(void) BU_LongLong_SetTemp(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_SetTemp=_BU_LongLong_SetTemp@4") - blitzLLTemporary.push_back(pthis); -} - -DLL_FUNCTION(void) BU_LongLong_UnsetTemp(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_UnsetTemp=_BU_LongLong_UnsetTemp@4") - blitzLLTemporary.remove(pthis); -} - -DLL_FUNCTION(void) BU_LongLong_TempCleanup() { -#pragma comment(linker, "/EXPORT:BU_LongLong_TempCleanup=_BU_LongLong_TempCleanup@0") - auto iterEnd = blitzLLTemporary.end(); - for (auto iter = blitzLLTemporary.begin(); iter != iterEnd; ++iter) { - delete *iter; - } - blitzLLTemporary.clear(); -} - -DLL_FUNCTION(void) BU_LongLong_Set(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Set=_BU_LongLong_Set@8") - *pthis = *other; -} - -DLL_FUNCTION(void) BU_LongLong_SetV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_SetV=_BU_LongLong_SetV@12") - *pthis = ((int64_t)left << 32) + right; -} - - -DLL_FUNCTION(void) BU_LongLong_Add(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Add=_BU_LongLong_Add@8") - *pthis += *other; -} - -DLL_FUNCTION(void) BU_LongLong_AddV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_AddV=_BU_LongLong_AddV@12") - *pthis += ((int64_t)left << 32) + right; -} - - -DLL_FUNCTION(void) BU_LongLong_Sub(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Sub=_BU_LongLong_Sub@8") - *pthis -= *other; -} - -DLL_FUNCTION(void) BU_LongLong_SubV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_SubV=_BU_LongLong_SubV@12") - *pthis -= ((int64_t)left << 32) + right; -} - - -DLL_FUNCTION(void) BU_LongLong_Mul(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Mul=_BU_LongLong_Mul@8") - *pthis *= *other; -} - -DLL_FUNCTION(void) BU_LongLong_MulV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_MulV=_BU_LongLong_MulV@12") - *pthis *= ((int64_t)left << 32) + right; -} - - -DLL_FUNCTION(void) BU_LongLong_Div(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Div=_BU_LongLong_Div@8") - *pthis /= *other; -} - -DLL_FUNCTION(void) BU_LongLong_DivV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_DivV=_BU_LongLong_DivV@12") - *pthis /= ((int64_t)left << 32) + right; -} - - -DLL_FUNCTION(void) BU_LongLong_Modulo(int64_t* pThis, int64_t* pOther) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Modulo=_BU_LongLong_Modulo@8") - *pThis %= *pOther; -} - -DLL_FUNCTION(void) BU_LongLong_ModuloV(int64_t* pThis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ModuloV=_BU_LongLong_ModuloV@12") - *pThis %= (((uint64_t)left << 32) + (uint64_t)right); -} - - -DLL_FUNCTION(void) BU_LongLong_ShiftLeft(int64_t* pThis, int32_t left) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ShiftLeft=_BU_LongLong_ShiftLeft@8") - *pThis <<= left; -} - -DLL_FUNCTION(void) BU_LongLong_ShiftRight(int64_t* pThis, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ShiftRight=_BU_LongLong_ShiftRight@8") - *pThis >>= right; -} - - -DLL_FUNCTION(int32_t) BU_LongLong_Compare(int64_t* pthis, int64_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Compare=_BU_LongLong_Compare@8") - return (*pthis == *other ? 1 : 0) + (*pthis < *other ? 2 : 0) + (*pthis > *other ? 4 : 0); -} - -DLL_FUNCTION(int32_t) BU_LongLong_CompareV(int64_t* pthis, int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_CompareV=_BU_LongLong_CompareV@12") - int64_t other = ((int64_t)left << 32) + right; - return (*pthis == other ? 1 : 0) + (*pthis < other ? 2 : 0) + (*pthis > other ? 4 : 0); -} - -DLL_FUNCTION(const char*) BU_LongLong_ToString(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToString=_BU_LongLong_ToString@4") - std::stringstream stream; - stream << (*pthis); - return stream.str().c_str(); -} - -DLL_FUNCTION(int64_t*) BU_LongLong_FromString(const char* text) { -#pragma comment(linker, "/EXPORT:BU_LongLong_FromString=_BU_LongLong_FromString@4") - std::stringstream stream = std::stringstream(text); - int64_t* val = new int64_t; - stream >> (*val); - return val; -} - -DLL_FUNCTION(int32_t) BU_LongLong_ToLong(int64_t* pthis, int32_t _modulus) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToLong=_BU_LongLong_ToLong@8") - return *pthis % _modulus; -} - -DLL_FUNCTION(int64_t*) BU_LongLong_FromLong(int32_t left, int32_t right) { -#pragma comment(linker, "/EXPORT:BU_LongLong_FromLong=_BU_LongLong_FromLong@8") - int64_t* val = new int64_t; - *val = ((int64_t)left << 32) + right; - return val; -} - -DLL_FUNCTION(int32_t) BU_LongLong_ToLongHigh(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToLongHigh=_BU_LongLong_ToLongHigh@4") - return (int32_t)((*pthis) >> 32); -} - -DLL_FUNCTION(int32_t) BU_LongLong_ToLongLow(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToLongLow=_BU_LongLong_ToLongLow@4") - return (int32_t)((*pthis) && 0xFFFFFFFF); -} - -DLL_FUNCTION(float_t) BU_LongLong_ToFloat(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToFloat=_BU_LongLong_ToFloat@4") - return (float)*pthis; -} - -DLL_FUNCTION(int64_t*) BU_LongLong_FromFloat(float_t other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_FromFloat=_BU_LongLong_FromFloat@4") - int64_t val = (int64_t)other; - return BU_LongLong_Copy(&val); -} - -DLL_FUNCTION(double_t*) BU_LongLong_ToDouble(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_ToDouble=_BU_LongLong_ToDouble@4") - double_t* val = new double_t; - *val = (double_t)*pthis; - return val; -} - -DLL_FUNCTION(int64_t*) BU_LongLong_FromDouble(double_t* other) { -#pragma comment(linker, "/EXPORT:BU_LongLong_FromDouble=_BU_LongLong_FromDouble@4") - int64_t* val = new int64_t; - *val = (int64_t)*other; - return val; -} - -DLL_FUNCTION(const char*) BU_LongLong_Serialize(int64_t* pthis) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Serialize=_BU_LongLong_Serialize@4") - return int_to_hex(*pthis).c_str(); -} - -DLL_FUNCTION(int64_t*) BU_LongLong_Deserialize(const char* text) { -#pragma comment(linker, "/EXPORT:BU_LongLong_Deserialize=_BU_LongLong_Deserialize@4") - int64_t val = hex_to_int(std::string(text)); - return new int64_t(val); -} diff --git a/Type/LongLong.h b/Type/LongLong.h deleted file mode 100644 index 90c2a4e..0000000 --- a/Type/LongLong.h +++ /dev/null @@ -1,87 +0,0 @@ -// Blitz - Steam wrapper for Blitz. -// Copyright (C) 2015 Xaymar (Michael Fabian Dirks) -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser 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 Lesser General Public License -// along with this program. If not, see . - -#pragma once -#include "BlitzUtility.h" -#include "Double.h" -#include -#include -#include - -#pragma region Constructor & Destructor -DLL_FUNCTION(int64_t*) BU_LongLong_Create(); -DLL_FUNCTION(void) BU_LongLong_Destroy(int64_t* pthis); -DLL_FUNCTION(int64_t*) BU_LongLong_Copy(int64_t* other); -#pragma endregion Constructor & Destructor - -#pragma region Temporary Objects -DLL_FUNCTION(int64_t*) BU_LongLong_TempCreate(); -DLL_FUNCTION(int64_t*) BU_LongLong_TempCopy(int64_t* other); -DLL_FUNCTION(void) BU_LongLong_SetTemp(int64_t* pthis); -DLL_FUNCTION(void) BU_LongLong_UnsetTemp(int64_t* pthis); -DLL_FUNCTION(void) BU_LongLong_TempCleanup(); -#pragma endregion Temporary Objects - -#pragma region Math -DLL_FUNCTION(void) BU_LongLong_Set(int64_t* pthis, int64_t* other); -DLL_FUNCTION(void) BU_LongLong_SetV(int64_t* pthis, int32_t left, int32_t right); - -DLL_FUNCTION(void) BU_LongLong_Add(int64_t* pthis, int64_t* other); -DLL_FUNCTION(void) BU_LongLong_AddV(int64_t* pthis, int32_t left, int32_t right); - -DLL_FUNCTION(void) BU_LongLong_Sub(int64_t* pthis, int64_t* other); -DLL_FUNCTION(void) BU_LongLong_SubV(int64_t* pthis, int32_t left, int32_t right); - -DLL_FUNCTION(void) BU_LongLong_Mul(int64_t* pthis, int64_t* other); -DLL_FUNCTION(void) BU_LongLong_MulV(int64_t* pthis, int32_t left, int32_t right); - -DLL_FUNCTION(void) BU_LongLong_Div(int64_t* pthis, int64_t* other); -DLL_FUNCTION(void) BU_LongLong_DivV(int64_t* pthis, int32_t left, int32_t right); -#pragma endregion Math - -#pragma region Advanced Math -DLL_FUNCTION(void) BU_LongLong_Modulo(int64_t* pThis, int64_t* pOther); -DLL_FUNCTION(void) BU_LongLong_ModuloV(int64_t* pThis, int32_t left, int32_t right); - -DLL_FUNCTION(void) BU_LongLong_ShiftLeft(int64_t* pThis, int32_t left); -DLL_FUNCTION(void) BU_LongLong_ShiftRight(int64_t* pThis, int32_t right); -#pragma endregion Advanced Math - -#pragma region Comparison -DLL_FUNCTION(int32_t) BU_LongLong_Compare(int64_t* pthis, int64_t* other); -DLL_FUNCTION(int32_t) BU_LongLong_CompareV(int64_t* pthis, int32_t left, int32_t right); -#pragma endregion Comparison - -#pragma region Conversion -DLL_FUNCTION(const char*) BU_LongLong_ToString(int64_t* pthis); -DLL_FUNCTION(int64_t*) BU_LongLong_FromString(const char* text); - -DLL_FUNCTION(int32_t) BU_LongLong_ToLong(int64_t* pthis, int32_t _modulus); -DLL_FUNCTION(int64_t*) BU_LongLong_FromLong(int32_t left, int32_t right); -DLL_FUNCTION(int32_t) BU_LongLong_ToLongHigh(int64_t* pthis); -DLL_FUNCTION(int32_t) BU_LongLong_ToLongLow(int64_t* pthis); - -DLL_FUNCTION(float_t) BU_LongLong_ToFloat(int64_t* pthis); -DLL_FUNCTION(int64_t*) BU_LongLong_FromFloat(float_t other); - -DLL_FUNCTION(double_t*) BU_LongLong_ToDouble(int64_t* pthis); -DLL_FUNCTION(int64_t*) BU_LongLong_FromDouble(double_t* pthis); -#pragma endregion Conversion - -#pragma region Serialization -DLL_FUNCTION(const char*) BU_LongLong_Serialize(int64_t* pthis); -DLL_FUNCTION(int64_t*) BU_LongLong_Deserialize(const char* text); -#pragma endregion Serialization diff --git a/Utility/MassOp.cpp b/Utility/MassOp.cpp index 65afc6b..2b7ebd4 100644 --- a/Utility/MassOp.cpp +++ b/Utility/MassOp.cpp @@ -117,7 +117,7 @@ DLL_FUNCTION(void) BU_MassOp_Run(MassOp* massop) { case Double: switch (instr->code) { case Create: - instr->result = (uint32_t) BU_Double_Create(); + instr->result = (uint32_t) BU_Double_New(); break; case Destroy: BU_Double_Destroy((double_t*)instr->leftOperand); @@ -125,15 +125,6 @@ DLL_FUNCTION(void) BU_MassOp_Run(MassOp* massop) { case Copy: instr->result = (uint32_t) BU_Double_Copy((double_t*)instr->leftOperand); break; - case TempCreate: - instr->result = (uint32_t) BU_Double_TempCreate(); - break; - case TempCopy: - instr->result = (uint32_t) BU_Double_TempCopy((double_t*)instr->leftOperand); - break; - case TempCleanup: - BU_Double_TempCleanup(); - break; case Set: BU_Double_Set((double_t*)instr->leftOperand, (double_t*)instr->rightOperand); break; @@ -154,43 +145,34 @@ DLL_FUNCTION(void) BU_MassOp_Run(MassOp* massop) { break; } break; - case LongLong: + case Long: switch (instr->code) { case Create: - instr->result = (uint32_t) BU_LongLong_Create(); + instr->result = (uint32_t) BU_Long_New(); break; case Destroy: - BU_LongLong_Destroy((int64_t*)instr->leftOperand); + BU_Long_Destroy((int64_t*)instr->leftOperand); break; case Copy: - instr->result = (uint32_t) BU_LongLong_Copy((int64_t*)instr->leftOperand); - break; - case TempCreate: - instr->result = (uint32_t) BU_LongLong_TempCreate(); - break; - case TempCopy: - instr->result = (uint32_t) BU_LongLong_TempCopy((int64_t*)instr->leftOperand); - break; - case TempCleanup: - BU_LongLong_TempCleanup(); + instr->result = (uint32_t) BU_Long_Copy((int64_t*)instr->leftOperand); break; case Set: - BU_LongLong_Set((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + BU_Long_Set((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; case Add: - BU_LongLong_Add((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + BU_Long_Add((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; case Sub: - BU_LongLong_Sub((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + BU_Long_Sub((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; case Mul: - BU_LongLong_Mul((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + BU_Long_Mul((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; case Div: - BU_LongLong_Div((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + BU_Long_Div((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; case Compare: - instr->result = BU_LongLong_Compare((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); + instr->result = BU_Long_Compare((int64_t*)instr->leftOperand, (int64_t*)instr->rightOperand); break; } break; diff --git a/Utility/MassOp.h b/Utility/MassOp.h index 805a9b9..b0d41ce 100644 --- a/Utility/MassOp.h +++ b/Utility/MassOp.h @@ -17,10 +17,9 @@ #pragma once #include "BlitzUtility.h" #include "Type\Double.h" -#include "Type\LongLong.h" enum MassOpType { - LongLong = 0, + Long = 0, Double = 1, Vector2 = 10,