luacomp3 maybe?

.gitignore

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libpreproc"]
+	path = libpreproc
+	url = git@github.com:lunaboards-dev/libpreproc.git

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.

examples/rel_include/bar.lua

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

examples/rel_include/foo.lua

@@ -0,0 +1,3 @@
+--#pragma "relative_include" "y"
+print("foo")
+--#include "bar.lua"

examples/rel_include_test.lua

@@ -0,0 +1,2 @@
+print("relative include test!")
+--#include "rel_include/foo.lua"

libpreproc

@@ -0,0 +1 @@
+Subproject commit af74760d6113fee5e509cc983163f140a674ae07

luacomp3/init.lua

@@ -0,0 +1,12 @@
+--@[[if false then]]
+local parser = require("luacomp3.parser")
+--@[[else]]
+--#include "parser.lua" "parser"
+--@[[end]]
+
+local p = setmetatable({}, {__index=parser})
+p:init()
+local f = io.open(arg[1], "rb")
+local d = f:read("a")
+f:close()
+p:parse(d)

luacomp3/parser.lua

@@ -0,0 +1,68 @@
+local lpp = require("libpreproc")
+local p = function(a)return lpp.pattern(a, true)end
+local parser = {}
+
+function parser:single_pass()
+
+end
+
+local span = lpp.block(p"[{", p"}]")
+local block = lpp.block(p"[[", p"]]")
+local parens = lpp.block(p"(", p")")
+local luacode = lpp.pattern("@(%d*)")
+local shellcode = p"$"
+local directive = lpp.pattern("--#!*")
+
+function parser:init()
+	local parse = lpp.instance()
+
+	--Lua code span
+	parse:add_token(lpp.prefix(luacode, span), function(stream, instance, result)
+		if #result.matches == 2 and result.matches[1] and result.matches[1] ~= "" then
+			result.matches.pass = tonumber(result.matches[1], 10)
+			if (result.matches.pass > 0) then
+				instance:emit(string.format("@%d[{%s}]", result.matches.pass, result.matches[2]))
+				return
+			end
+		end
+		instance:write(string.format("write(%s)", result.matches[#result.matches]))
+	end)
+
+	-- Lua code block
+	parse:add_token(lpp.prefix(luacode, block), function(stream, instance, result)
+		--print("<m>", table.unpack(result.matches))
+		if #result.matches == 2 and result.matches[1] and result.matches[1] ~= "" then
+			result.matches.pass = tonumber(result.matches[1], 10)
+			if (result.matches.pass > 0) then
+				instance:emit(string.format("@%d[[%s]]", result.matches.pass, result.matches[2]))
+				return
+			end
+		end
+		instance:write(result.matches[#result.matches])
+	end)
+
+	-- Shell variable
+	parse:add_token(lpp.prefix(shellcode, span), function(stream, instance, result)
+		instance:write(string.format("write(os.getenv(%q))", result.matches[1]))
+	end)
+
+	-- Shell variable, wrapped in quotes
+	parse:add_token(lpp.prefix(shellcode, parens), function(stream, instance, result)
+		instance:write(string.format("write('\"'..os.getenv(%q)..'\"')", result.matches[1]))
+	end)
+
+	-- Shell block
+	parse:add_token(lpp.prefix(shellcode, block), function(stream, instance, matches)
+	
+	end)
+	self.parser = parse
+end
+
+function parser:parse(code)
+	self.parser:compile(code)
+	print(self.parser.code)
+	local res = self.parser:generate()
+	print(res)
+end
+
+return parser

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,27 +1,17 @@
-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 (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")
-
---#include "src/shell_var.lua"
---#include "src/luacomp_vars.lua"
 --#include "src/libluacomp.lua"
---#include "src/directive_provider.lua"
+
---#include "src/cfg/minifier_providers.lua"
+__DSYM = {}
 
 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")
 parser:option("-x --executable", "Makes the script an executable (default: current lua version)"):args "?"
+parser:flag("-g --debugging", "Adds inline debugging utils to assist in debugging."):action(function() DEBUGGING=true end)
 parser:flag("--generator-code", "Outputs only the code from the generator.")
 parser:flag("--verbose", "Verbose output. (Debugging)"):action(function() VERBOSE=true end)
 parser:flag("--post-processors", "Lists postprocessors"):action(function()
@@ -61,6 +51,35 @@ else
 	f = io.stdin
 end
 local ocode = luacomp.process_file(f, (file == "-") and "stdin" or file, args.generator_code)
+if DEBUGGING then
+	-- generate debugging symbols
+	local dsyms = {"LEM:LCDEBUG!!!"}
+	for i=1, #__DSYM do
+		local sym = __DSYM[i]
+		local sym_str = string.format("FILE[%s]:START[%d,%d]:END[%d:%d]:FILE[%d,%d]", sym.file, sym.sx or 0, sym.sy or 0, sym.ex or 0, sym.ey or 0, sym.fx or -1, sym.fy or -1)
+		if sym.tag then
+			sym_str = sym_str .. ":"..sym.tag
+		end
+		table.insert(dsyms, sym_str)
+	end
+	ocode = ocode .. "\n--[["..table.concat(dsyms, "\n").."\n]]"
+end
+
+if DEBUGGING then
+	local dsymt = {}
+	for i=1, #__DSYM do
+		local sym = __DSYM[i]
+		local symstr = string.format("file=%q,sx=%q,sy=%q,ex=%q,ey=%q,fx=%q,fy=%q", sym.file, sym.sx or 0, sym.sy or 0, sym.ex or 0, sym.ey or 0, sym.fx or -1, sym.fy or -1)
+		if sym.tagv then
+			for i=1, #sym.tagv.vals do
+				sym.tagv.vals[i]=string.format("%q", sym.tagv.vals[i])
+			end
+			symstr = symstr .. ",tag={" ..string.format("type=%q,vals={%s}", sym.tagv.type, table.concat(sym.tagv.vals, ",")).."}"
+		end
+		table.insert(dsymt,"{"..symstr.."}")
+	end
+	ocode = "_G['LCDEBUG!!!'] = {\n"..table.concat(dsymt, ",\n").."\n}\n" .. ocode
+end
 
 local minifier = providers[args.minifier]
 dprint("Minifier: "..args.minifier, minifier)

src/ast.lua

@@ -1,297 +0,0 @@
---[[
-	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.
-]]
-
-local function nextc(f, c)
-	c = c or 1
-	return f:read(c)
-end
-
-local function peek(f, c)
-	c = c or 1
-	local z = f:read(c)
-	f:seek("cur", -c)
-	return z
-end
-
-local function skip(f, c)
-	c = c or 1
-	return f:seek("cur", c)
-end
-
-local ws = {
-	["\t"] = true,
-	[" "] = true
-}
-
-local function parse_hex(f)
-	local lc = " "
-	local hex = ""
-	while (48 <= lc:byte() and lc:byte() <= 57) or (97 <= lc:byte() and lc:byte() <= 102) or (65 <= lc:byte() and lc:byte() <= 70) and lc do
-		lc = nextc(f)
-		if (48 <= lc:byte() and lc:byte()) <= 57 or (97 <= lc:byte() and lc:byte() <= 102) or (65 <= lc:byte() and lc:byte() <= 70) and lc then
-			hex = hex .. lc
-		end
-	end
-	return tonumber(hex, 16)
-end
-
-local function parse_number(f, c)
-	local lc = " "
-	local num = c
-	while 48 <= lc:byte() and lc:byte() <= 57 and lc do
-		lc = nextc(f)
-		if (48 <= lc:byte() and lc:byte() <= 57) and lc then
-			num = num .. lc
-		end
-	end
-	return tonumber(hex, 10)
-end
-
-local esct = {
-	["t"] = "\t",
-	["n"] = "\n",
-	["r"] = "\r",
-	["\\"] = "\\\\"
-}
-
-for i=0, 9 do
-	esct[tostring(i)] = string.char(i)
-end
-
-local function parse_dblquote(f)
-	local val = ""
-	while peek(f) ~= "\"" do
-		local c = nextc(f)
-		if (peek(f) == "\n" or peek(f) == "\r") then
-			return nil, "Unexpected end of line"
-		elseif (not peek(f)) then
-			return nil, "Unexpected end of file"
-		end
-		if (c == "\\") then
-			if (esct[peek(f)]) then
-				c = esct[peek(f)]
-				skip(f)
-			else
-				c = nextc(f)
-			end
-		end
-		val = val .. c
-	end
-	skip(f)
-	return val
-end
-
-local function parse_snglquote(f)
-	local val = ""
-	while peek(f) ~= "\'" do
-		local c = nextc(f)
-		if (peek(f) == "\n" or peek(f) == "\r") then
-			return nil, "Unexpected end of line"
-		elseif (not peek(f)) then
-			return nil, "Unexpected end of file"
-		end
-		if (c == "\\") then
-			if (esct[peek(f)]) then
-				c = esct[peek(f)]
-				skip(f)
-			else
-				c = nextc(f)
-			end
-		end
-		val = val .. c
-	end
-	skip(f)
-	return val
-end
-
-local function parse_envarg(f)
-	local val = ""
-	while peek(f) ~= ")" do
-		if (peek(f) == "\n" or peek(f) == "\r") then
-			return nil, "Unexpected end of line"
-		elseif (not peek(f)) then
-			return nil, "Unexpected end of file"
-		end
-		val = val .. nextc(f)
-	end
-	skip(f)
-	return val
-end
-
-local function parse_directive(f)
-	local lc = "_"
-	local name = ""
-	local args = {}
-	local carg = ""
-	while not ws[lc] do
-		lc = nextc(f)
-		if (lc == "\n" or lc == "\r") then
-			if (lc == "\r" and peek(f) == "\n") then skip(f) end
-			return {type="directive", name=name}
-		elseif not ws[lc] then
-			name = name .. lc
-		end
-	end
-	while true do
-		lc = nextc(f)
-		if (lc == "\n" or lc == "\r") then
-			if (lc == "\r" and peek(f) == "\n") then skip(f) end
-			return {type="directive", name=name, args=args}
-		elseif lc == "0" and peek(f) == "x" then
-			skip(f)
-			local val = parse_hex(f)
-			args[#args+1] = val
-		elseif 48 <= lc:byte() and lc:byte() <= 57 then
-			local val = parse_number(f, lc)
-			args[#args+1] = val
-		elseif lc == "\"" then
-			local val, e = parse_dblquote(f)
-			if not val then return val, e end
-			args[#args+1] = val
-		elseif lc == "\'" then
-			local val, e = parse_snglquote(f)
-			if not val then return val, e end
-			args[#args+1] = val
-		elseif lc == "$" and peek(f) == "(" then
-			skip(f)
-			local val = parse_envarg(f)
-			if not os.getenv(val) then return nil, "Enviroment variable `"..val.."' does not exist." end
-			args[#args+1] = os.getenv(val)
-		elseif lc == "@" and peek(f, 2) == "[{" then
-			skip(f, 2)
-			local val = ""
-			while peek(f, 2) ~= "}]" do
-				val = val .. nextc(f)
-			end
-			args[#args+1] = {type="lua_var", val}
-			skip(f, 2)
-		elseif not ws[lc] then
-			return nil, "Syntax error"
-		end
-	end
-end
-
-local function mkast(f, n)
-	io.stderr:write("PROC\t",n,"\n")
-	local lc = " "
-	local lpos = 1
-	local ilpos = 1
-	local tree = {}
-	local code = ""
-	local branches = {}
-	local function add_code()
-		tree[#tree+1] = {type="code", data=code, file=n, line=lpos}
-		code = ""
-	end
-	local function parse_error(e)
-		io.stderr:write("ERROR:"..n..":"..lpos..": "..e.."\n")
-		os.exit(1)
-	end
-	while lc and lc ~= "" do
-		lc = nextc(f)
-		if (lc == "-" and ilpos == 1) then
-			if (peek(f, 2) == "-#") then --Directive
-				add_code()
-				skip(f, 2)
-				local d, r = parse_directive(f)
-				if not d then
-					parse_error(r)
-				end
-				d.line = lpos
-				d.file = n
-				lpos = lpos+1
-				tree[#tree+1] = d
-			else
-				code = code .. lc
-				ilpos = ilpos+1
-			end
-		elseif (lc == "/" and ilpos == 1) then
-			if (peek(f, 2) == "/#") then --Directive
-				add_code()
-				skip(f, 2)
-				local d, r = parse_directive(f)
-				if not d then
-					parse_error(r)
-				end
-				d.line = lpos
-				d.file = n
-				lpos = lpos+1
-				tree[#tree+1] = d
-			else
-				code = code .. lc
-				ilpos = ilpos+1
-			end
-		elseif (lc == "$" and peek(f) == "(") then
-			add_code()
-			skip(f)
-			local val, e = parse_envarg(f)
-			if not val then
-				parse_error(e)
-			end
-			tree[#tree+1] = {type="envvar", var=val, file=n, line=lpos}
-		elseif (lc == "@" and peek(f, 2) == "[[") then
-			add_code()
-			skip(f, 2)
-			local val = ""
-			while peek(f, 2) ~= "]]" do
-				val = val .. nextc(f)
-			end
-			tree[#tree+1] = {type="lua", code=val, file=n, line=lpos}
-			skip(f, 2)
-		elseif (lc == "@" and peek(f, 2) == "[{") then
-			add_code()
-			skip(f, 2)
-			local val = ""
-			while peek(f, 2) ~= "}]" do
-				val = val .. nextc(f)
-			end
-			tree[#tree+1] = {type="lua_r", code=val, file=n, line=lpos}
-			skip(f, 2)
-		elseif (lc == "$" and peek(f, 2) == "[[") then
-			add_code()
-			skip(f, 2)
-			local val = ""
-			while peek(f, 2) ~= "]]" do
-				val = val .. nextc(f)
-			end
-			tree[#tree+1] = {type="shell", code=val, file=n, line=lpos}
-			skip(f, 2)
-		elseif (lc == "$" and peek(f, 2) == "[{") then
-			add_code()
-			skip(f, 2)
-			local val = ""
-			while peek(f, 2) ~= "}]" do
-				val = val .. nextc(f)
-			end
-			tree[#tree+1] = {type="shell_r", code=val, file=n, line=lpos}
-			skip(f, 2)
-		elseif (lc == "\r" or lc == "\n") then
-			if (lc == "\r" and peek(f) == "\n") then
-				skip(f)
-			end
-			lpos = lpos+1
-			ilpos = 1
-			code = code .. "\n"
-		else
-			code = code .. (lc or "")
-			ilpos = ilpos+1
-		end
-	end
-	add_code()
-	return tree
-end

src/ast2.lua

@@ -1,5 +1,8 @@
 -- 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 "
@@ -87,7 +90,7 @@ do
 	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))
+		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)
@@ -114,8 +117,9 @@ do
 	function ast.remove_escapes(escaped_string)
 		local i = 1
 		local out_string = ""
-		while i < #escaped_string do
+		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
@@ -123,17 +127,19 @@ do
 			end
 			i = i + 1
 		end
+		--lc_warning("debug", out_string)
 		return out_string
 	end
 
 	function ast.back_escape_count(str, start)
-		local i=1
+		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
 
@@ -152,7 +158,7 @@ do
 			end
 			str:set(rpos)
 			if str:peek(-1) == "\\" then
-				local parsed = ast.remove_escapes(ast.back_unescape(str))
+				local parsed = ast.remove_escapes(ast.back_escape_count(str, spos))
 				if parsed:sub(#parsed) == "\'" then
 					goto found_end
 				end
@@ -183,14 +189,16 @@ do
 				end
 			end
 			str:set(rpos)
-			if str:peek(-1) == "\\" then
+			--lc_warning(str:peek(-2), "test")
-				local parsed = ast.remove_escapes(ast.back_unescape(str))
+			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()
@@ -378,6 +386,19 @@ do
 		return ematch
 	end
 
+	function ast.add_debugging_info(list, str, sx, sy)
+		if DEBUGGING then
+			local node = list[#list]
+			node.sx = sx
+			node.sy = sy
+			node.ey, node.ex = str:get_yx()
+			node.file = str.file
+			if not str.file then
+				luacomp.error("Node has no file!\n"..debug.traceback())
+			end
+		end
+	end
+
 	-- And now we parse
 	function ast.parse(str)
 		local cast = {}
@@ -400,11 +421,13 @@ do
 					end
 				end
 				return true
-			end, "--#", "$".."[[", "@".."[[", "$".."[{", "@".."[{", "$".."(") -- trust me, this was needed
+			end, "--".."#", "$".."[[", "@".."[[", "$".."[{", "@".."[{", "$".."(", "//".."##") -- trust me, this was needed
 			--dprint("searched")
+			local sy, sx = str:get_yx()
 			if not match then
 				--dprint("not found")
 				table.insert(cast, {type="content", val=str:next(str:size())})
+				ast.add_debugging_info(cast, str, sx, sy)
 				break
 			end
 			local epos = str:tell()
@@ -414,11 +437,12 @@ do
 				local chunk = str:next(size)
 				if not chunk:match("^%s+$") then
 					table.insert(cast, {type="content", val=chunk})
+					ast.add_debugging_info(cast, str, sx, sy)
 				end
 				str:skip(#match)
 			end
 			--dprint("match: "..match)
-			if match == "--#" then
+			if match == "--".."#" or match == "//".."##" then
 				--str:skip(3)
 				table.insert(cast, ast.parse_directive(str))
 			elseif match == "$".."[[" then
@@ -438,9 +462,10 @@ do
 				local var = ast.parse_envvar(str)
 				table.insert(cast, {type="evar", val=var})
 			else
-				ast.parser_error(str, "what")
+				ast.parser_error(str, "internal compiler error")
 			end
 			--dprint("Parsed")
+			ast.add_debugging_info(cast, str, sx, sy)
 		end
 
 		return cast

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"

src/directive_provider.lua

@@ -1,26 +1,17 @@
 --[[
 	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

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,43 @@
-function directives.include(env, file)
+-- This Source Code Form is subject to the terms of the Mozilla Public
-	local sr, err = stat.stat(file)
+-- 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.include(env, file, asmod)
+	local rfile = file
+	--luacomp.warning("relative_include\t"..env.pragmas.relative_include)
+	if env.pragmas.relative_include == "y" or luacomp.experimental.relative_include then
+		--luacomp.warning("Experimental relative include enabled!")
+		if not env.fname:find("/") then
+			rfile = file
+		else
+			rfile = env.fname:gsub("/[^/]+$", "/")..file
+		end
+	end
+	local sr, err = stat.stat(rfile)
 	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 .. luacomp.process_file(file, file) .. "\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 .. "-- BEGIN " .. file .. "\n"
+	end
+	local code = luacomp.process_file(rfile, rfile) .. "\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 env.pragmas.include_file_name == "y" then
+		env.code = env.code .. "-- END " .. file .. "\n"
+	end
+	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,20 @@
+-- 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 pragma_hooks = {
+	include_once = function(env, value)
+		if value and value ~= 0 then
+
+		end
+	end
+}
+
+function directives.pragma(env, key, value)
+	--luacomp.warning(key.."\t"..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,148 +0,0 @@
---[[
-	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.
-]]
-
-local function lua_escape(code)
-   return code:gsub("\\", "\\\\"):gsub("\"", "\\\""):gsub("\n", "\\n")
-end
-
-local function shell_escape(code)
-   return code:gsub("\\%[", "[")
-end
-
-local function svar_escape(code)
-   return code:gsub("\"", "\\\""):gsub("\'", "\\\'"):gsub("`", "\\`")
-end
-
-local directives = {}
-
-local function generate(ast, gencode)
-   local lua_code = ""
-   for i=1, #ast do
-      local leaf = ast[i]
-      if (leaf.type == "lua") then
-         lua_code = lua_code .. leaf.code
-      elseif (leaf.type == "directive") then
-         local stargs = {}
-         for i=1, #leaf.args do
-            local arg = leaf.args[i]
-            if (type(arg) == "string") then
-               stargs[i] = "\""..lua_escape(arg).."\""
-            elseif (type(arg) == "number") then
-               stargs[i] = tostring(arg)
-            elseif (type(arg) == "table" and arg.type=="lua_var") then
-               stargs[i] = arg[1]
-            end 
-         end
-         lua_code = lua_code .. "call_directive(\""..leaf.file..":"..tostring(leaf.line).."\",\""..leaf.name.."\","..table.concat(stargs, ",")..")"
-      elseif (leaf.type == "envvar") then
-         lua_code = lua_code .. "put_env(\""..leaf.file..":"..tostring(leaf.line).."\",\""..leaf.var.."\")"
-      elseif (leaf.type == "code") then
-         lua_code = lua_code .. "put_code(\""..leaf.file..":"..tostring(leaf.line).."\",\"" .. lua_escape(leaf.data) .. "\")"
-      elseif (leaf.type == "lua_r") then
-         lua_code = lua_code .. "put_code(\""..leaf.file..":"..tostring(leaf.line).."\",tostring("..leaf.code.."))"
-      elseif (leaf.type == "shell") then
-         lua_code = lua_code .. "put_shell_out(\""..leaf.file..":"..tostring(leaf.line).."\",\""..lua_escape(leaf.code).."\")"
-      elseif (leaf.type == "shell_r") then
-         lua_code = lua_code .. "put_svar(\""..leaf.file..":"..tostring(leaf.line).."\",\""..leaf.code.."\")"
-      else
-         io.stderr:write("ERROR: Internal catastrophic failure, unknown type "..leaf.type.."\n")
-         os.exit(1)
-      end
-      lua_code = lua_code .. "\n"
-   end
-   local env = {code = ""}
-   local function run_away_screaming(fpos, err)
-      io.stdout:write("ERROR: "..fpos..": "..err.."\n")
-      os.exit(1)
-   end
-   local function bitch(fpos, err)
-      io.stdout:write("WARNING: "..fpos..": "..err.."\n")
-   end
-   local function call_directive(fpos, dname, ...)
-      if (not directives[dname]) then
-         run_away_screaming(fpos, "Invalid directive name `"..dname.."'")
-      end
-      local r, er = directives[dname](env, ...)
-      if (not r) then
-         run_away_screaming(fpos, er)
-      end
-   end
-   local function put_env(fpos, evar)
-      local e = svar.get(evar)
-      if not e then
-         run_away_screaming(fpos, "Enviroment variable `"..evar.."' does not exist!")
-      end
-      env.code = env.code .. "\""..lua_escape(e).."\""
-   end
-   local function put_code(fpos, code)
-      env.code = env.code .. code --not much that can fail here...
-   end
-   local function put_shell_out(fpos, code)
-      local tname = os.tmpname()
-      local f = os.tmpname()
-      local fh = io.open(f, "w")
-      fh:write(code)
-      fh:close()
-      os.execute("chmod +x "..f)
-      local vars = svar.get_all()
-      local vstr = ""
-      for k, v in pairs(vars) do
-         vstr = vstr .. k.."=".."\""..svar_escape(v).."\" "
-      end
-      dprint("Shell", vstr .. f.." "..tname)
-      local h = io.popen(vstr .. f.." "..tname, "r")
-      local output = h:read("*a"):gsub("\n$", "")
-      local ok, sig, code = h:close()
-      fh = io.open(tname, "r")
-      local stderr = fh:read("*a"):gsub("\n$", "")
-      fh:close()
-      os.remove(f)
-      os.remove(tname)
-      if not ok then
-         run_away_screaming(fpos, "Shell exit code "..code..", SIG_"..sig:upper().."\n"..stderr)
-      elseif #stderr > 0 then
-         bitch(fpos, stderr)
-      end
-      env.code = env.code .. output
-   end
-   local function put_svar(fpos, evar)
-      local e = svar.get(evar)
-      if not e then
-         run_away_screaming(fpos, "Enviroment variable `"..evar.."' does not exist!")
-      end
-      env.code = env.code .. e
-   end
-   local fenv = {}
-   for k, v in pairs(_G) do
-      fenv[k] = v
-   end
-   if gencode then
-      return lua_code
-   end
-   fenv._G = fenv
-   fenv._ENV = fenv
-   fenv.call_directive = call_directive
-   fenv.put_code = put_code
-   fenv.put_env = put_env
-   fenv.put_svar = put_svar
-   fenv.put_shell_out = put_shell_out
-   fenv._GENERATOR=env
-   local func = assert(load(lua_code, "=(generated code: "..ast.file..")", "t", fenv))
-   func()
-   return env.code
-end

src/generator2.lua

@@ -1,4 +1,7 @@
 -- 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 = {}
 
@@ -7,6 +10,23 @@ do
 		local gcode = ""
 		for i=1, #ast do
 			local leaf = ast[i]
+			if DEBUGGING then
+				if not leaf.file then
+					local linfo = {}
+					for k, v in pairs(leaf) do
+						table.insert(linfo, tostring(k).."\t"..tostring(v))
+					end
+					luacomp.error("Node has no file!\n"..debug.traceback().."\n"..table.concat(linfo, "\n"))
+				end
+				table.insert(__DSYM, {
+					sx = leaf.sx,
+					sy = leaf.sy,
+					ex = leaf.ex,
+					ey = leaf.ey,
+					file = leaf.file
+				})
+				gcode = gcode .. string.format("push_debuginfo(%d)\n", #__DSYM)
+			end
 			if leaf.type == "directive" then
 				gcode = gcode .. string.format("call_directive(%q,", leaf.name)
 				local pargs = {}
@@ -38,21 +58,67 @@ do
 	end
 
 	function generator.run_gcode(fname, gcode)
-		local env = {code = "", fname=fname}
+		fname = fname or "(unknown)"
+		local env = {
+			code = "",
+			fname = fname,
+			pragmas = {
+				include_file_name = "n",
+				prefix_local_file_numbers = "n",
+				wrap_includes = "n",
+				relative_include = "n"
+			}
+		}
 		local fenv = {}
 		for k, v in pairs(_G) do
 			fenv[k] = v
 		end
 		fenv._G = fenv
 		fenv._GENERATOR = env
+		local lsym
+		function fenv.push_debuginfo(idx)
+			local ent = __DSYM[idx]
+			local linecount = 0
+			for l in env.code:gmatch("[^\n]*") do
+				linecount = linecount+1
+			end
+			local x = 1
+			while true do
+				x = x + 1
+				local c = env.code:sub(#env.code-x, #env.code-x)
+				if c == "\n" or c == "" then
+					break
+				end
+			end
+			ent.fx = x-1
+			ent.fy = linecount
+			if lsym then
+				local lent = __DSYM[idx]
+				lent.fey = ent.fy
+			end
+			lsym = idx
+		end
+
+		local function debug_add_tag(ttype, ...)
+			if not DEBUGGING then return end
+			local alist = table.pack(...)
+			for i=1, #alist do
+				alist[i] = tostring(alist[i])
+			end
+			__DSYM[lsym].tag = string.format("TYPE[%s=%s]", ttype, table.concat(alist,","))
+			__DSYM[lsym].tagv = {type=ttype, vals=table.pack(...)}
+		end
+		
 		function fenv.call_directive(dname, ...)
-			if not directives[dname] then lc_error(@[{_GENERATOR.fname}], "invalid directive "..dname) end
+			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(@[{_GENERATOR.fname}], er) end
+			if not r then lc_error("directive "..dname, er) end
+			debug_add_tag("CALL_DIR", dname, ...)
 		end
 
 		function fenv.write_out(code)
 			env.code = env.code .. code
+			debug_add_tag("CODE", #tostring(code))
 		end
 
 		function fenv.shell_write(cmd)
@@ -61,12 +127,18 @@ do
 			f:write(cmd)
 			f:close()
 			local h = io.popen(os.getenv("SHELL").." "..tmpname, "r")
-			env.code = env.code .. h:read("*a")
+			local r = h:read("*a"):gsub("%s+$", ""):gsub("^%s+", "")
+			env.code = env.code .. r
 			h:close()
+			debug_add_tag("SHELL", cmd, #r)
 		end
 
 		assert(load(gcode, "="..fname, "t", fenv))()
 
+		if DEBUGGING then
+
+		end
+
 		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

@@ -1,13 +1,25 @@
 -- A LuaComp library
-local luacomp = {}
+-- 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 directives = {}
+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[31;22m%s\27[0m\n", name, msg))
+		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
@@ -16,20 +28,32 @@ end
 
 local function lc_warning(name, msg)
 	if unistd.isatty(2) then
-		io.stderr:write(string.format("\27[90;1m(%s) \27[33;22m%s\27[0m\n", name, msg))
+		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(1)
+	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(1)
+	local inf = debug.getinfo(2)
 	local name = (inf and inf.short_src:match("[^/]+$"):gsub("^[=@]", "")) or "luacomp"
 	lc_warning(name, msg)
 end
@@ -38,7 +62,9 @@ end
 --#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
@@ -56,4 +82,22 @@ function luacomp.process_string(str, name, dry)
 	end
 	--error("TODO: implement generation")
 	return generator.run_gcode(name, gcode)
-end
+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,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 function _sv(k, v)
 	_G[k] = v
 	svar.set(k, v)
@@ -6,6 +10,10 @@ end
 
 _sv("LUACOMP_V_MAJ", 2)
 _sv("LUACOMP_V_MIN", 0)
-_sv("LUACOMP_V_PAT", 0)
+_sv("LUACOMP_V_PAT", 4)
 _sv("LUACOMP_VERSION", LUACOMP_V_MAJ.."."..LUACOMP_V_MIN.."."..LUACOMP_V_PAT)
-_sv("LUACOMP_NAME", "LuaComp")
+_sv("LUACOMP_NAME", "LuaComp")
+
+luacomp.experimental = {
+	relative_include = false
+}

src/shell_var.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/.
+
 svar = {}
 
 do

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)()

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"