Add current saphire build system and auto-completion code

Saphirefile.lua

@@ -0,0 +1,203 @@
+--[[
+  Saphire-based build system for raylib-lua
+  Copyright (C) 2021 Astie Teddy
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+  OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+]]
+
+local saphire = require "saphire"
+local los = require "los"
+
+local cc = os.getenv "CC" or "cc"
+local ar = os.getenv "AR" or "ar"
+local windres = os.getenv "WINDRES" or "windres"
+
+-- TODO: Use current lua interpreter
+local lua = "luajit"--os.getenv "LUA" or "luajit\\src\\luajit"
+local lua_ready = os.getenv "LUA" or false
+
+local cflags = os.getenv "CFLAGS" or "-O2 -s"
+local ldflags = os.getenv "LDFLAGS" or "-O2 -s -lm"
+
+local windres = os.getenv "WINDRES" or "windres"
+
+local modules = "raymath rlgl easings gestures physac raygui"
+
+cflags = cflags .. " -Iluajit/src -Iraygui/src -Iraylib/src"
+ldflags = ldflags .. " luajit/src/libluajit.a raylib/src/libraylib.a luajit/src/libluajit.a"
+
+local exe_ldflags = ""
+
+if los.type() == "linux" then
+  ldflags = ldflags .. " -ldl -pthread"
+elseif los.type() == "win32" then
+  ldflags = ldflags .. " -lopengl32 -lgdi32 -lwinmm -static "
+  exe_ldflags = exe_ldflags .. "src/res/icon.res"
+end
+
+local function build_c(src, obj, name, flags)
+  if saphire.targets.clean then
+    return {
+      command = "rm -f " .. obj,
+      name = name
+    }
+  end
+  
+  return {
+    command = string.format("%s -c -o %s %s %s %s", cc, obj, src, flags or "", cflags),
+    name = name,
+    display = obj
+  }
+end
+
+local function build_a(objs, lib, name)
+  if saphire.targets.clean then
+    return {
+      command = "rm -f " .. lib,
+      name = name
+    }
+  end
+
+  return {
+    command = string.format("%s rcs %s %s", ar, lib, table.concat(objs, " ")),
+    name = name
+  }
+end
+
+local function build_e(files, output, name, flags)
+  if saphire.targets.clean then
+    return {
+      command = "rm -f " .. output,
+      name = name
+    }
+  end
+
+  return {
+    command = string.format("%s -o %s %s %s %s %s",
+      cc, output, table.concat(files, " "), flags or "", ldflags, exe_ldflags),
+    name = name,
+    display = string.format("%s -o %s", cc, output)
+  }
+end
+
+local function build_res(src, output, name)
+  if saphire.targets.clean then
+    return {
+      command = "rm -f " .. output,
+      name = name
+    }
+  end
+
+  return {
+    command = string.format("%s %s -O coff %s", windres, src, output),
+    name = name
+  }
+end
+
+local function lua2c(files, output, name, dname)
+  --while not lua_ready do
+  --  coroutine.yield()
+  --end
+  if saphire.targets.clean then
+    return {
+      command = "rm -f " .. output,
+      name = dname
+    }
+  end
+
+  return {
+    command = string.format("%s tools/lua2str.lua %s %s %s", lua, output, name, table.concat(files, " ")),
+    name = dname
+  }
+end
+
+saphire.do_multi({
+  function () -- LuaJIT
+    -- TODO: Improve LuaJIT building
+    --saphire.do_subdir("luajit", true, "build/buildLuaJIT.lua")
+
+    if saphire.targets.clean then
+      saphire.do_single({
+        command = "make -C luajit clean",
+        name = "LuaJIT"
+      }, true)
+    else
+      saphire.do_single({
+        command = string.format("make -C luajit amalg CC=%s BUILDMODE=static MACOSX_DEPLOYMENT_TARGET=10.13", cc),
+        name = "LuaJIT"
+      }, true)
+    end
+
+    lua_ready = true
+  end,
+  function () -- Raylib
+    saphire.do_subdir("raylib/src", true, "build/buildRaylib.lua")
+  end,
+  function () -- libraylua.a
+    saphire.do_single(lua2c(
+        { "src/raylib.lua", "src/compat.lua", "src/raylua.lua" },
+        "src/autogen/boot.c",
+        "raylua_boot_lua",
+        "libraylua.a"
+      ), true)
+
+    if saphire.targets.clean then
+      saphire.do_single({
+        command = "rm -f src/autogen/bind.c",
+        name = "libraylua.a"
+      }, true)
+    else
+      saphire.do_single({
+        command = string.format("%s tools/genbind.lua src/autogen/bind.c %s", lua, modules),
+        name = "libraylua.a"
+      }, true)
+    end
+
+    saphire.do_single(build_c("src/raylua.c", "src/raylua.o", "libraylua.a"), true)
+    saphire.do_single(build_a({ "src/raylua.o" }, "libraylua.a", "libraylua.a"), true)
+  end,
+  function () -- src/raylua_builder.o
+    saphire.do_single(lua2c({ "src/raylua_builder.lua" }, "src/autogen/builder.c", "raylua_builder_lua", "raylua_e"), true)
+    saphire.do_single(build_c("src/raylua_builder.c", "src/raylua_builder.o", "raylua_e"), true)
+  end,
+  function () -- Ressources
+    if los.type() == "win32" then
+      saphire.do_single(build_res("src/res/icon.rc", "src/res/icon.res", "icon"), true)
+    end
+  end,
+  function ()
+    local entries = {
+      { "src/raylua_s.o", "src/raylua_s.c" },
+      { "src/raylua_e.o", "src/raylua_e.c" },
+      { "src/lib/miniz.o", "src/lib/miniz.c" },
+      { "src/raylua_self.o", "src/raylua_self.c" }
+    }
+
+    saphire.do_multi(saphire.map(entries, function(entry)
+      return build_c(entry[2], entry[1], "raylua")
+    end), true)
+  end
+}, true)
+
+saphire.do_multi({
+  -- raylua_s
+  build_e({ "src/raylua_s.o", "libraylua.a" }, "raylua_s", "raylua_s"),
+  -- raylua_e
+  build_e({ 
+    "src/raylua_e.o",
+    "src/raylua_self.o",
+    "src/raylua_builder.o",
+    "src/lib/miniz.o",
+    "libraylua.a"
+  }, "raylua_e", "raylua_e")
+}, true)

