Pragma, libluacomp

.gitignore

@@ -1,3 +1,4 @@
 luacomp.lua
 luacomp
 build/*
+*.out

LICENSE

@@ -1,201 +1,373 @@
-                                 Apache License
+Mozilla Public License Version 2.0
-                           Version 2.0, January 2004
+==================================
-                        http://www.apache.org/licenses/
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+1. Definitions
+--------------
 
-   1. Definitions.
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
 
-      "License" shall mean the terms and conditions for use, reproduction,
+1.2. "Contributor Version"
-      and distribution as defined by Sections 1 through 9 of this document.
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
+1.3. "Contribution"
-      the copyright owner that is granting the License.
+    means Covered Software of a particular Contributor.
 
-      "Legal Entity" shall mean the union of the acting entity and all
+1.4. "Covered Software"
-      other entities that control, are controlled by, or are under common
+    means Source Code Form to which the initial Contributor has attached
-      control with that entity. For the purposes of this definition,
+    the notice in Exhibit A, the Executable Form of such Source Code
-      "control" means (i) the power, direct or indirect, to cause the
+    Form, and Modifications of such Source Code Form, in each case
-      direction or management of such entity, whether by contract or
+    including portions thereof.
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
+1.5. "Incompatible With Secondary Licenses"
-      exercising permissions granted by this License.
+    means
 
-      "Source" form shall mean the preferred form for making modifications,
+    (a) that the initial Contributor has attached the notice described
-      including but not limited to software source code, documentation
+        in Exhibit B to the Covered Software; or
-      source, and configuration files.
 
-      "Object" form shall mean any form resulting from mechanical
+    (b) that the Covered Software was made available under the terms of
-      transformation or translation of a Source form, including but
+        version 1.1 or earlier of the License, but not also under the
-      not limited to compiled object code, generated documentation,
+        terms of a Secondary License.
-      and conversions to other media types.
 
-      "Work" shall mean the work of authorship, whether in Source or
+1.6. "Executable Form"
-      Object form, made available under the License, as indicated by a
+    means any form of the work other than Source Code Form.
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
 
-      "Derivative Works" shall mean any work, whether in Source or Object
+1.7. "Larger Work"
-      form, that is based on (or derived from) the Work and for which the
+    means a work that combines Covered Software with other material, in 
-      editorial revisions, annotations, elaborations, or other modifications
+    a separate file or files, that is not Covered Software.
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
 
-      "Contribution" shall mean any work of authorship, including
+1.8. "License"
-      the original version of the Work and any modifications or additions
+    means this document.
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
+1.9. "Licensable"
-      on behalf of whom a Contribution has been received by Licensor and
+    means having the right to grant, to the maximum extent possible,
-      subsequently incorporated within the Work.
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
+1.10. "Modifications"
-      this License, each Contributor hereby grants to You a perpetual,
+    means any of the following:
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
+    (a) any file in Source Code Form that results from an addition to,
-      this License, each Contributor hereby grants to You a perpetual,
+        deletion from, or modification of the contents of Covered
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+        Software; or
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
 
-   4. Redistribution. You may reproduce and distribute copies of the
+    (b) any new file in Source Code Form that contains any Covered
-      Work or Derivative Works thereof in any medium, with or without
+        Software.
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
 
-      (a) You must give any other recipients of the Work or
+1.11. "Patent Claims" of a Contributor
-          Derivative Works a copy of this License; and
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
 
-      (b) You must cause any modified files to carry prominent notices
+1.12. "Secondary License"
-          stating that You changed the files; and
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
 
-      (c) You must retain, in the Source form of any Derivative Works
+1.13. "Source Code Form"
-          that You distribute, all copyright, patent, trademark, and
+    means the form of the work preferred for making modifications.
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
 
-      (d) If the Work includes a "NOTICE" text file as part of its
+1.14. "You" (or "Your")
-          distribution, then any Derivative Works that You distribute must
+    means an individual or a legal entity exercising rights under this
-          include a readable copy of the attribution notices contained
+    License. For legal entities, "You" includes any entity that
-          within such NOTICE file, excluding those notices that do not
+    controls, is controlled by, or is under common control with You. For
-          pertain to any part of the Derivative Works, in at least one
+    purposes of this definition, "control" means (a) the power, direct
-          of the following places: within a NOTICE text file distributed
+    or indirect, to cause the direction or management of such entity,
-          as part of the Derivative Works; within the Source form or
+    whether by contract or otherwise, or (b) ownership of more than
-          documentation, if provided along with the Derivative Works; or,
+    fifty percent (50%) of the outstanding shares or beneficial
-          within a display generated by the Derivative Works, if and
+    ownership of such entity.
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
 
-      You may add Your own copyright statement to Your modifications and
+2. License Grants and Conditions
-      may provide additional or different license terms and conditions
+--------------------------------
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
+2.1. Grants
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
 
-   6. Trademarks. This License does not grant permission to use the trade
+Each Contributor hereby grants You a world-wide, royalty-free,
-      names, trademarks, service marks, or product names of the Licensor,
+non-exclusive license:
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
+(a) under intellectual property rights (other than patent or trademark)
-      agreed to in writing, Licensor provides the Work (and each
+    Licensable by such Contributor to use, reproduce, make available,
-      Contributor provides its Contributions) on an "AS IS" BASIS,
+    modify, display, perform, distribute, and otherwise exploit its
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    Contributions, either on an unmodified basis, with Modifications, or
-      implied, including, without limitation, any warranties or conditions
+    as part of a Larger Work; and
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
 
-   8. Limitation of Liability. In no event and under no legal theory,
+(b) under Patent Claims of such Contributor to make, use, sell, offer
-      whether in tort (including negligence), contract, or otherwise,
+    for sale, have made, import, and otherwise transfer either its
-      unless required by applicable law (such as deliberate and grossly
+    Contributions or its Contributor Version.
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
+2.2. Effective Date
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
 
-   APPENDIX: How to apply the Apache License to your work.
+2.3. Limitations on Grant Scope
 
-      To apply the Apache License to your work, attach the following
+The licenses granted in this Section 2 are the only rights granted under
-      boilerplate notice, with the fields enclosed by brackets "[]"
+this License. No additional rights or licenses will be implied from the
-      replaced with your own identifying information. (Don't include
+distribution or licensing of Covered Software under this License.
-      the brackets!)  The text should be enclosed in the appropriate
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
-      comment syntax for the file format. We also recommend that a
+Contributor:
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
 
-   Copyright 2019 Adorable-Catgirl
+(a) for any code that a Contributor has removed from Covered Software;
+    or
 
-   Licensed under the Apache License, Version 2.0 (the "License");
+(b) for infringements caused by: (i) Your and any other third party's
-   you may not use this file except in compliance with the License.
+    modifications of Covered Software, or (ii) the combination of its
-   You may obtain a copy of the License at
+    Contributions with other software (except as part of its Contributor
+    Version); or
 
-       http://www.apache.org/licenses/LICENSE-2.0
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
 
-   Unless required by applicable law or agreed to in writing, software
+This License does not grant any rights in the trademarks, service marks,
-   distributed under the License is distributed on an "AS IS" BASIS,
+or logos of any Contributor (except as may be necessary to comply with
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+the notice requirements in Section 3.4).
-   See the License for the specific language governing permissions and
+
-   limitations under the License.
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

make_release.lua

@@ -10,9 +10,11 @@ os.execute("rm -rf build")
 os.execute("mkdir build")
 for i=1, #luaexec do
 	os.execute("luacomp -xlua"..luaexec[i].." -mluamin -O build/luacomp-"..luaexec[i].." src/init.lua")
-	os.execute("luacomp -xlua"..luaexec[i].." -mnone -O build/luacomp-static-"..luaexec[i].." src/staticinit.lua")
+	--os.execute("luacomp -xlua"..luaexec[i].." -mnone -O build/luacomp-static-"..luaexec[i].." src/staticinit.lua")
 	os.execute("chmod +x build/luacomp-"..luaexec[i])
-	os.execute("chmod +x build/luacomp-static-"..luaexec[i])
+	--os.execute("chmod +x build/luacomp-static-"..luaexec[i])
 end
 
+os.execute("LIBLUACOMP=y luacomp -O build/libluacomp.lua src/libluacomp.lua")
+
 os.execute("cp -v build/luacomp-".._VERSION:sub(5).." luacomp")

src/application.lua

@@ -1,21 +1,10 @@
-local function dprint(...)
+-- This Source Code Form is subject to the terms of the Mozilla Public
-	local args = {...}
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
-	for i=1, #args do
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
-		args[i] = tostring(args[i])
-	end
-	if (VERBOSE) then
-		io.stderr:write("DEBUG\t"..table.concat(args,"\t"),"\n")
-	end
-end
 
---#include "src/shell_var.lua"
+--#include "src/libluacomp.lua"
---#include "src/luacomp_vars.lua"
---#include "src/ast.lua"
---#include "src/generator.lua"
---#include "src/directive_provider.lua"
---#include "src/cfg/minifier_providers.lua"
 
-local parser = argparse(arg[0], "LuaComp v"..LUACOMP_VERSION.."\nA preprocessor+postprocessor written in Lua.")
+local parser = argparse(arg[0]:match("[^/]+$"), "LuaComp v"..LUACOMP_VERSION.."\nA preprocessor+postprocessor written in Lua.")
 parser:argument("input", "Input file (- for STDIN)")
 parser:option("-O --output", "Output file. (- for STDOUT)", "-")
 parser:option("-m --minifier", "Sets the postprocessor", "none")
@@ -52,33 +41,29 @@ local file = args.input
 _sv("LUACOMP_MINIFIER", args.minifier)
 local f
 if (file ~= "-") then
+	local sr, er = stat.stat(file)
+	if not sr then lc_error("luacomp", er) end
 	f = io.open(file, "r")
-	if not f then
-		io.stderr:write("ERROR: File `"..file.."' does not exist!\n")
-		os.exit(1)
-	end
 else
 	f = io.stdin
 end
-dprint("Generating AST...")
+local ocode = luacomp.process_file(f, (file == "-") and "stdin" or file, args.generator_code)
-local ast = mkast(f, file)
-ast.file = file
-dprint("Generating code...")
-local ocode = generate(ast, args.generator_code)
 
 local minifier = providers[args.minifier]
 dprint("Minifier: "..args.minifier, minifier)
 if not minifier then
-	io.stderr:write("ERROR: Postprocessor `"..args.minifier.."' not found!\n")
+	lc_error("luacomp", "Postprocessor "..args.minifier.." not found!")
-	os.exit(1)
+	--io.stderr:write("ERROR: Postprocessor `"..args.minifier.."' not found!\n")
+	--os.exit(1)
 end
 dprint("Running...")
 local rcode, err = minifier(ocode)
 
 if (not rcode) then
-	io.stderr:write("ERROR: Error for postprocessor `"..args.minifier.."': \n")
+	--io.stderr:write("ERROR: Error for postprocessor `"..args.minifier.."': \n")
-	io.stderr:write(err)
+	--io.stderr:write(err)
-	os.exit(1)
+	--os.exit(1)
+	lc_error(args.minifier, "Postprocessor error:\n"..err)
 end
 
 local of
@@ -96,4 +81,4 @@ if (args.executable) then
 end
 of:write(rcode)
 of:close()
-f:close()
+--f:close()

src/ast.lua

@@ -1,20 +1,9 @@
 --[[
 	ast.lua - Generates a structure for use in preprocessing.
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 local function nextc(f, c)
 	c = c or 1

src/ast2.lua

@@ -0,0 +1,456 @@
+-- AST Generator v2: Belkan Boogaloo
+-- Hopefully faster than v1
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+local ast = {}
+do
+	local ws = "\t "
+
+	function ast.str_to_stream(str, file)
+		local s = {
+			str = str,
+			pos = 1,
+			file = file or "(unknown)"
+		}
+		function s:next(c)
+			c = c or 1
+			--dprint(c)
+			local d = self.str:sub(self.pos, self.pos+c-1)
+			self.pos = self.pos + c
+			return d
+		end
+
+		function s:peek(c)
+			c = c or 1
+			if (c < 0) then
+				return self.str:sub(self.pos+c, self.pos-1)
+			end
+			return self.str:sub(self.pos, self.pos+c-1)
+		end
+
+		function s:rewind(c)
+			c = c or 1
+			self.pos = self.pos - c
+			return self.pos
+		end
+
+		function s:skip(c)
+			c = c or 1
+			self.pos = self.pos + c
+			return self.pos
+		end
+
+		function s:set(c)
+			--dprint(c)
+			self.pos = c or self.pos
+			return self.pos
+		end
+
+		function s:tell()
+			return self.pos
+		end
+
+		function s:size()
+			return #self.str
+		end
+
+		function s:next_instance(pat, raw)
+			local st, en = self.str:find(pat, self.pos, raw)
+			if not st then return nil, "not found" end
+			self.pos = en+1
+			return self.str:sub(st, en)
+		end
+
+		function s:get_yx() -- it *is* yx
+			local pos = 0
+			local line = 1
+			while pos < self.pos do
+				local newpos = self.str:find("\n", pos+1)
+				if not newpos then return line+1, 0 end
+				if newpos > self.pos then
+					return line, self.pos-pos
+				end
+				line = line + 1
+				pos = newpos
+			end
+			return line, 1
+		end
+
+		return s
+	end
+
+	local esct = {
+		["t"] = "\t",
+		["n"] = "\n",
+		["r"] = "\r",
+		--["\\"] = "\\\\"
+	}
+
+	function ast.parser_error(str, err)
+		local y, x = str:get_yx()
+		--print(y, x)
+		lc_error("@[{_GENERATOR.fname}]", string.format("%s(%d:%d): %s\n", str.file, y or 0, x or 0, err))
+	end
+
+	function ast.unescape(escaped_string)
+		local i = 1
+		local out_string = ""
+		while i <= #escaped_string do
+			local c = escaped_string:sub(i,i)
+			if (c == "\\") then
+				i = i + 1
+				local nc = escaped_string:sub(i,i)
+				if esct[nc] then
+					out_string = out_string .. esct[nc]
+				else
+					out_string = out_string .. nc
+				end
+			else
+				out_string = out_string .. c
+			end
+			i = i + 1
+		end
+		return out_string
+	end
+
+	function ast.remove_escapes(escaped_string)
+		local i = 1
+		local out_string = ""
+		while i <= #escaped_string do
+			local c = escaped_string:sub(i,i)
+			--lc_warning(c, tostring(i).." "..#escaped_string)
+			if (c == "\\") then
+				i = i + 1
+			else
+				out_string = out_string .. c
+			end
+			i = i + 1
+		end
+		--lc_warning("debug", out_string)
+		return out_string
+	end
+
+	function ast.back_escape_count(str, start)
+		local i=2
+		while str:peek(-i):sub(1,1) == "\\" do
+			i = i + 1
+			if (str:tell()-i < start) then
+				ast.error(str, "internal error")
+			end
+		end
+		--lc_warning(tostring(i), #str:peek(1-i).." "..str:peek(1-i))
+		return str:peek(1-i)
+	end
+
+	function ast.parse_quote(str)
+		local spos = str:tell()
+		while true do
+			if not str:next_instance("\'") then
+				ast.parser_error(str, "unclosed string")
+			end
+			local rpos = str:tell()
+			str:set(spos)
+			if str:next_instance("\n") then
+				if rpos > str:tell() then
+					ast.parser_error(str, "unclosed string")
+				end
+			end
+			str:set(rpos)
+			if str:peek(-1) == "\\" then
+				local parsed = ast.remove_escapes(ast.back_escape_count(str, spos))
+				if parsed:sub(#parsed) == "\'" then
+					goto found_end
+				end
+			else
+				goto found_end
+			end
+		end
+		::found_end::
+		local epos = str:tell()
+		local amt = epos-spos-1
+		str:set(spos)
+		local esc = str:next(amt)
+		str:skip(1)
+		return ast.unescape(esc)
+	end
+
+	function ast.parse_dblquote(str)
+		local spos = str:tell()
+		while true do
+			if not str:next_instance("\"") then
+				ast.parser_error(str, "unclosed string")
+			end
+			local rpos = str:tell()
+			str:set(spos)
+			if str:next_instance("\n") then
+				if rpos > str:tell() then
+					ast.parser_error(str, "unclosed string")
+				end
+			end
+			str:set(rpos)
+			--lc_warning(str:peek(-2), "test")
+			if str:peek(-2):sub(1,1) == "\\" then
+				local parsed = ast.remove_escapes(ast.back_escape_count(str, spos))
+				if parsed:sub(#parsed) == "\"" then
+					goto found_end
+				end
+			else
+				goto found_end
+			end
+			--str:set(rpos)
+		end
+		::found_end::
+		local epos = str:tell()
+		local amt = epos-spos-1
+		str:set(spos)
+		--dprint(spos, amt)
+		local esc = str:next(amt)
+		--print(esc)
+		str:skip(1)
+		return ast.unescape(esc)
+	end
+
+	function ast.parse_hex(str)
+		local hex = str:next_instance("%x+")
+		if not hex then
+			ast.parser_error(str, "internal error")
+		end
+		return tonumber(hex, 16)
+	end
+
+	function ast.parse_number(str)
+		local num = str:next_instance("%d+")
+		if not num then
+			ast.parser_error(str, "internal error")
+		end
+		return tonumber(num, 10)
+	end
+
+	function ast.parse_envvar(str)
+		local name = str:next_instance("[^)]+")
+		if not name then
+			ast.parser_error(str, "unclosed shell var")
+		end
+		str:skip(1)
+		return name
+	end
+
+	-- [{...}]
+	function ast.parse_span(str)
+		local spos = str:tell()
+		if not str:next_instance("}]", true) then
+			ast.parser_error(str, "unclosed block")
+		else
+			local rpos = str:tell()
+			str:set(spos)
+			if str:next_instance("\n") then
+				if str:tell() < rpos then
+					str:set(spos)
+					ast.parser_error(str, "unclosed span")
+				end
+			end
+			str:set(rpos)
+		end
+		local epos = str:tell()
+		str:set(spos)
+		local data = str:next(epos-spos-2)
+		str:skip(2)
+		return data
+	end
+
+	-- [[...]]
+	function ast.parse_block(str)
+		local spos = str:tell()
+		if not str:next_instance("]]") then
+			ast.parser_error(str, "unclosed block")
+		end
+		local epos = str:tell()
+		str:set(spos)
+		local data = str:next(epos-spos-2)
+		str:skip(2)
+		return data
+	end
+
+	function ast.parse_directive(str) -- And now we start getting more complex.
+		local name = str:next_instance("[^ ]+")
+		local args = {}
+		while true do
+			local spos = str:tell()
+			if not str:next_instance(" +") then
+				break
+			else
+				local rpos = str:tell()
+				if str:next_instance("\n") then
+					if str:tell() < rpos then
+						str:set(spos)
+						break
+					end
+					str:set(rpos)
+				end
+			end
+			local apos = str:tell()
+			if str:peek(2) == "0x" then
+				str:skip(2)
+				local n = ast.parse_hex(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed hex")
+				end
+				table.insert(args, n)
+			elseif str:peek():find("%d") then
+				local n = ast.parse_number(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed number")
+				end
+				table.insert(args, n)
+			elseif str:peek() == "\"" then
+				str:skip(1)
+				local sval = ast.parse_dblquote(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed string")
+				end
+				table.insert(args, sval)
+			elseif str:peek() == "\'" then
+				str:skip(1)
+				local sval = ast.parse_quote(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed string")
+				end
+				table.insert(args, sval)
+			elseif str:peek(2) == "$".."(" then -- i have to avoid the funny
+				str:skip(2)
+				local sval = ast.parse_envvar(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed argument")
+				end
+				table.insert(args, {type="evar", val=sval})
+			elseif str:peek(3) == "@".."[{" then
+				str:skip(3)
+				local sval = ast.parse_span(str)
+				local c = str:peek()
+				if c ~= " " and c ~= "\n" and c ~= "" then
+					str:set(apos)
+					ast.parser_error(str, "malformed code block")
+				end
+				table.insert(args, {type="lua_span", val=sval})
+			elseif str:peek() == "\n" then
+				break
+			else
+				ast.parser_error(str, "unknown arg type")
+			end
+			if str:peek() == "\n" then
+				break
+			end
+		end
+		return {
+			type="directive",
+			name = name,
+			args = args
+		}
+	end
+
+	function ast.find_first(str, onfind, ...)
+		local t = table.pack(...)
+		local spos = str:tell()
+		local epos = math.huge
+		local ematch
+		for i=1, t.n do
+			str:set(spos)
+			local m = str:next_instance(t[i], true)
+			if m then
+				if str:tell() < epos then
+					if onfind then 
+						if not onfind(str, m) then goto continue end
+					end
+					epos = str:tell()
+					ematch = m
+				end
+			end
+			::continue::
+		end
+		if ematch then
+			str:set(epos)
+		else
+			str:set(spos)
+		end
+		return ematch
+	end
+
+	-- And now we parse
+	function ast.parse(str)
+		local cast = {}
+		while true do
+			local spos = str:tell()
+			--dprint("searching")
+			local match = ast.find_first(str, function(str, submatch)
+				if (submatch == "--#") then
+					--dprint("directive?")
+					local i=4
+					while true do
+						if str:peek(-i):sub(1,1) == "\n" or str:peek(-i):sub(1,1) == "" or str:tell() == 4 then
+							--dprint("found newline, we're cool")
+							return true
+						elseif not ws:find(str:peek(-i):sub(1,1)) then
+							--dprint("found non-whitespace character "..string.byte(str:peek(-i):sub(1,1))..str:peek(-i):sub(1,1))
+							return false
+						end
+						i = i + 1
+					end
+				end
+				return true
+			end, "--#", "$".."[[", "@".."[[", "$".."[{", "@".."[{", "$".."(") -- trust me, this was needed
+			--dprint("searched")
+			if not match then
+				--dprint("not found")
+				table.insert(cast, {type="content", val=str:next(str:size())})
+				break
+			end
+			local epos = str:tell()
+			local size = (epos-#match)-spos
+			if size > 0 then
+				str:set(spos)
+				local chunk = str:next(size)
+				if not chunk:match("^%s+$") then
+					table.insert(cast, {type="content", val=chunk})
+				end
+				str:skip(#match)
+			end
+			--dprint("match: "..match)
+			if match == "--#" then
+				--str:skip(3)
+				table.insert(cast, ast.parse_directive(str))
+			elseif match == "$".."[[" then
+				local blk = ast.parse_block(str)
+				table.insert(cast, {type="shell_block", val=blk})
+			elseif match == "@".."[[" then
+				local blk = ast.parse_block(str)
+				table.insert(cast, {type="lua_block", val=blk})
+			elseif match == "$".."[{" then
+				local span = ast.parse_span(str)
+				table.insert(cast, {type="shell_span", val=span})
+			elseif match == "@".."[{" then
+				local span = ast.parse_span(str)
+				--print(span)
+				table.insert(cast, {type="lua_span", val=span})
+			elseif match == "$".."(" then
+				local var = ast.parse_envvar(str)
+				table.insert(cast, {type="evar", val=var})
+			else
+				ast.parser_error(str, "what")
+			end
+			--dprint("Parsed")
+		end
+
+		return cast
+	end
+end

src/cfg/directive_providers.lua

@@ -1,3 +1,7 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local directive_paths = {
 	"/usr/share/luacomp/directives",
 	os.getenv("HOME").."/.local/share/luacomp/directives"

src/cfg/minifier_providers.lua

@@ -1,21 +1,11 @@
 --[[
 	cfg/minifier_providers.lua - Provides minifier providers.
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
 
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local postproc_paths = {
 	"/usr/share/luacomp/postproc",
 	os.getenv("HOME").."/.local/share/luacomp/postproc"
@@ -108,7 +98,7 @@ end
 
 setmetatable(providers, {__index=function(t, i)
 	for i=1, #postproc_paths do
-		if (os.execute("stat "..postproc_paths[i].."/"..i..".lua 1>/dev/null 2>&1")) then
+		if stat.stat(postproc_paths[i].."/"..i..".lua") then
 			providers[i] = loadfile(postproc_paths[i].."/"..i..".lua")()
 			return providers[i]
 		end
@@ -118,11 +108,10 @@ end})
 local function preload_providers()
 	--Do this in the best way possible
 	for i=1, #postproc_paths do
-		if (os.execute("stat "..postproc_paths[i].."1>/dev/null 2>&1")) then
+		if stat.stat(postproc_paths[i]) then
-			local fh = io.popen("ls "..postproc_paths[i], "r")
+			for ent in dirent.files(postproc_paths[i]) do
-			for line in fh:lines() do
+				if ent:match("%.lua$") then
-				if (line:match("%.lua$")) then
+					providers[ent:sub(1, #ent-4)] = loadfile(postproc_paths[i].."/"..ent)()
-					providers[line:sub(1, #line-4)] = loadfile(postproc_paths[i].."/"..line)()
 				end
 			end
 		end

src/directive_provider.lua

@@ -1,32 +1,23 @@
 --[[
 	directive_provider.lua - Provides preprocessor directives
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 --#include "src/cfg/directive_providers.lua"
 --#include "src/directives/define.lua"
 --#include "src/directives/include.lua"
 --#include "src/directives/loadmod.lua"
 --#include "src/directives/error.lua"
+--#include "src/directives/warning.lua"
+--#include "src/directives/pragma.lua"
 
 setmetatable(directives, {__index=function(t, i)
    for i=1, #directive_paths do
-      if (os.execute("stat "..directive_paths[i].."/"..i..".lua 1>/dev/null 2>&1")) then
+      if stat.stat(directive_paths[i].."/"..i..".lua") then
-         directives[i] = loadfile(directive_paths[i].."/"..i..".lua")()
+         providers[i] = loadfile(directive_paths[i].."/"..i..".lua")()
-         return directives[i]
+         return providers[i]
       end
    end
 end})
@@ -34,11 +25,10 @@ end})
 local function preload_directives()
    --Do this in the best way possible
    for i=1, #directive_paths do
-      if (os.execute("stat "..directive_paths[i].." 1>/dev/null 2>&1")) then
+      if stat.stat(directive_paths[i]) then
-         local fh = io.popen("ls "..directive_paths[i], "r")
+         for ent in dirent.files(directive_paths[i]) do
-         for line in fh:lines() do
+            if ent:match("%.lua$") then
-            if (line:match("%.lua$")) then
+               providers[ent:sub(1, #ent-4)] = loadfile(directive_paths[i].."/"..ent)()
-               directives[line:sub(1, #line-4)] = loadfile(directive_paths[i].."/"..line)()
             end
          end
       end

src/directives/define.lua

@@ -1,3 +1,7 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 function directives.define(env, evar, val)
 	svar.set(evar, val)
 	return true

src/directives/error.lua

@@ -1,3 +1,7 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 function directives.error(env, err)
 	return false, err
 end

src/directives/include.lua

@@ -1,11 +1,30 @@
-function directives.include(env, file)
+-- This Source Code Form is subject to the terms of the Mozilla Public
-	if (not os.execute("stat "..file..">/dev/null")) then
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
-		return false, "File `"..file.."' does not exist!"
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
-	end
+
-	local f = io.open(file, "r")
+function directives.include(env, file, asmod)
+	local sr, err = stat.stat(file)
+	if not sr then return false, err end
+	--[[local f = io.open(file, "r")
 	local fast = mkast(f, file)
 	fast.file = file
 	local code = generate(fast)
-	env.code = env.code .. code .. "\n"
+	env.code = env.code .. code .. "\n"]]
+	if asmod then env.code = env.code .. "local "..asmod.." = (function()\n" end
+	if env.pragmas.include_file_name == "y" then
+		env.code = env.code .. "-- " .. file .. "\n"
+	end
+	local code = luacomp.process_file(file, file) .. "\n"
+	if env.pragmas.prefix_local_file_numbers == "y" then
+		local newcode = ""
+		local i = 1
+		for match in code:gmatch("[^\n]*") do
+			newcode = newcode .. "--[["..i.."]] "..match.."\n"
+			i = i + 1
+		end
+		code = newcode
+	end
+	env.code = env.code .. code
+	if asmod then env.code = env.code .. "end)()\n" end
 	return true
 end

src/directives/loadmod.lua

@@ -1,11 +1,17 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local warned = false
 function directives.loadmod(env, mod)
 	if not warned then
-		io.stderr:write("Warning: loadmod is depreciated and unsafe. The API differs from luapreproc. Use the include paths!\n")
+		lc_warning("@[{_GENERATOR.fname}]", "loadmod is depreciated and unsafe. The API differs from luapreproc. Use the include paths!")
 		warned = true
 	end
-	if (not os.execute("stat "..file..">/dev/null")) then
+	--if (not os.execute("stat "..file..">/dev/null")) then
-		return false, "Module `"..file.."' does not exist!"
+	local sr, se = stat.stat(file)
+	if not sr then
+		return false, se
 	end
 	local modname, func = dofile(mod)
 	directives[modname] = func

src/directives/pragma.lua

@@ -0,0 +1,11 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+function directives.pragma(env, key, value)
+	if not env.pragmas[key] then
+		return nil, "unknown pragma "..key
+	end
+	env.pragmas[key] = value
+	return true
+end

src/directives/warning.lua

@@ -0,0 +1,8 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+function directives.warning(env, msg)
+	lc_warning(env.fname, msg)
+	return true
+end

src/generator.lua

@@ -1,21 +1,11 @@
 --[[
 	generator.lua - Generates the code.
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
 
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local function lua_escape(code)
    return code:gsub("\\", "\\\\"):gsub("\"", "\\\""):gsub("\n", "\\n")
 end

src/generator2.lua

@@ -0,0 +1,84 @@
+-- Generator v2: Borderless Edition
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+local generator = {}
+
+do
+	function generator.parse_ast(file, ast)
+		local gcode = ""
+		for i=1, #ast do
+			local leaf = ast[i]
+			if leaf.type == "directive" then
+				gcode = gcode .. string.format("call_directive(%q,", leaf.name)
+				local pargs = {}
+				for i=1, #leaf.args do
+					if type(leaf.args[i]) ~= "table" then
+						table.insert(pargs, string.format("%q", leaf.args[i]))
+					elseif leaf.args[i].type == "lua_span" then
+						table.insert(pargs, leaf.args[i].val)
+					elseif leaf.args[i].type == "evar" then
+						table.insert(pargs, string.format("svar.get(%q)", leaf.args[i].val))
+					end
+				end
+				gcode = gcode .. table.concat(pargs, ",")..")\n"
+			elseif leaf.type == "lua_block" then
+				gcode = gcode .. leaf.val .. "\n"
+			elseif leaf.type == "shell_block" then
+				gcode = gcode .. string.format("shell_write(%q)\n", leaf.val)
+			elseif leaf.type == "content" then
+				gcode = gcode .. string.format("write_out(%q)\n", leaf.val)
+			elseif leaf.type == "lua_span" then
+				gcode = gcode .. "write_out("..leaf.val..")\n"
+			elseif leaf.type == "shell_span" then
+				gcode = gcode .. string.format("write_out(svar.get(%q))\n", leaf.val)
+			elseif leaf.type == "evar" then
+				gcode = gcode .. string.format("write_out(string.format(\"%%q\", svar.get(%q)))\n", leaf.val)
+			end
+		end
+		return gcode
+	end
+
+	function generator.run_gcode(fname, gcode)
+		fname = fname or "(unknown)"
+		local env = {
+			code = "",
+			fname = fname,
+			pragmas = {
+				include_file_name = "n",
+				prefix_local_file_numbers = "n",
+				wrap_includes = "n"
+			}
+		}
+		local fenv = {}
+		for k, v in pairs(_G) do
+			fenv[k] = v
+		end
+		fenv._G = fenv
+		fenv._GENERATOR = env
+		function fenv.call_directive(dname, ...)
+			if not directives[dname] then lc_error("@[{_GENERATOR.fname}]", "invalid directive "..dname) end
+			local r, er = directives[dname](env, ...)
+			if not r then lc_error("directive "..dname, er) end
+		end
+
+		function fenv.write_out(code)
+			env.code = env.code .. code
+		end
+
+		function fenv.shell_write(cmd)
+			local tmpname = os.tmpname()
+			local f = io.open(tmpname, "w")
+			f:write(cmd)
+			f:close()
+			local h = io.popen(os.getenv("SHELL").." "..tmpname, "r")
+			env.code = env.code .. h:read("*a")
+			h:close()
+		end
+
+		assert(load(gcode, "="..fname, "t", fenv))()
+
+		return env.code
+	end
+end

src/init.lua

@@ -1,20 +1,11 @@
 --[[
 	init.lua - Main file of LuaComp
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
+
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local argparse = require("argparse")
 
 --#include "src/application.lua"

src/libluacomp.lua

@@ -0,0 +1,103 @@
+-- A LuaComp library
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+local function dprint(...)
+	local args = {...}
+	for i=1, #args do
+		args[i] = tostring(args[i])
+	end
+	if (false) then
+		io.stderr:write("DEBUG\t"..table.concat(args,"\t"),"\n")
+	end
+end
+
+local stat = require("posix.sys.stat")
+local dirent = require("posix.dirent")
+local unistd = require("posix.unistd")
+
+local function lc_error(name, msg)
+	if unistd.isatty(2) then
+		io.stderr:write(string.format("\27[90;1m(%s) \27[31merror: \27[22m%s\27[0m\n", name, msg))
+	else
+		io.stderr:write(string.format("(%s) %s\n", name, msg))
+	end
+	os.exit(1)
+end
+
+local function lc_warning(name, msg)
+	if unistd.isatty(2) then
+		io.stderr:write(string.format("\27[90;1m(%s) \27[33mwarning: \27[22m%s\27[0m\n", name, msg))
+	else
+		io.stderr:write(string.format("(%s) %s\n", name, msg))
+	end
+end
+
+local luacomp = {}
+local directives = {}
+
+--#include "src/shell_var.lua"
+--#include "src/luacomp_vars.lua"
+--#include "src/directive_provider.lua"
+--#include "src/cfg/minifier_providers.lua"
+
+@[[if not svar.get("LIBLUACOMP") then]]
+_G.luacomp = luacomp
+@[[end]]
+
+function luacomp.error(msg)
+	local inf = debug.getinfo(2)
+	local name = (inf and inf.short_src:match("[^/]+$"):gsub("^[=@]", "")) or "luacomp"
+	lc_error(name, msg)
+end
+
+function luacomp.warning(msg)
+	local inf = debug.getinfo(2)
+	local name = (inf and inf.short_src:match("[^/]+$"):gsub("^[=@]", "")) or "luacomp"
+	lc_warning(name, msg)
+end
+
+--#include "src/ast2.lua"
+--#include "src/generator2.lua"
+
+function luacomp.process_file(file, fname, dry)
+	@[[if not svar.get("LIBLUACOMP") then]]
+	io.stderr:write("PROC\t", fname, "\n")
+	@[[end]]
+	if type(file) == "string" then
+		file = io.open(file, "r")
+	end
+	local d = file:read("*a"):gsub("\r\n", "\n"):gsub("\r", "\n")
+	file:close()
+	return luacomp.process_string(d, fname or file, dry)
+end
+
+function luacomp.process_string(str, name, dry)
+	local str = ast.str_to_stream(str, name)
+	local cast = ast.parse(str)
+	local gcode = generator.parse_ast(name, cast)
+	if dry then
+		return gcode
+	end
+	--error("TODO: implement generation")
+	return generator.run_gcode(name, gcode)
+end
+
+function luacomp.run_minifier(minifier, code)
+	local min = providers[minifier]
+	if not minifier then
+		lc_error("luacomp", "Postprocessor "..minifier.." not found!")
+		--io.stderr:write("ERROR: Postprocessor `"..args.minifier.."' not found!\n")
+		--os.exit(1)
+	end
+	local rcode, err = min(code)
+	if (not rcode) then
+		lc_error(args.minifier, "Postprocessor error:\n"..err)
+	end
+	return rcode
+end
+
+@[[if svar.get("LIBLUACOMP") then]]
+return luacomp
+@[[end]]

src/luacomp_vars.lua

@@ -1,11 +1,15 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local function _sv(k, v)
 	_G[k] = v
 	svar.set(k, v)
 	--os.setenv(k, tostring(v))
 end
 
-_sv("LUACOMP_V_MAJ", 1)
+_sv("LUACOMP_V_MAJ", 2)
-_sv("LUACOMP_V_MIN", 2)
+_sv("LUACOMP_V_MIN", 0)
-_sv("LUACOMP_V_PAT", 2)
+_sv("LUACOMP_V_PAT", 3)
 _sv("LUACOMP_VERSION", LUACOMP_V_MAJ.."."..LUACOMP_V_MIN.."."..LUACOMP_V_PAT)
 _sv("LUACOMP_NAME", "LuaComp")

src/shell_var.lua

@@ -1,15 +1,17 @@
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 svar = {}
 
-local svars = {}
+do
+	local stdlib = require("posix.stdlib")
 
 	function svar.get(var)
-	return svars[var] or os.getenv(var)
+		return os.getenv(var)
 	end
 
 	function svar.set(var, val)
-	svars[var] = tostring(val)
+		return stdlib.setenv(var, val and tostring(val) or nil)
 	end
-
-function svar.get_all()
-	return svars
 end

src/staticinit.lua

@@ -1,21 +1,11 @@
 --[[
 	staticinit.lua - Main file of LuaComp, directly includes argparse.
-
-   Copyright 2019 Adorable-Catgirl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 ]]
 
+-- This Source Code Form is subject to the terms of the Mozilla Public
+-- License, v. 2.0. If a copy of the MPL was not distributed with this
+-- file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 local argparse = (function()
 --#include "src/argparse.lua"
 end)()

src/test.lua

@@ -0,0 +1,10 @@
+--#include "test"
+--#fuck @[{test}] $(test) 1245 0xFF
+$(test)
+$[[test]]
+$[{test}]
+@[{test}]
+@[[if test then test() end]]
+@[[for i=1, 10 do]]
+	print("hi @[{i}]")
+@[[end]]

tests/asmod.lua

@@ -0,0 +1,2 @@
+--#include "mod.lua" "foo"
+foo()

tests/bad_include.lua

@@ -0,0 +1 @@
+--#include "nonexistant"

tests/bad_span.lua

@@ -0,0 +1,3 @@
+@[{
+	fuck
+}]

tests/bad_string.lua

@@ -0,0 +1,2 @@
+--#include "fuck
+"

tests/bad_string_2.lua

@@ -0,0 +1 @@
+--#include "wtf\"

tests/escape_hell.lua

@@ -0,0 +1 @@
+--#error "fuck\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"

tests/lua_test.lua

@@ -0,0 +1,3 @@
+@[[for i=1, 10 do]]
+	print("hello @[{i}]")
+@[[end]]

tests/mod.lua

@@ -0,0 +1,3 @@
+return function()
+	print("hello, world")
+end

tests/noblockclose.lua

@@ -0,0 +1,2 @@
+@[[
+lmao

tests/nonewline_directive.lua

@@ -0,0 +1,2 @@
+-- include file
+--#include "nopreproc.lua"

tests/nopreproc.lua

@@ -0,0 +1 @@
+print("test")

tests/pragma_include_file_names.lua

@@ -0,0 +1,5 @@
+--#pragma "include_file_name" "y"
+--#include "nopreproc.lua"
+--#include "lua_test.lua"
+--#include "shell.lua"
+--#include "warning.lua"

tests/pragma_include_file_names_local_file_numbers.lua

@@ -0,0 +1,6 @@
+--#pragma "include_file_name" "y"
+--#pragma "prefix_local_file_numbers" "y"
+--#include "nopreproc.lua"
+--#include "lua_test.lua"
+--#include "shell.lua"
+--#include "warning.lua"

tests/runtests.sh

@@ -0,0 +1,5 @@
+for test in $(find -name "*.lua"); do
+	echo "Running test $test"
+	luacomp $test > $test.out
+	echo "=============================================================="
+done

tests/shell.lua

@@ -0,0 +1,6 @@
+-- raw evar
+print("your shell is $[{SHELL}]")
+-- evar string
+print("your shell is "..$(SHELL))
+-- cat
+$[[cat nopreproc.lua]]

tests/warning.lua

@@ -0,0 +1 @@
+--#warning "test"