From 3fa6b003ea0ac25d64ea5d0f229009277e1a7f8a Mon Sep 17 00:00:00 2001 From: Abel Sinkovics Date: Tue, 17 Sep 2013 08:23:34 +0200 Subject: [PATCH] Use Readline instead of Editline --- CMakeLists.txt | 24 +- LICENSE.md | 611 +++++++++++++++++++++++++++ README.md | 4 +- app/CMakeLists.txt | 45 +- app/console.cpp | 19 +- app/console.hpp | 19 +- app/editline_shell.cpp | 184 -------- app/editline_shell.hpp | 37 -- app/interrupt_handler_override.cpp | 20 +- app/interrupt_handler_override.hpp | 19 +- app/main.cpp | 23 +- app/override_guard.hpp | 19 +- app/readline_shell.cpp | 200 +++++++++ app/readline_shell.hpp | 52 +++ app/syntax_highlighted_display.cpp | 19 +- app/syntax_highlighted_display.hpp | 21 +- cmake/Modules/FindClang.cmake | 19 +- cmake/Modules/FindEditline.cmake | 22 - cmake/Modules/FindReadline.cmake | 33 ++ include/metashell/config.hpp | 19 +- include/metashell/indenter.hpp | 19 +- include/metashell/shell.hpp | 21 +- include/metashell/text_position.hpp | 19 +- include/metashell/token_iterator.hpp | 19 +- include/metashell/version.hpp | 32 +- lib/CMakeLists.txt | 19 +- lib/config.cpp | 19 +- lib/cxcodecompleteresults.cpp | 19 +- lib/cxcodecompleteresults.hpp | 19 +- lib/cxcursor.cpp | 19 +- lib/cxcursor.hpp | 19 +- lib/cxdiagnostic.cpp | 19 +- lib/cxdiagnostic.hpp | 19 +- lib/cxindex.cpp | 19 +- lib/cxindex.hpp | 19 +- lib/cxstring.cpp | 19 +- lib/cxstring.hpp | 19 +- lib/cxtranslationunit.cpp | 19 +- lib/cxtranslationunit.hpp | 19 +- lib/cxtype.cpp | 19 +- lib/cxtype.hpp | 19 +- lib/exception.cpp | 19 +- lib/exception.hpp | 19 +- lib/get_type_of_variable.cpp | 19 +- lib/get_type_of_variable.hpp | 19 +- lib/headers.cpp | 19 +- lib/headers.hpp | 19 +- lib/indenter.cpp | 120 ++++++ lib/indenter.hpp | 53 +++ lib/indexing_iterator.hpp | 19 +- lib/metashell.cpp | 19 +- lib/metashell.hpp | 19 +- lib/result.cpp | 19 +- lib/result.hpp | 19 +- lib/shell.cpp | 60 ++- lib/text_position.cpp | 19 +- lib/token_iterator.cpp | 19 +- lib/version.cpp | 61 +++ test/CMakeLists.txt | 19 +- test/string_set.cpp | 19 +- test/string_set.hpp | 19 +- test/test_completion.cpp | 19 +- test/test_evaluation.cpp | 19 +- test/test_formatting.cpp | 19 +- test/test_pretty_printing.cpp | 19 +- test/test_shell.cpp | 25 +- test/test_shell.hpp | 21 +- test/test_text_position.cpp | 19 +- test/util.cpp | 19 +- test/util.hpp | 19 +- 70 files changed, 2090 insertions(+), 510 deletions(-) create mode 100644 LICENSE.md delete mode 100644 app/editline_shell.cpp delete mode 100644 app/editline_shell.hpp create mode 100644 app/readline_shell.cpp create mode 100644 app/readline_shell.hpp delete mode 100644 cmake/Modules/FindEditline.cmake create mode 100644 cmake/Modules/FindReadline.cmake create mode 100644 lib/indenter.cpp create mode 100644 lib/indenter.hpp create mode 100644 lib/version.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 203dcf1698..e999fb8bb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,18 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . cmake_minimum_required(VERSION 2.6) @@ -24,6 +35,7 @@ find_package(Boost COMPONENTS program_options unit_test_framework ) +find_package(Threads) # used by Boost.Thread include_directories(${Boost_INCLUDE_DIR}) link_directories(${Boost_LIBRARY_DIRS}) @@ -40,7 +52,7 @@ endif() # Clang find_package(Clang) -# Editline lib +# Readline lib include_directories("include") # Unit testing @@ -67,7 +79,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${MAJOR_VERSION}.${MINOR_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}_${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${MAJOR_VERSION}.${MINOR_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libedit2") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libreadline6") set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") set(CPACK_DEBIAN_PACKAGE_SECTION "devel") diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..006dbbd714 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,611 @@ +# 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 + diff --git a/README.md b/README.md index ce6a892736..5747c4796a 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ metaprograms. * Download the source code from [github](http://github.com/sabel83/metashell). * Install the dependent libraries: * libclang - * Editline + * Readline * Install CMake * In the source directory run the following commands: * `mkdir bin` @@ -260,5 +260,5 @@ of the header. ## License Metashell is published under the -[Boost Software License](http://www.boost.org/LICENSE_1_0.txt). +[GNU General Public License, version 3](http://www.gnu.org/licenses/gpl.html). diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index dcabc71329..5b22c9a5e6 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,28 +1,25 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . aux_source_directory(. SOURCES) add_executable(metashell ${SOURCES}) -# Editline -find_package(Editline) -include_directories(${Editline_INCLUDE_DIR}) - # Metashell target_link_libraries(metashell metashell_lib) -# Editline -target_link_libraries(metashell ${Editline_LIBRARY}) - -# Program_options -target_link_libraries(metashell ${Boost_PROGRAM_OPTIONS_LIBRARIES}) - -# Clang -target_link_libraries(metashell ${CLANG_LIBRARY}) -include_directories(${CLANG_INCLUDE_DIR}) - # Wave target_link_libraries(metashell ${Boost_SYSTEM_LIBRARIES} @@ -32,5 +29,17 @@ target_link_libraries(metashell ${CMAKE_THREAD_LIBS_INIT} ) +# Readline +find_package(Readline) +include_directories(${Readline_INCLUDE_DIR}) +target_link_libraries(metashell ${Readline_LIBRARY}) + +# Program_options +target_link_libraries(metashell ${Boost_PROGRAM_OPTIONS_LIBRARIES}) + +# Clang +target_link_libraries(metashell ${CLANG_LIBRARY}) +include_directories(${CLANG_INCLUDE_DIR}) + install(TARGETS metashell DESTINATION bin) diff --git a/app/console.cpp b/app/console.cpp index 836815dad8..f00137a610 100644 --- a/app/console.cpp +++ b/app/console.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "console.hpp" diff --git a/app/console.hpp b/app/console.hpp index cfeb1204b5..427aa35b6f 100644 --- a/app/console.hpp +++ b/app/console.hpp @@ -1,10 +1,21 @@ #ifndef CONSOLE_HPP #define CONSOLE_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . namespace console { diff --git a/app/editline_shell.cpp b/app/editline_shell.cpp deleted file mode 100644 index 719323f5d5..0000000000 --- a/app/editline_shell.cpp +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#include "editline_shell.hpp" -#include "syntax_highlighted_display.hpp" -#include "override_guard.hpp" -#include "interrupt_handler_override.hpp" -#include "console.hpp" - -#include -#include -#include - -#include - -#include - -#include - -#include - -#include -#include -#include - -#include - -using namespace metashell; - -namespace -{ - template - void display(const std::string& s_) - { - if (s_ != "") - { - console::text_color(Color); - std::cout << s_; - console::reset(); - std::cout << std::endl; - } - } - - void syntax_highlight(std::ostream& o_, const std::string& s_) - { - std::for_each( - begin_tokens(s_), - token_iterator(), - syntax_highlighted_display() - ); - - console::reset(); - } - - int console_width() - { - struct winsize w; - ioctl(STDOUT_FILENO, TIOCGWINSZ, &w); - return w.ws_col; - } -} - -editline_shell* editline_shell::_instance = 0; - -editline_shell::~editline_shell() -{ - assert(_instance); - _instance = 0; -} - -editline_shell::editline_shell(const metashell::config& config_) : - shell(config_), - _syntax_highlight(config_.syntax_highlight), - _indent(config_.indent) -{ - assert(!_instance); - _instance = this; -} - -void editline_shell::run() -{ - using boost::bind; - - char empty_string[] = ""; - override_guard ovr1(rl_basic_word_break_characters, empty_string); - - override_guard - ovr2(rl_attempted_completion_function, tab_completion); - - interrupt_handler_override ovr3(bind(&editline_shell::cancel_operation,this)); - - for (;;) - { - if (char* l = readline(prompt().c_str())) - { - add_history(l); - line_available(l); - free(l); - } - else - { - break; - } - } -} - -char* editline_shell::tab_generator(const char* text_, int state_) -{ - assert(_instance); - - static std::set values; - static std::set::const_iterator pos; - - if (!state_) // init - { - _instance->code_complete(text_, values); - pos = values.begin(); - } - - if (pos == values.end()) - { - return 0; - } - else - { - const std::string str = text_ + *pos; - char* s = new char[str.length() + 1]; - std::copy(str.begin(), str.end(), s); - s[str.length()] = 0; - ++pos; - return s; - } - return 0; -} - -char** editline_shell::tab_completion(const char* text_, int start_, int end_) -{ - return rl_completion_matches(const_cast(text_), &tab_generator); -} - -void editline_shell::display_normal(const std::string& s_) const -{ - if (s_ != "") - { - if (_indent) - { - if (_syntax_highlight) - { - indent(console_width(), 2, syntax_highlighted_display(), s_); - console::reset(); - } - else - { - indent(console_width(), 2, mindent::stream_display(std::cout), s_); - } - } - else - { - if (_syntax_highlight) - { - syntax_highlight(std::cout, s_); - } - else - { - std::cout << s_; - } - } - std::cout << std::endl; - } -} - -void editline_shell::display_info(const std::string& s_) const -{ - display(s_); -} - -void editline_shell::display_error(const std::string& s_) const -{ - display(s_); -} - - diff --git a/app/editline_shell.hpp b/app/editline_shell.hpp deleted file mode 100644 index aa18c7017e..0000000000 --- a/app/editline_shell.hpp +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef EDITLINE_SHELL_HPP -#define EDITLINE_SHELL_HPP - -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#include -#include - -#include -#include - -class editline_shell : public metashell::shell -{ -public: - editline_shell(const metashell::config& config_); - virtual ~editline_shell(); - - virtual void display_normal(const std::string& s_) const; - virtual void display_info(const std::string& s_) const; - virtual void display_error(const std::string& s_) const; - - void run(); -private: - bool _syntax_highlight; - bool _indent; - - static char* tab_generator(const char* text_, int state_); - static char** tab_completion(const char* text_, int start_, int end_); - - static editline_shell* _instance; -}; - -#endif - diff --git a/app/interrupt_handler_override.cpp b/app/interrupt_handler_override.cpp index a7dbf3ad49..8312bcff2a 100644 --- a/app/interrupt_handler_override.cpp +++ b/app/interrupt_handler_override.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "interrupt_handler_override.hpp" @@ -24,7 +35,6 @@ namespace #ifdef _MSC_VER void install_callback() { - // MinGW EditLine exits when Ctrl-C is pressed } void remove_callback() diff --git a/app/interrupt_handler_override.hpp b/app/interrupt_handler_override.hpp index 267cfe24f2..d2852dfecd 100644 --- a/app/interrupt_handler_override.hpp +++ b/app/interrupt_handler_override.hpp @@ -1,10 +1,21 @@ #ifndef INTERRUPT_HANDLER_OVERRIDE_HPP #define INTERRUPT_HANDLER_OVERRIDE_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/app/main.cpp b/app/main.cpp index 6ea79b8e6d..45dd8ba5eb 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,9 +1,20 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . -#include "editline_shell.hpp" +#include "readline_shell.hpp" #include @@ -48,7 +59,7 @@ int main(int argc_, char* argv_[]) } else { - editline_shell shell(cfg); + readline_shell shell(cfg); shell.display_splash(); diff --git a/app/override_guard.hpp b/app/override_guard.hpp index eea7f83831..8baf60e570 100644 --- a/app/override_guard.hpp +++ b/app/override_guard.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_OVERRIDE_GUARD_HPP #define METASHELL_OVERRIDE_GUARD_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/app/readline_shell.cpp b/app/readline_shell.cpp new file mode 100644 index 0000000000..457ac51f7d --- /dev/null +++ b/app/readline_shell.cpp @@ -0,0 +1,200 @@ +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include "readline_shell.hpp" +#include "syntax_highlighted_display.hpp" +#include "override_guard.hpp" +#include "interrupt_handler_override.hpp" +#include "console.hpp" + +#include +#include +#include + +#include + +#include +#include + +#include + +#include + +#include +#include +#include +#include + +#include + +using namespace metashell; + +namespace +{ + template + void display(const std::string& s_) + { + if (s_ != "") + { + console::text_color(Color); + std::cout << s_; + console::reset(); + std::cout << std::endl; + } + } + + void syntax_highlight(std::ostream& o_, const std::string& s_) + { + std::for_each( + begin_tokens(s_), + token_iterator(), + syntax_highlighted_display() + ); + + console::reset(); + } + + std::string get_edited_text() + { + char* cs = rl_copy_text(0, rl_end); + const std::string s(cs); + free(cs); + return s; + } +} + +readline_shell* readline_shell::_instance = 0; +int readline_shell::_completion_end = 0; + +readline_shell::~readline_shell() +{ + assert(_instance); + _instance = 0; +} + +readline_shell::readline_shell(const metashell::config& config_) : + shell(config_), + _syntax_highlight(config_.syntax_highlight), + _indent(config_.indent) +{ + assert(!_instance); + _instance = this; +} + +void readline_shell::run() +{ + using boost::bind; + + override_guard + ovr2(rl_attempted_completion_function, tab_completion); + + interrupt_handler_override ovr3(bind(&readline_shell::cancel_operation,this)); + + while (char* l = readline(prompt().c_str())) + { + add_history(l); + line_available(l); + free(l); + } +} + +char* readline_shell::tab_generator(const char* text_, int state_) +{ + assert(_instance); + + static std::set values; + static std::set::const_iterator pos; + + if (!state_) // init + { + const std::string edited_text = get_edited_text(); + _instance->code_complete( + std::string(edited_text.begin(), edited_text.begin() + _completion_end), + values + ); + pos = values.begin(); + } + + if (pos == values.end()) + { + return 0; + } + else + { + const std::string str = text_ + *pos; + char* s = new char[str.length() + 1]; + std::copy(str.begin(), str.end(), s); + s[str.length()] = 0; + ++pos; + return s; + } + return 0; +} + +char** readline_shell::tab_completion(const char* text_, int start_, int end_) +{ + _completion_end = end_; + return rl_completion_matches(const_cast(text_), &tab_generator); +} + +void readline_shell::display_normal(const std::string& s_) const +{ + if (s_ != "") + { + if (_indent) + { + if (_syntax_highlight) + { + indent(width(), 2, syntax_highlighted_display(), s_); + console::reset(); + } + else + { + indent(width(), 2, mindent::stream_display(std::cout), s_); + } + } + else + { + if (_syntax_highlight) + { + syntax_highlight(std::cout, s_); + } + else + { + std::cout << s_; + } + } + std::cout << std::endl; + } +} + +void readline_shell::display_info(const std::string& s_) const +{ + std::cout << s_; +} + +void readline_shell::display_error(const std::string& s_) const +{ + display(s_); +} + +unsigned int readline_shell::width() const +{ + struct winsize w; + ioctl(STDOUT_FILENO, TIOCGWINSZ, &w); + return w.ws_col; +} + diff --git a/app/readline_shell.hpp b/app/readline_shell.hpp new file mode 100644 index 0000000000..62205cc250 --- /dev/null +++ b/app/readline_shell.hpp @@ -0,0 +1,52 @@ +#ifndef READLINE_SHELL_HPP +#define READLINE_SHELL_HPP + +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include +#include + +#include +#include + +class readline_shell : public metashell::shell +{ +public: + readline_shell(const metashell::config& config_); + virtual ~readline_shell(); + + virtual void display_normal(const std::string& s_) const; + virtual void display_info(const std::string& s_) const; + virtual void display_error(const std::string& s_) const; + + virtual unsigned int width() const; + + void run(); +private: + bool _syntax_highlight; + bool _indent; + + static char* tab_generator(const char* text_, int state_); + static char** tab_completion(const char* text_, int start_, int end_); + + static readline_shell* _instance; + + static int _completion_end; +}; + +#endif + diff --git a/app/syntax_highlighted_display.cpp b/app/syntax_highlighted_display.cpp index 54e658d680..b1a5a16556 100644 --- a/app/syntax_highlighted_display.cpp +++ b/app/syntax_highlighted_display.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "syntax_highlighted_display.hpp" diff --git a/app/syntax_highlighted_display.hpp b/app/syntax_highlighted_display.hpp index 3ac3fee917..9d16d4c50d 100644 --- a/app/syntax_highlighted_display.hpp +++ b/app/syntax_highlighted_display.hpp @@ -1,12 +1,23 @@ #ifndef METASHELL_SYNTAX_HIGHLIGHTED_DISPLAY_HPP #define METASHELL_SYNTAX_HIGHLIGHTED_DISPLAY_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . -#include "editline_shell.hpp" +#include "readline_shell.hpp" #include "console.hpp" #include diff --git a/cmake/Modules/FindClang.cmake b/cmake/Modules/FindClang.cmake index 521d35f113..bf9f92ea80 100644 --- a/cmake/Modules/FindClang.cmake +++ b/cmake/Modules/FindClang.cmake @@ -1,7 +1,18 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . # This module will define the following: # CLANG_FOUND diff --git a/cmake/Modules/FindEditline.cmake b/cmake/Modules/FindEditline.cmake deleted file mode 100644 index 905aa168ab..0000000000 --- a/cmake/Modules/FindEditline.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# This module will define the following: -# Editline_FOUND -# Editline_INCLUDE_DIR -# Editline_LIBRARY - -find_path(Editline_INCLUDE_DIR editline/readline.h) -find_library(Editline_LIBRARY NAMES edit) - -include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set Editline_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args( - Editline DEFAULT_MSG Editline_LIBRARY Editline_INCLUDE_DIR -) - -mark_as_advanced(Editline_INCLUDE_DIR, Editline_LIBRARY) - diff --git a/cmake/Modules/FindReadline.cmake b/cmake/Modules/FindReadline.cmake new file mode 100644 index 0000000000..7adc00c253 --- /dev/null +++ b/cmake/Modules/FindReadline.cmake @@ -0,0 +1,33 @@ +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . + +# This module will define the following: +# Readline_FOUND +# Readline_INCLUDE_DIR +# Readline_LIBRARY + +find_path(Readline_INCLUDE_DIR readline/readline.h) +find_library(Readline_LIBRARY NAMES readline) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set Readline_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args( + Readline DEFAULT_MSG Readline_LIBRARY Readline_INCLUDE_DIR +) + +mark_as_advanced(Readline_INCLUDE_DIR, Readline_LIBRARY) + diff --git a/include/metashell/config.hpp b/include/metashell/config.hpp index 532fdc3f75..94bb4982fb 100644 --- a/include/metashell/config.hpp +++ b/include/metashell/config.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CONFIG_HPP #define METASHELL_CONFIG_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/include/metashell/indenter.hpp b/include/metashell/indenter.hpp index 5cabc8fab3..82388bc7d9 100644 --- a/include/metashell/indenter.hpp +++ b/include/metashell/indenter.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_INDENTER_HPP #define METASHELL_INDENTER_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/include/metashell/shell.hpp b/include/metashell/shell.hpp index a2b7cd5285..831f5edac7 100644 --- a/include/metashell/shell.hpp +++ b/include/metashell/shell.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_SHELL_HPP #define METASHELL_SHELL_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include @@ -22,6 +33,8 @@ namespace metashell virtual void display_normal(const std::string& s_) const = 0; virtual void display_info(const std::string& s_) const = 0; virtual void display_error(const std::string& s_) const = 0; + + virtual unsigned int width() const = 0; void display_splash() const; void line_available(const std::string& s_); diff --git a/include/metashell/text_position.hpp b/include/metashell/text_position.hpp index 992cd96c34..b2a8135199 100644 --- a/include/metashell/text_position.hpp +++ b/include/metashell/text_position.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_TEXT_POSITION_HPP #define METASHELL_TEXT_POSITION_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/include/metashell/token_iterator.hpp b/include/metashell/token_iterator.hpp index c633867b27..e44bc5f863 100644 --- a/include/metashell/token_iterator.hpp +++ b/include/metashell/token_iterator.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_TOKEN_ITERATOR_HPP #define METASHELL_TOKEN_ITERATOR_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/include/metashell/version.hpp b/include/metashell/version.hpp index 9f0796ca91..2666ce9dc5 100644 --- a/include/metashell/version.hpp +++ b/include/metashell/version.hpp @@ -1,10 +1,23 @@ #ifndef METASHELL_VERSION_HPP #define METASHELL_VERSION_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include #ifdef METASHELL_MAJOR #error METASHELL_MAJOR already defined @@ -12,10 +25,19 @@ #ifdef METASHELL_MINOR #error METASHELL_MINOR already defined #endif - +#ifdef METASHELL_PATCH + #error METASHELL_PATCH already defined +#endif #define METASHELL_MAJOR 0 #define METASHELL_MINOR 1 +#define METASHELL_PATCH 0 + +namespace metashell +{ + std::string wave_version(); + std::string libclang_version(); +} #endif diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 892a0f16cc..210dcc031f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,7 +1,18 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . aux_source_directory(. SOURCES) add_library(metashell_lib STATIC ${SOURCES}) diff --git a/lib/config.cpp b/lib/config.cpp index 68eedd7186..fa60daff23 100644 --- a/lib/config.cpp +++ b/lib/config.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/cxcodecompleteresults.cpp b/lib/cxcodecompleteresults.cpp index 1884912181..d8e076c6b0 100644 --- a/lib/cxcodecompleteresults.cpp +++ b/lib/cxcodecompleteresults.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxcodecompleteresults.hpp" #include "cxstring.hpp" diff --git a/lib/cxcodecompleteresults.hpp b/lib/cxcodecompleteresults.hpp index 165217a667..dac88b62c9 100644 --- a/lib/cxcodecompleteresults.hpp +++ b/lib/cxcodecompleteresults.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXCODECOMPLETERESULTS_HPP #define METASHELL_CXCODECOMPLETERESULTS_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/cxcursor.cpp b/lib/cxcursor.cpp index dbe84cffd0..01c24e5e88 100644 --- a/lib/cxcursor.cpp +++ b/lib/cxcursor.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxcursor.hpp" #include "cxstring.hpp" diff --git a/lib/cxcursor.hpp b/lib/cxcursor.hpp index 606f9318a7..6d7d2930f3 100644 --- a/lib/cxcursor.hpp +++ b/lib/cxcursor.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXCURSOR_HPP #define METASHELL_CXCURSOR_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxtype.hpp" diff --git a/lib/cxdiagnostic.cpp b/lib/cxdiagnostic.cpp index dfa02bb605..a037429987 100644 --- a/lib/cxdiagnostic.cpp +++ b/lib/cxdiagnostic.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxdiagnostic.hpp" #include "cxstring.hpp" diff --git a/lib/cxdiagnostic.hpp b/lib/cxdiagnostic.hpp index 020f3f5a6d..b02688aa81 100644 --- a/lib/cxdiagnostic.hpp +++ b/lib/cxdiagnostic.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXDIAGNOSTIC_HPP #define METASHELL_CXDIAGNOSTIC_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/cxindex.cpp b/lib/cxindex.cpp index a35fb2be73..0a6e3ce377 100644 --- a/lib/cxindex.cpp +++ b/lib/cxindex.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxindex.hpp" diff --git a/lib/cxindex.hpp b/lib/cxindex.hpp index a1156d82ba..03d984f409 100644 --- a/lib/cxindex.hpp +++ b/lib/cxindex.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXINDEX_HPP #define METASHELL_CXINDEX_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxtranslationunit.hpp" diff --git a/lib/cxstring.cpp b/lib/cxstring.cpp index 57ea2cf9e7..604de6a741 100644 --- a/lib/cxstring.cpp +++ b/lib/cxstring.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxstring.hpp" diff --git a/lib/cxstring.hpp b/lib/cxstring.hpp index 375be0542a..9b9af4cac6 100644 --- a/lib/cxstring.hpp +++ b/lib/cxstring.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXSTRING_HPP #define METASHELL_CXSTRING_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/cxtranslationunit.cpp b/lib/cxtranslationunit.cpp index 7604f484cb..fb4eed0015 100644 --- a/lib/cxtranslationunit.cpp +++ b/lib/cxtranslationunit.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/lib/cxtranslationunit.hpp b/lib/cxtranslationunit.hpp index 567f5ae416..000e112872 100644 --- a/lib/cxtranslationunit.hpp +++ b/lib/cxtranslationunit.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXTRANSLATIONUNIT_HPP #define METASHELL_CXTRANSLATIONUNIT_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/lib/cxtype.cpp b/lib/cxtype.cpp index 7dea4e65ab..1eb68c26fc 100644 --- a/lib/cxtype.cpp +++ b/lib/cxtype.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxtype.hpp" #include "cxcursor.hpp" diff --git a/lib/cxtype.hpp b/lib/cxtype.hpp index d03db259b2..d05cc2087b 100644 --- a/lib/cxtype.hpp +++ b/lib/cxtype.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_CXTYPE_HPP #define METASHELL_CXTYPE_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/exception.cpp b/lib/exception.cpp index 8e69cd137a..8914782dd6 100644 --- a/lib/exception.cpp +++ b/lib/exception.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "exception.hpp" diff --git a/lib/exception.hpp b/lib/exception.hpp index dde2c22b4e..09634e67c0 100644 --- a/lib/exception.hpp +++ b/lib/exception.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_EXCEPTION_HPP #define METASHELL_EXCEPTION_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/get_type_of_variable.cpp b/lib/get_type_of_variable.cpp index b13df72379..5f4c1daa2b 100644 --- a/lib/get_type_of_variable.cpp +++ b/lib/get_type_of_variable.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "get_type_of_variable.hpp" #include "exception.hpp" diff --git a/lib/get_type_of_variable.hpp b/lib/get_type_of_variable.hpp index 280df8c506..494c691a99 100644 --- a/lib/get_type_of_variable.hpp +++ b/lib/get_type_of_variable.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_GET_TYPE_OF_VARIABLE_HPP #define METASHELL_GET_TYPE_OF_VARIABLE_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "cxcursor.hpp" diff --git a/lib/headers.cpp b/lib/headers.cpp index bf5e443157..40cdfe04b1 100644 --- a/lib/headers.cpp +++ b/lib/headers.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "headers.hpp" diff --git a/lib/headers.hpp b/lib/headers.hpp index 684daa7bea..fa07075802 100644 --- a/lib/headers.hpp +++ b/lib/headers.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_HEADERS_HPP #define METASHELL_HEADERS_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/indenter.cpp b/lib/indenter.cpp new file mode 100644 index 0000000000..25f1a90cee --- /dev/null +++ b/lib/indenter.cpp @@ -0,0 +1,120 @@ +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include "indenter.hpp" + +#include + +#include +#include + +namespace +{ + bool is_whitespace(char c_) + { + return c_ == ' ' || c_ == '\t' || c_ == '\v' || c_ == '\r' || c_ == '\n'; + } + + void word_wrap( + const std::string& s_, + unsigned int width_, + std::vector& out_ + ) + { + for (std::string s(s_); !s.empty();) + { + if (s.length() > width_) + { + int i = width_; + while (i != -1 && !is_whitespace(s[i])) + { + --i; + } + + if (i == -1) + { + out_.push_back(std::string(s.begin(), s.begin() + width_)); + s = std::string(s.begin() + width_, s.end()); + } + else + { + out_.push_back(std::string(s.begin(), s.begin() + i)); + s = std::string(s.begin() + (i + 1), s.end()); + } + } + else + { + out_.push_back(s); + s = std::string(); + } + } + } +} + +indenter::indenter(unsigned int width_, const std::string& default_prefix_) : + _width(width_), + _default_prefix(default_prefix_) +{} + +std::string indenter::str() const +{ + return _buff.str(); +} + +indenter& indenter::raw(const std::string& s_) +{ + _buff << s_ << "\n"; + return *this; +} + +indenter& indenter::empty_line() +{ + return raw(_default_prefix); +} + +indenter& indenter::left_align(const std::string& s_) +{ + return left_align(s_, _default_prefix, _default_prefix); +} + +indenter& indenter::left_align( + const std::string& s_, + const std::string& line_prefix_ +) +{ + return left_align(s_, line_prefix_, line_prefix_); +} + +indenter& indenter::left_align( + const std::string& s_, + const std::string& line_prefix_, + const std::string& first_line_prefix_ +) +{ + assert(first_line_prefix_.length() == line_prefix_.length()); + + std::vector lines; + word_wrap(s_, _width - line_prefix_.length(), lines); + bool first = true; + BOOST_FOREACH(const std::string& line, lines) + { + _buff << (first ? first_line_prefix_ : line_prefix_) << line << "\n"; + first = false; + } + return *this; +} + + diff --git a/lib/indenter.hpp b/lib/indenter.hpp new file mode 100644 index 0000000000..0545e3428c --- /dev/null +++ b/lib/indenter.hpp @@ -0,0 +1,53 @@ +#ifndef METASHELL_INDENTER_HPP +#define METASHELL_INDENTER_HPP + +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include +#include + +class indenter +{ +public: + indenter(unsigned int width_, const std::string& default_prefix_); + + indenter& left_align( + const std::string& s_, + const std::string& line_prefix_, + const std::string& first_line_prefix_ + ); + + indenter& left_align( + const std::string& s_, + const std::string& line_prefix_ + ); + + indenter& raw(const std::string& s_); + + indenter& left_align(const std::string& s_); + + indenter& empty_line(); + + std::string str() const; +private: + unsigned int _width; + std::string _default_prefix; + std::ostringstream _buff; +}; + +#endif + diff --git a/lib/indexing_iterator.hpp b/lib/indexing_iterator.hpp index a62a5174fa..4af18960b4 100644 --- a/lib/indexing_iterator.hpp +++ b/lib/indexing_iterator.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_INDEXING_ITERATOR_HPP #define METASHELL_INDEXING_ITERATOR_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/lib/metashell.cpp b/lib/metashell.cpp index 158c3fcf96..e736d10ad2 100644 --- a/lib/metashell.cpp +++ b/lib/metashell.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "metashell.hpp" #include "get_type_of_variable.hpp" diff --git a/lib/metashell.hpp b/lib/metashell.hpp index f608296f78..743cb9c3ee 100644 --- a/lib/metashell.hpp +++ b/lib/metashell.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_METASHELL_HPP #define METASHELL_METASHELL_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/result.cpp b/lib/result.cpp index de08173ae6..1336e98230 100644 --- a/lib/result.cpp +++ b/lib/result.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "result.hpp" diff --git a/lib/result.hpp b/lib/result.hpp index 1781ecd603..e27807e130 100644 --- a/lib/result.hpp +++ b/lib/result.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_RESULT_HPP #define METASHELL_RESULT_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/lib/shell.cpp b/lib/shell.cpp index c30c1d46ff..2bb36ddf63 100644 --- a/lib/shell.cpp +++ b/lib/shell.cpp @@ -1,9 +1,21 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "metashell.hpp" +#include "indenter.hpp" #include #include @@ -100,16 +112,42 @@ void shell::cancel_operation() {} void shell::display_splash() const { - display_normal( - "/*\n" - " * Template metaprogramming shell " - BOOST_PP_STRINGIZE(METASHELL_MAJOR) - "." BOOST_PP_STRINGIZE(METASHELL_MINOR) "\n" - " */\n" + display_info( + indenter(width(), " * ") + .raw("/*") + .left_align( + "Template metaprogramming shell " + BOOST_PP_STRINGIZE(METASHELL_MAJOR) + "." BOOST_PP_STRINGIZE(METASHELL_MINOR) + "." BOOST_PP_STRINGIZE(METASHELL_PATCH) + ) + .empty_line() + .left_align( + "Metashell Copyright (C) 2013 Abel Sinkovics (abel@sinkovics.hu)" + ) + .left_align( + "This program comes with ABSOLUTELY NO WARRANTY. This is free software," + " and you are welcome to redistribute it under certain conditions;" + " for details visit ." + ) + .empty_line() + .left_align("Based on") + .left_align( + metashell::libclang_version(), + " * ", + " * libclang " + ) + .left_align( + metashell::wave_version(), + " * ", + " * Boost.Wave " + ) + .raw(" */") + .str() ); if (_config.verbose) { - display_info("Verbose mode: ON\n"); + display_info("\n// Verbose mode: ON\n\n"); } } diff --git a/lib/text_position.cpp b/lib/text_position.cpp index e0052bd408..c67f66a87b 100644 --- a/lib/text_position.cpp +++ b/lib/text_position.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/lib/token_iterator.cpp b/lib/token_iterator.cpp index e616bb47c2..ca724176ac 100644 --- a/lib/token_iterator.cpp +++ b/lib/token_iterator.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include #include diff --git a/lib/version.cpp b/lib/version.cpp new file mode 100644 index 0000000000..1fec08116c --- /dev/null +++ b/lib/version.cpp @@ -0,0 +1,61 @@ +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . + +#include + +#include "cxstring.hpp" + +#include + +#include +#include + +using namespace metashell; + +namespace +{ + template + std::string remove(const std::string& s_) + { + std::ostringstream s; + for (std::string::const_iterator i = s_.begin(), e = s_.end(); i != e; ++i) + { + if (*i != C) + { + s << *i; + } + } + return s.str(); + } +} + +std::string metashell::libclang_version() +{ + return cxstring(clang_getClangVersion()); +} + +std::string metashell::wave_version() +{ + return + remove<'"'>( + boost::wave::context< + const char*, + boost::wave::cpplexer::lex_iterator > + >::get_version_string() + ); +} + + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 870f66996a..5fe99ca605 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,18 @@ -# Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# Metashell - Interactive C++ template metaprogramming shell +# Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +# +# 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 . aux_source_directory(. SOURCES) add_executable(metashell_test ${SOURCES}) diff --git a/test/string_set.cpp b/test/string_set.cpp index 7b9e023472..c0d930c24a 100644 --- a/test/string_set.cpp +++ b/test/string_set.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "string_set.hpp" diff --git a/test/string_set.hpp b/test/string_set.hpp index f07e06a02d..7063692665 100644 --- a/test/string_set.hpp +++ b/test/string_set.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_STRING_SET_HPP #define METASHELL_STRING_SET_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/test/test_completion.cpp b/test/test_completion.cpp index 5fe12fcc26..ce163b708a 100644 --- a/test/test_completion.cpp +++ b/test/test_completion.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "string_set.hpp" #include "test_shell.hpp" diff --git a/test/test_evaluation.cpp b/test/test_evaluation.cpp index c59f5cdd6e..342da947af 100644 --- a/test/test_evaluation.cpp +++ b/test/test_evaluation.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "test_shell.hpp" diff --git a/test/test_formatting.cpp b/test/test_formatting.cpp index f70e6cdd66..4256c3bbe3 100644 --- a/test/test_formatting.cpp +++ b/test/test_formatting.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "util.hpp" diff --git a/test/test_pretty_printing.cpp b/test/test_pretty_printing.cpp index 593c4b2cf1..5e1edf94fa 100644 --- a/test/test_pretty_printing.cpp +++ b/test/test_pretty_printing.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #define BOOST_TEST_MODULE metashell diff --git a/test/test_shell.cpp b/test/test_shell.cpp index 5abd49ab4c..107c2905ec 100644 --- a/test/test_shell.cpp +++ b/test/test_shell.cpp @@ -1,8 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "test_shell.hpp" @@ -38,3 +48,8 @@ const std::string& test_shell::error() const return _error; } +unsigned int test_shell::width() const +{ + return 80; +} + diff --git a/test/test_shell.hpp b/test/test_shell.hpp index fa4120c371..7ddbd3e8d4 100644 --- a/test/test_shell.hpp +++ b/test/test_shell.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_TEST_SHELL_HPP #define METASHELL_TEST_SHELL_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include @@ -17,6 +28,8 @@ class test_shell : public metashell::shell virtual void display_info(const std::string& s_) const; virtual void display_error(const std::string& s_) const; + virtual unsigned int width() const; + const std::string& output() const; const std::string& info() const; const std::string& error() const; diff --git a/test/test_text_position.cpp b/test/test_text_position.cpp index 322c6e5dae..eb58afcb97 100644 --- a/test/test_text_position.cpp +++ b/test/test_text_position.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include diff --git a/test/util.cpp b/test/util.cpp index a489af6ad9..d152e37e20 100644 --- a/test/util.cpp +++ b/test/util.cpp @@ -1,7 +1,18 @@ -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include "util.hpp" #include "test_shell.hpp" diff --git a/test/util.hpp b/test/util.hpp index 214e40c31b..aba975fd5f 100644 --- a/test/util.hpp +++ b/test/util.hpp @@ -1,10 +1,21 @@ #ifndef METASHELL_TEST_UTIL_HPP #define METASHELL_TEST_UTIL_HPP -// Copyright Abel Sinkovics (abel@sinkovics.hu) 2013. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) +// Metashell - Interactive C++ template metaprogramming shell +// Copyright (C) 2013, Abel Sinkovics (abel@sinkovics.hu) +// +// 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 . #include