diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 419659b..58c2c5a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -4,7 +4,7 @@ on: schedule: - cron: "0 16 * * *" push: - branches: [ master ] + branches: [ master,develop ] pull_request: branches: [ master ] workflow_dispatch: @@ -16,9 +16,9 @@ jobs: - uses: actions/checkout@v2 - name: make run: | - make + make -j4 cd module - make all + make all -j4 cd .. make test tar -czf nasal-mac-nightly.tgz . @@ -42,9 +42,9 @@ jobs: - uses: actions/checkout@v2 - name: make run: | - make + make -j4 cd module - make all + make all -j4 cd .. make test touch nasal-linux-x86_64-nightly.tgz diff --git a/CMakeLists.txt b/CMakeLists.txt index 278dcd9..38a182f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,37 +4,44 @@ project(nasal VERSION 10.1) message("CMAKE_HOST_SYSTEM_NAME: ${CMAKE_HOST_SYSTEM_NAME}") -# -std=c++14 -Wshadow -Wall -set(CMAKE_CXX_STANDARD 14) +# -std=c++17 -Wshadow -Wall +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_FLAGS_RELEASE_INIT "-Wshadow -Wall") +add_compile_options(-fPIC) + # generate release executables set(CMAKE_BUILD_TYPE "Release") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/module) -add_library(fib SHARED ${CMAKE_SOURCE_DIR}/module/fib.cpp) -target_include_directories(fib PRIVATE ${CMAKE_SOURCE_DIR}) +# build nasal used object +set(NASAL_OBJECT_SOURCE_FILE + ${CMAKE_SOURCE_DIR}/src/ast_dumper.cpp + ${CMAKE_SOURCE_DIR}/src/ast_visitor.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_ast.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_builtin.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_codegen.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_dbg.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_err.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_gc.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_import.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_lexer.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_misc.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_opcode.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_parse.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_vm.cpp + ${CMAKE_SOURCE_DIR}/src/optimizer.cpp + ${CMAKE_SOURCE_DIR}/src/symbol_finder.cpp) +add_library(nasal-object STATIC ${NASAL_OBJECT_SOURCE_FILE}) +target_include_directories(nasal-object PRIVATE ${CMAKE_SOURCE_DIR}/src) -add_library(key SHARED ${CMAKE_SOURCE_DIR}/module/keyboard.cpp) -target_include_directories(key PRIVATE ${CMAKE_SOURCE_DIR}) - -add_library(mat SHARED ${CMAKE_SOURCE_DIR}/module/matrix.cpp) -target_include_directories(mat PRIVATE ${CMAKE_SOURCE_DIR}) - -add_library(nasock SHARED ${CMAKE_SOURCE_DIR}/module/nasocket.cpp) -target_include_directories(nasock PRIVATE ${CMAKE_SOURCE_DIR}) - -add_executable(nasal main.cpp) - -if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") - message("Ignore linking dl lib") -else() +# build nasal +add_executable(nasal ${CMAKE_SOURCE_DIR}/src/main.cpp) +target_link_libraries(nasal nasal-object) +if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") target_link_libraries(nasal dl) endif() - -target_include_directories(nasal PRIVATE ${CMAKE_SOURCE_DIR}) - +target_include_directories(nasal PRIVATE ${CMAKE_SOURCE_DIR}/src) if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") add_custom_command( TARGET nasal POST_BUILD @@ -42,4 +49,28 @@ if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") ${CMAKE_SOURCE_DIR}/build/nasal ${CMAKE_SOURCE_DIR}/nasal ) -endif() \ No newline at end of file +endif() + +# build module +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/module) + +set(MODULE_USED_OBJECT_SOURCE_FILE + ${CMAKE_SOURCE_DIR}/src/nasal_misc.cpp + ${CMAKE_SOURCE_DIR}/src/nasal_gc.cpp) +add_library(module-used-object STATIC ${MODULE_USED_OBJECT_SOURCE_FILE}) + +add_library(fib SHARED ${CMAKE_SOURCE_DIR}/module/fib.cpp) +target_include_directories(fib PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(fib module-used-object) + +add_library(key SHARED ${CMAKE_SOURCE_DIR}/module/keyboard.cpp) +target_include_directories(key PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(key module-used-object) + +add_library(mat SHARED ${CMAKE_SOURCE_DIR}/module/matrix.cpp) +target_include_directories(mat PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(mat module-used-object) + +add_library(nasock SHARED ${CMAKE_SOURCE_DIR}/module/nasocket.cpp) +target_include_directories(nasock PRIVATE ${CMAKE_SOURCE_DIR}/src) +target_link_libraries(nasock module-used-object) \ No newline at end of file diff --git a/LICENSE b/LICENSE index 36c4b17..ecbc059 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,339 @@ -MIT License + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 -Copyright (c) 2019-2023 ValKmjolnir + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. \ No newline at end of file diff --git a/README.md b/README.md index df4a46f..153fc09 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ ![GitHub code size](https://img.shields.io/github/languages/code-size/ValKmjolnir/Nasal-Interpreter?style=flat-square&logo=github) ![GitHub release(latest by date)](https://img.shields.io/github/v/release/ValKmjolnir/Nasal-Interpreter?style=flat-square&logo=github) -![in dev](https://img.shields.io/badge/dev-v10.1-blue?style=flat-square&logo=github) -[![license](https://img.shields.io/badge/license-MIT-green?style=flat-square&logo=github)](./LICENSE) +![in dev](https://img.shields.io/badge/dev-v11.0-blue?style=flat-square&logo=github) +[![license](https://img.shields.io/badge/license-GPLv2-green?style=flat-square&logo=github)](./LICENSE) > This document is also available in: [__中文__](./doc/README_zh.md) | [__English__](./README.md) @@ -32,11 +32,11 @@ __Contact us if having great ideas to share!__ is an ECMAscript-like language used in [FlightGear](https://www.flightgear.org/). The designer is [Andy Ross](https://github.com/andyross). -This interpreter is totally rewritten by [ValKmjolnir](https://github.com/ValKmjolnir) using `C++`(`-std=c++14`) +This interpreter is totally rewritten by [ValKmjolnir](https://github.com/ValKmjolnir) using `C++`(`-std=c++17`) without reusing the code in [Andy Ross's nasal interpreter](https://github.com/andyross/nasal). But we really appreciate that Andy created this amazing programming language. -This project uses __MIT license__ (2021/5/4). +This project uses __MIT license__ (2019/7~2021/5/4~2023/5), __GPL v2 license__ (since 2023/6). ### __Why writing this nasal interpreter?__ @@ -59,7 +59,6 @@ the interpreter a useful tool in your own projects. ![windows](https://img.shields.io/badge/Microsoft-Windows-green?style=flat-square&logo=windows) ![macOS](https://img.shields.io/badge/Apple%20Inc.-MacOS-green?style=flat-square&logo=apple) ![linux](https://img.shields.io/badge/GNU-Linux-green?style=flat-square&logo=GNU) - ![g++](https://img.shields.io/badge/GNU-g++-A42E2B?style=flat-square&logo=GNU) ![clang++](https://img.shields.io/badge/LLVM-clang++-262D3A?style=flat-square&logo=LLVM) ![vs](https://img.shields.io/badge/Visual_Studio-MSVC-5C2D91?style=flat-square&logo=visualstudio) @@ -68,19 +67,17 @@ Better download the latest update source of the interpreter and build it! It's q __CAUTION__: If want to use the release zip/tar.gz file to build the interpreter, please read the [__Release Notes__](./doc/dev.md#release-notes) to make sure this release file has no fatal bugs. -Use g++(`MinGW-w64`) or MSVC(`Visual Studio`) on `Windows` . - -Use g++/clang++ on `Linux/macOS/Unix` platform (we suggest `clang`). - -On `Windows (MinGW-w64)`: +### __`Windows (MinGW-w64)`__ Make sure your MinGW thread model is `posix thread model`, otherwise it may not have the thread library. > mingw32-make nasal.exe -You could create project in `Visual Studio` by this way: [__Click__](./doc/vs.md). +### __`Windows (Visual Studio)`__ -On `Linux/macOS/Unix`: +This project gives a [__CMakelists.txt__](./CMakeLists.txt) for you to create project in `Visual Studio`. + +### __`Linux/macOS/Unix`__ > make nasal diff --git a/doc/README_zh.md b/doc/README_zh.md index 04a4277..aef8878 100644 --- a/doc/README_zh.md +++ b/doc/README_zh.md @@ -4,8 +4,8 @@ ![GitHub code size](https://img.shields.io/github/languages/code-size/ValKmjolnir/Nasal-Interpreter?style=flat-square&logo=github) ![GitHub release(latest by date)](https://img.shields.io/github/v/release/ValKmjolnir/Nasal-Interpreter?style=flat-square&logo=github) -![in dev](https://img.shields.io/badge/dev-v10.1-blue?style=flat-square&logo=github) -[![license](https://img.shields.io/badge/license-MIT-green?style=flat-square&logo=github)](../LICENSE) +![in dev](https://img.shields.io/badge/dev-v11.0-blue?style=flat-square&logo=github) +[![license](https://img.shields.io/badge/license-GPLv2-green?style=flat-square&logo=github)](../LICENSE) > 这篇文档包含多语言版本: [__中文__](../doc/README_zh.md) | [__English__](../README.md) @@ -34,7 +34,7 @@ __如果有好的意见或建议，欢迎联系我们!__ 该解释器项目由 [ValKmjolnir](https://github.com/ValKmjolnir) 完全使用 `C++`(`-std=c++14`)重新实现，没有复用 [Andy Ross的nasal解释器](https://github.com/andyross/nasal) 中的任何一行代码。尽管没有参考任何代码，我们依然非常感谢Andy为我们带来了这样一个神奇且简洁的编程语言。 -该项目已使用 __MIT__ 协议开源 (2021/5/4)。 +该项目使用 __MIT__ 协议开源 (2019/7~2021/5/4~2023/5)，从 2023/6 开始使用 __GPL v2__ 协议。 ### __我们为什么想要重新写一个nasal解释器?__ @@ -49,29 +49,26 @@ __如果有好的意见或建议，欢迎联系我们!__ ![windows](https://img.shields.io/badge/Microsoft-Windows-green?style=flat-square&logo=windows) ![macOS](https://img.shields.io/badge/Apple%20Inc.-MacOS-green?style=flat-square&logo=apple) ![linux](https://img.shields.io/badge/GNU-Linux-green?style=flat-square&logo=GNU) - ![g++](https://img.shields.io/badge/GNU-g++-A42E2B?style=flat-square&logo=GNU) ![clang++](https://img.shields.io/badge/LLVM-clang++-262D3A?style=flat-square&logo=LLVM) ![vs](https://img.shields.io/badge/Visual_Studio-MSVC-5C2D91?style=flat-square&logo=visualstudio) -我们推荐你下载最新更新的代码包来直接编译，这个项目非常小巧,没有使用任何第三方库，因此编译起来非常轻松， +我们推荐你下载最新代码包编译，这个项目非常小巧,没有使用任何第三方库，因此编译起来非常轻松， 你只需要这两样东西: C++ 编译器以及make程序。 __注意__: 如果你想直接下载发行版提供的zip/tar.gz压缩包来构建这个解释器，在下载之前请阅读[__发行日志__](../doc/dev_zh.md#发行日志)以保证这个发行版的文件中不包含非常严重的bug。 -`Windows` 用户通过 g++(`MinGW-w64`) 或者使用 MSVC(`Visual Studio`) 来进行编译。 - -`Linux/macOS/Unix` 用户可以使用 g++ 或者 clang++ 来进行编译 (建议您使用 `clang`)。 - -`Windows` 平台(`MinGW-w64`): +### __`Windows` 平台(`MinGW-w64`)__ 一定要确保您的 MinGW thread model 是 `posix thread model`, 否则可能存在没有 thread 库的问题。 > mingw32-make nasal.exe -你也可以在`Visual Studio`中用这种方式来创建项目：[__点击跳转__](../doc/vs.md)。 +### __`Windows` 平台(`Vistual Studio`)__ -`Linux/macOS/Unix` 平台: +项目提供了 [__CMakeLists.txt__](../CMakeLists.txt) 用于在`Visual Studio`中用这种方式来创建项目。 + +### __`Linux/macOS/Unix` 平台__ > make nasal diff --git a/doc/nasal-http-test-web.html b/doc/nasal-http-test-web.html index 52d04bb..a4f8307 100644 --- a/doc/nasal-http-test-web.html +++ b/doc/nasal-http-test-web.html @@ -37,7 +37,7 @@ -
+

 Introduction | 介绍