build/buildRaylib-bak.lua

@@ -0,0 +1,101 @@
+local saphire = require "saphire"
+
+local cc = os.getenv "CC" or "cc"
+local ar = os.getenv "AR" or "ar"
+
+local cflags = os.getenv "CFLAGS" or "-O2 -s"
+local ldflags = os.getenv "LDFLAGS" or "-O2 -s -lm"
+
+local include_paths = "-I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw"
+
+local los = require "los"
+
+local consts = {
+  RAYLIB_VERSION = "3.7.0",
+  RAYLIB_API_VERSION = "370",
+}
+
+local vars = saphire.map({
+  { "RAYLIB_LIBTYPE", "STATIC" },
+  { "RAYLIB_BUILD_MODE", "RELEASE" },
+  { "RAYLIB_LIB_NAME", "raylib" },
+  { "RAYLIB_RES_FILE", "./raylib.dll.rc.data" },
+  { "PLATFORM", "PLATFORM_DESKTOP" },
+  { "GRAPHICS", "GRAPHICS_API_OPENGL_33" },
+  { "USE_EXTERNAL_GLFW", "FALSE" },
+  { "USE_WAYLAND_DISPLAY", "FALSE" }
+}, function (v)
+  return { v[1], os.getenv(v[1]) or v[2] }
+end)
+
+for i,v in ipairs(vars) do
+  vars[v[1]] = v[2]
+end
+
+local function build_c(src, obj, flags)
+  return {
+    command = string.format("%s -fdiagnostics-color=always -c -o %s %s %s %s %s", cc, obj, src, flags or "", cflags, ldflags),
+    name = "raylib",
+    display = obj
+  }
+end
+
+local function build_a(objs, lib)
+  return {
+    command = string.format("%s rcs %s %s", ar, lib, table.concat(objs, " ")),
+    name = "raylib",
+    lib = lib
+  }
+end
+
+local function build_e(files, output, flags)
+  return {
+    command = string.format("%s -fdiagnostics-color=always -o %s %s %s %s", cc, output, table.concat(files, " "), flags or "", ldflags),
+    name = "raylib",
+    display = output
+  }
+end
+
+local function build_res(src, output)
+  return {
+    command = string.format("%s %s -O coff %s", windres, src, output),
+    name = "raylib"
+  }
+end
+
+local objects = {
+  -- ["obj.o"] = { src... }
+  { "rcore.o", { "rcore.c", "raylib.h", "rlgl.h", "utils.h", "raymath.h", "camera.h", "rgestures.h" } },
+  { "rglfw.o", { "rglfw.c", flags = os.getenv "GLFW_OSX" or "" } },
+  { "rshapes.o", { "rshapes.c", "raylib.h", "rlgl.h" } },
+  { "rtextures.o", { "rtextures.c", "raylib.h", "rlgl.h", "utils.h" } },
+  { "rtext.o", { "rtext.c", "raylib.h", "utils.h" } },
+  { "utils.o", { "utils.c", "utils.h" } },
+  { "rmodels.o", { "rmodels.c", "raylib.h", "rlgl.h", "raymath.h" } },
+  { "raudio.o", { "raudio.c", "raylib.h" } }
+}
+
+if saphire.targets.clean then
+  saphire.do_multi(
+    saphire.map(objects, function (obj_info)
+      return {
+        command = string.format("rm -f %s", obj_info[1])
+      }
+    end), true)
+else
+  saphire.do_multi(
+    saphire.map(objects, function (obj_info)
+      return function()
+        local obj, src = unpack(obj_info)
+        saphire.do_recipe(src, obj, build_c(src[1], obj,
+          table.concat({ "-D" .. vars.PLATFORM, "-D" .. vars.GRAPHICS, include_paths, src.flags }, " ")),
+        true)
+      end
+    end), true)
+
+  saphire.do_single(
+    build_a(
+      saphire.map(objects, function (obj) return obj[1] end),
+      "libraylib.a"),
+    true)
+end