@@ -51,12 +51,11 @@

The interpreter is totally rewritten by ValKmjolnir using C++(-std=c++11) without reusing the code in Andy Ross's nasal interpreter. But we really appreciate that Andy created this amazing programming language and his interpreter project. - Now this project uses MIT license (2021/5/4). Edit it if you want, use this project to learn or create more interesting things(But don't forget me XD).
+ Now this project uses GPL-2.0 license (2021/5/4).

这个解释器是由ValKmjolnir用C++11编写的，完全没有复用Andy Ross版解释器的代码。但是我们仍然非常感谢Andy为我们带来了这么一款有趣的编程语言。 - 现在这个项目使用MIT协议开源 (2021/5/4)。 - 如果你有需求，可以自行修改，用这个解释器项目来学习或者创造更有意思的东西吧！(不过别忘了在项目协议中留下原作者名字哦) + 现在这个项目使用GPL-2.0协议开源。

 Benchmark | 执行效率

diff --git a/doc/vs.md b/doc/vs.md deleted file mode 100644 index afcf8b3..0000000 --- a/doc/vs.md +++ /dev/null @@ -1,43 +0,0 @@ -# Create VS project | 创建 VS 工程 - -## First | 首先 - -We give a __CMakeLists.txt__ for you to create new VS project from it. - -我们为你提供了 __CMakeLists.txt__ 用于创建新的 VS 工程。 - -If you are using this way, you will __not need__ to continue reading. - -如果你使用的是这种方式，下面的内容你就 __不需要__ 再读了。 - -Creating VS project from a CMake file is the __simplest__ way. - -从 CMake 文件创建 VS 工程是 __最简单__ 的方式。 - -## How to Create VS project - -Make sure you are using VS 2022. You may not get the dynamic libraries by using this way to compile. - -1. Get code from this repo using `git`. - -2. In Visual Studio, click `File`->`New`->`Project From Existing Code...`. - -3. Select `Visual C++`->`Next`->choose `project file location`->write the `project name` at ease->`Finish`. - -4. Remove cpp files in `module` to avoid compilation problems.(they should be compiled to dynamic libraries) - -5. Click `Source Files` in `Search Solution Explorer` at left, right click `main.cpp`, compile. - -## 如何创建VS工程 - -确保你使用的是 VS 2022。这个方式可能无法生成一些动态库。 - -1. 用 `git` 从这个仓库获取代码。 - -2. 在VS的界面，点击文件(F)->新建(N)->从现有代码创建项目(E)。 - -3. 选择创建 `Visual C++` 项目->下一步->项目文件位置选择你下载的代码存放的文件夹->填项目名称，随便写->完成。 - -4. 从项目中去掉 `module` 里的cpp文件，以防止编译错误。(那些本应该编译到动态库) - -5. 点开左侧解决方案资源管理器中的 `Source Files`，右键点击 `main.cpp`，编译。 diff --git a/main.cpp b/main.cpp deleted file mode 100644 index aef7268..0000000 --- a/main.cpp +++ /dev/null @@ -1,176 +0,0 @@ -#include "nasal.h" -#include "nasal_err.h" -#include "nasal_lexer.h" -#include "nasal_ast.h" -#include "nasal_parse.h" -#include "nasal_import.h" -#include "nasal_opt.h" -#include "nasal_gc.h" -#include "nasal_builtin.h" -#include "nasal_codegen.h" -#include "nasal_vm.h" -#include "nasal_dbg.h" - -#include - -const u32 VM_AST =0x01; -const u32 VM_CODE =0x02; -const u32 VM_TIME =0x04; -const u32 VM_EXEC =0x08; -const u32 VM_DETAIL=0x10; -const u32 VM_DEBUG =0x20; - -std::ostream& help(std::ostream& out) { - out - <<" ,--#-,\n" - <<"<3 / \\____\\ <3\n" - <<" |_|__A_|\n" -#ifdef _WIN32 - <<"use command to use unicode.\n" -#endif - <<"\nnasal