build/buildRaylib.lua

@@ -0,0 +1,49 @@
+local saphire = require "saphire"
+local c = require "saphire-c"
+
+local cc = os.getenv "CC" or "cc"
+local ar = os.getenv "AR" or "ar"
+
+local cflags = os.getenv "CFLAGS" or "-O2 -s"
+local ldflags = os.getenv "LDFLAGS" or "-O2 -s -lm"
+
+local include_paths = "-I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw"
+
+local los = require "los"
+
+local consts = {
+  RAYLIB_VERSION = "3.7.0",
+  RAYLIB_API_VERSION = "370",
+}
+
+local vars = saphire.map({
+  { "RAYLIB_LIBTYPE", "STATIC" },
+  { "RAYLIB_BUILD_MODE", "RELEASE" },
+  { "RAYLIB_LIB_NAME", "raylib" },
+  { "RAYLIB_RES_FILE", "./raylib.dll.rc.data" },
+  { "PLATFORM", "PLATFORM_DESKTOP" },
+  { "GRAPHICS", "GRAPHICS_API_OPENGL_33" },
+  { "USE_EXTERNAL_GLFW", "FALSE" },
+  { "USE_WAYLAND_DISPLAY", "FALSE" }
+}, function (v)
+  return { v[1], os.getenv(v[1]) or v[2] }
+end)
+
+for i,v in ipairs(vars) do
+  vars[v[1]] = v[2]
+end
+
+local src = {
+  -- ["obj.o"] = { src... }
+  { "rcore.o", { "rcore.c", "raylib.h", "rlgl.h", "utils.h", "raymath.h", "camera.h", "rgestures.h" } },
+  { "rglfw.o", { "rglfw.c", flags = os.getenv "GLFW_OSX" or "" } },
+  { "rshapes.o", { "rshapes.c", "raylib.h", "rlgl.h" } },
+  { "rtextures.o", { "rtextures.c", "raylib.h", "rlgl.h", "utils.h" } },
+  { "rtext.o", { "rtext.c", "raylib.h", "utils.h" } },
+  { "utils.o", { "utils.c", "utils.h" } },
+  { "rmodels.o", { "rmodels.c", "raylib.h", "rlgl.h", "raymath.h" } },
+  { "raudio.o", { "raudio.c", "raylib.h" } }
+}
+
+local objs = c.compile(src, table.concat({ "-D" .. vars.PLATFORM, "-D" .. vars.GRAPHICS, include_paths }, " "))
+local libraylib = c.lib("libraylib.a", objs)

tools/autocomplete/generator.lua

@@ -0,0 +1,139 @@
+local json = require "json"
+
+local content = io.open(arg[1], "r"):read "*a"
+local t = json.decode(content)
+
+print "---@diagnostic disable"
+
+print "---raylib-lua binding"
+print "rl = {}"
+
+local ffi_type_list = {}
+
+local function luaify(t)
+  -- strings
+  for _,v in ipairs { "void %*", "char %*" } do
+    if string.find(t, v) then
+      return 'string|lightuserdata'
+    end
+  end
+
+  for _,v in ipairs { "char" } do
+    if string.find(t, v) then
+      return "number|string[]"
+    end
+  end
+
+  for _,v in ipairs { "int", "long", "float", "double" } do
+    if string.find(t, v) then
+      return "number"
+    end
+  end
+
+  local t = t:gsub(" ", "_"):gsub("*", "_ptr"):gsub("__", "_")
+  if t:find "_ptr" then
+    t = t .. "|lightuserdata"
+  end
+
+  return t
+end
+
+for _,enum in ipairs(t.enums) do
+  print("---@alias " .. enum.name)
+  for _,v in pairs(enum.values) do
+    print(string.format("---| '%s'", v.name))
+  end
+
+  if enum.description ~= "" then
+    print("---" .. enum.description)
+  end
+
+  print ""
+
+  for _,v in pairs(enum.values) do
+    if v.description ~= "" then
+      print("---" .. v.description)
+    end
+    print(string.format("rl.%s = %u", v.name, v.value))
+  end
+end
+
+for _,struct in ipairs(t.structs) do
+  print(string.format("---@class %s%s", struct.name,
+    (struct.description ~= "") and string.format(" @ %s", struct.description) or ""))
+
+  print(string.format("---@alias %s_ptr %s", struct.name, struct.name))
+  print(string.format("---@alias %s_ptr_ptr %s", struct.name, struct.name))
+
+  if struct.name == "Texture" then
+    print "---@alias Texture2D Texture"
+  end
+  if struct.name == "RenderTexture" then
+    print "---@alias RenderTexture2D RenderTexture"
+  end
+
+  ffi_type_list[#ffi_type_list+1] = struct.name
+
+  for _,field in pairs(struct.fields) do
+    for n in field.name:gmatch "([^, ]+),?" do
+      local arraySize = n:match "%[(.-)%]"
+      if arraySize then
+        n = n:match("(%S-)%[.-%]")
+        field.type = string.format("%s[]", luaify(field.type), arraySize)
+      end
+
+      print(string.format('---@field %s %s%s', n, luaify(field.type), 
+        (field.description ~= "") and string.format(" # %s", field.description) or ""))
+    end
+  end
+  print(string.format('---Constructed using `rl.new("%s", ...)`', struct.name))
+  print(string.format("local %s = {}", struct.name))
+end
+
+for _,func in ipairs(t.functions) do
+  local arraySize
+
+  local args = {}
+  local vla = false
+
+  for i,param in ipairs(func.params or {}) do
+    if param.name ~= "" then
+      arraySize = param.name:match "%[(.-)%]"
+      if arraySize then
+        param.name = param.name:match("(%S-)%[.-%]")
+        param.type = string.format("%s[%d]", param.type, arraySize)
+      end
+
+      arraySize = param.name:match "%[(.-)%]"
+      if arraySize then
+        param.name = param.name:match("(%S-)%[.-%]")
+        param.type = string.format("%s[%d]", luaify(param.type), arraySize)
+      end
+
+      print(string.format('---@param %s %s', param.name, luaify(param.type)))
+
+      args[#args + 1] = param.name
+    else
+      vla = true
+    end
+  end
+
+  if func.returnType and func.returnType ~= "void" then
+    print(string.format('---@return %s', luaify(func.returnType)))
+  end 
+
+  if vla then
+    print "---@vararg any"
+  end
+
+  if func.description ~= "" then
+    print("---" .. func.description)
+  end
+  print(string.format("function rl.%s(%s%s) end", func.name, table.concat(args, ","), vla and ", ..." or ""))
+end
+
+print "---Create a new variable of ffi type `t`"
+for i,t in ipairs(ffi_type_list) do
+  print(string.format([[---@overload fun(t: '"%s"', ...): %s]], t, t))
+end
+print("function rl.new(...) end")

tools/autocomplete/json.lua

@@ -0,0 +1,388 @@
+--
+-- json.lua
+--
+-- Copyright (c) 2020 rxi
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of
+-- this software and associated documentation files (the "Software"), to deal in
+-- the Software without restriction, including without limitation the rights to
+-- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+-- of the Software, and to permit persons to whom the Software is furnished to do
+-- so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in all
+-- copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
+--
+
+local json = { _version = "0.1.2" }
+
+-------------------------------------------------------------------------------
+-- Encode
+-------------------------------------------------------------------------------
+
+local encode
+
+local escape_char_map = {
+  [ "\\" ] = "\\",
+  [ "\"" ] = "\"",
+  [ "\b" ] = "b",
+  [ "\f" ] = "f",
+  [ "\n" ] = "n",
+  [ "\r" ] = "r",
+  [ "\t" ] = "t",
+}
+
+local escape_char_map_inv = { [ "/" ] = "/" }
+for k, v in pairs(escape_char_map) do
+  escape_char_map_inv[v] = k
+end
+
+
+local function escape_char(c)
+  return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte()))
+end
+
+
+local function encode_nil(val)
+  return "null"
+end
+
+
+local function encode_table(val, stack)
+  local res = {}
+  stack = stack or {}
+
+  -- Circular reference?
+  if stack[val] then error("circular reference") end
+
+  stack[val] = true
+
+  if rawget(val, 1) ~= nil or next(val) == nil then
+    -- Treat as array -- check keys are valid and it is not sparse
+    local n = 0
+    for k in pairs(val) do
+      if type(k) ~= "number" then
+        error("invalid table: mixed or invalid key types")
+      end
+      n = n + 1
+    end
+    if n ~= #val then
+      error("invalid table: sparse array")
+    end
+    -- Encode
+    for i, v in ipairs(val) do
+      table.insert(res, encode(v, stack))
+    end
+    stack[val] = nil
+    return "[" .. table.concat(res, ",") .. "]"
+
+  else
+    -- Treat as an object
+    for k, v in pairs(val) do
+      if type(k) ~= "string" then
+        error("invalid table: mixed or invalid key types")
+      end
+      table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
+    end
+    stack[val] = nil
+    return "{" .. table.concat(res, ",") .. "}"
+  end
+end
+
+
+local function encode_string(val)
+  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+end
+
+
+local function encode_number(val)
+  -- Check for NaN, -inf and inf
+  if val ~= val or val <= -math.huge or val >= math.huge then
+    error("unexpected number value '" .. tostring(val) .. "'")
+  end
+  return string.format("%.14g", val)
+end
+
+
+local type_func_map = {
+  [ "nil"     ] = encode_nil,
+  [ "table"   ] = encode_table,
+  [ "string"  ] = encode_string,
+  [ "number"  ] = encode_number,
+  [ "boolean" ] = tostring,
+}
+
+
+encode = function(val, stack)
+  local t = type(val)
+  local f = type_func_map[t]
+  if f then
+    return f(val, stack)
+  end
+  error("unexpected type '" .. t .. "'")
+end
+
+
+function json.encode(val)
+  return ( encode(val) )
+end
+
+
+-------------------------------------------------------------------------------
+-- Decode
+-------------------------------------------------------------------------------
+
+local parse
+
+local function create_set(...)
+  local res = {}
+  for i = 1, select("#", ...) do
+    res[ select(i, ...) ] = true
+  end
+  return res
+end
+
+local space_chars   = create_set(" ", "\t", "\r", "\n")
+local delim_chars   = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
+local escape_chars  = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
+local literals      = create_set("true", "false", "null")
+
+local literal_map = {
+  [ "true"  ] = true,
+  [ "false" ] = false,
+  [ "null"  ] = nil,
+}
+
+
+local function next_char(str, idx, set, negate)
+  for i = idx, #str do
+    if set[str:sub(i, i)] ~= negate then
+      return i
+    end
+  end
+  return #str + 1
+end
+
+
+local function decode_error(str, idx, msg)
+  local line_count = 1
+  local col_count = 1
+  for i = 1, idx - 1 do
+    col_count = col_count + 1
+    if str:sub(i, i) == "\n" then
+      line_count = line_count + 1
+      col_count = 1
+    end
+  end
+  error( string.format("%s at line %d col %d", msg, line_count, col_count) )
+end
+
+
+local function codepoint_to_utf8(n)
+  -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
+  local f = math.floor
+  if n <= 0x7f then
+    return string.char(n)
+  elseif n <= 0x7ff then
+    return string.char(f(n / 64) + 192, n % 64 + 128)
+  elseif n <= 0xffff then
+    return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
+  elseif n <= 0x10ffff then
+    return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
+                       f(n % 4096 / 64) + 128, n % 64 + 128)
+  end
+  error( string.format("invalid unicode codepoint '%x'", n) )
+end
+
+
+local function parse_unicode_escape(s)
+  local n1 = tonumber( s:sub(1, 4),  16 )
+  local n2 = tonumber( s:sub(7, 10), 16 )
+   -- Surrogate pair?
+  if n2 then
+    return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
+  else
+    return codepoint_to_utf8(n1)
+  end
+end
+
+
+local function parse_string(str, i)
+  local res = ""
+  local j = i + 1
+  local k = j
+
+  while j <= #str do
+    local x = str:byte(j)
+
+    if x < 32 then
+      decode_error(str, j, "control character in string")
+
+    elseif x == 92 then -- `\`: Escape
+      res = res .. str:sub(k, j - 1)
+      j = j + 1
+      local c = str:sub(j, j)
+      if c == "u" then
+        local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1)
+                 or str:match("^%x%x%x%x", j + 1)
+                 or decode_error(str, j - 1, "invalid unicode escape in string")
+        res = res .. parse_unicode_escape(hex)
+        j = j + #hex
+      else
+        if not escape_chars[c] then
+          decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string")
+        end
+        res = res .. escape_char_map_inv[c]
+      end
+      k = j + 1
+
+    elseif x == 34 then -- `"`: End of string
+      res = res .. str:sub(k, j - 1)
+      return res, j + 1
+    end
+
+    j = j + 1
+  end
+
+  decode_error(str, i, "expected closing quote for string")
+end
+
+
+local function parse_number(str, i)
+  local x = next_char(str, i, delim_chars)
+  local s = str:sub(i, x - 1)
+  local n = tonumber(s)
+  if not n then
+    decode_error(str, i, "invalid number '" .. s .. "'")
+  end
+  return n, x
+end
+
+
+local function parse_literal(str, i)
+  local x = next_char(str, i, delim_chars)
+  local word = str:sub(i, x - 1)
+  if not literals[word] then
+    decode_error(str, i, "invalid literal '" .. word .. "'")
+  end
+  return literal_map[word], x
+end
+
+
+local function parse_array(str, i)
+  local res = {}
+  local n = 1
+  i = i + 1
+  while 1 do
+    local x
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of array?
+    if str:sub(i, i) == "]" then
+      i = i + 1
+      break
+    end
+    -- Read token
+    x, i = parse(str, i)
+    res[n] = x
+    n = n + 1
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "]" then break end
+    if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
+  end
+  return res, i
+end
+
+
+local function parse_object(str, i)
+  local res = {}
+  i = i + 1
+  while 1 do
+    local key, val
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of object?
+    if str:sub(i, i) == "}" then
+      i = i + 1
+      break
+    end
+    -- Read key
+    if str:sub(i, i) ~= '"' then
+      decode_error(str, i, "expected string for key")
+    end
+    key, i = parse(str, i)
+    -- Read ':' delimiter
+    i = next_char(str, i, space_chars, true)
+    if str:sub(i, i) ~= ":" then
+      decode_error(str, i, "expected ':' after key")
+    end
+    i = next_char(str, i + 1, space_chars, true)
+    -- Read value
+    val, i = parse(str, i)
+    -- Set
+    res[key] = val
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "}" then break end
+    if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
+  end
+  return res, i
+end
+
+
+local char_func_map = {
+  [ '"' ] = parse_string,
+  [ "0" ] = parse_number,
+  [ "1" ] = parse_number,
+  [ "2" ] = parse_number,
+  [ "3" ] = parse_number,
+  [ "4" ] = parse_number,
+  [ "5" ] = parse_number,
+  [ "6" ] = parse_number,
+  [ "7" ] = parse_number,
+  [ "8" ] = parse_number,
+  [ "9" ] = parse_number,
+  [ "-" ] = parse_number,
+  [ "t" ] = parse_literal,
+  [ "f" ] = parse_literal,
+  [ "n" ] = parse_literal,
+  [ "[" ] = parse_array,
+  [ "{" ] = parse_object,
+}
+
+
+parse = function(str, idx)
+  local chr = str:sub(idx, idx)
+  local f = char_func_map[chr]
+  if f then
+    return f(str, idx)
+  end
+  decode_error(str, idx, "unexpected character '" .. chr .. "'")
+end
+
+
+function json.decode(str)
+  if type(str) ~= "string" then
+    error("expected argument of type string, got " .. type(str))
+  end
+  local res, idx = parse(str, next_char(str, 1, space_chars, true))
+  idx = next_char(str, idx, space_chars, true)
+  if idx <= #str then
+    decode_error(str, idx, "trailing garbage")
+  end
+  return res
+end
+
+
+return json