Merge pull request #1 from tobil4sk/update

Update with latest lua-simdjson changes

.github/workflows/ci.yml

@@ -0,0 +1,66 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+ lua:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [linux, macos, macos-arm64]
+ lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
+ include:
+ - os: linux
+ runner: ubuntu-22.04
+ - os: macos
+ runner: macos-13
+ - os: macos-arm64
+ runner: macos-14
+ exclude:
+ - os: macos-arm64
+ lua: luajit=2.0
+ name: ${{ matrix.os }} (${{ matrix.lua }})
+ runs-on: ${{ matrix.runner }}
+ steps:
+ # Checks-out the repository under $GITHUB_WORKSPACE.
+ - uses: actions/checkout@v4
+ - name: Install Lua (${{ matrix.lua }})
+ run: |
+ pip install hererocks
+ hererocks lua_install -r^ --${{ matrix.lua }}
+ env:
+ MACOSX_DEPLOYMENT_TARGET: 11.0
+ - name: Build lua-simdjson
+ run: |
+ source lua_install/bin/activate
+ luarocks make
+ # - name: Run tests
+ # run: |
+ # source lua_install/bin/activate
+ # luarocks install lua-cjson2
+ # luarocks install busted
+ # busted --verbose
+
+ windows:
+ strategy:
+ fail-fast: false
+ matrix:
+ lua: [lua=5.1, lua=5.2, lua=5.3, lua=5.4, luajit=2.0, luajit=2.1]
+ runs-on: windows-2022
+ steps:
+ # Checks-out the repository under $GITHUB_WORKSPACE.
+ - uses: actions/checkout@v4
+ - name: Install Lua (${{ matrix.lua }})
+ run: |
+ pip install hererocks
+ hererocks lua_install -r@3a142ce --${{ matrix.lua }}
+ - name: Build lua-simdjson
+ run: |
+ .\lua_install\bin\activate
+ luarocks make
+ # - name: Run tests
+ # run: |
+ # .\lua_install\bin\activate
+ # luarocks install lua-cjson2
+ # luarocks install busted
+ # busted --verbose

.gitignore

@@ -1,3 +1,6 @@
 test/
 *.so
+*.dll
+*.o
+*.d
 *.src.rock

Makefile

@@ -1,16 +1,41 @@
-SRC = src/hxluasimdjson.cpp src/simdjson.cpp
-INCLUDE = -I$(LUA_INCDIR)
-LIBS_PATH = -L$(LUA_LIBDIR)
-LIBS = -lpthread
-FLAGS = -std=c++11 -Wall $(LIBFLAG) $(CFLAGS)
+OBJ = src/hxluasimdjson.o src/simdjson.o
+CPPFLAGS = -I$(LUA_INCDIR)
+CXXFLAGS = -std=c++11 -Wall $(CFLAGS)
+LDFLAGS = $(LIBFLAG)
+LDLIBS = -lpthread
 
-all: hxsimdjson.so
+ifdef LUA_LIBDIR
+LDLIBS += $(LUA_LIBDIR)/$(LUALIB)
+endif
 
-hxsimdjson.so:
- $(CXX) $(SRC) $(FLAGS) $(INCLUDE) $(LIBS_PATH) $(LIBS) -o $@
+ifeq ($(OS),Windows_NT)
+ LIBEXT = dll
+else
+ UNAME := $(shell uname -s)
+ ifeq ($(findstring MINGW,$(UNAME)),MINGW)
+ LIBEXT = dll
+ else ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
+ LIBEXT = dll
+ else
+ LIBEXT = so
+ endif
+endif
+
+TARGET = hxsimdjson.$(LIBEXT)
+
+all: $(TARGET)
+
+DEP_FILES = $(OBJ:.o=.d)
+-include $(DEP_FILES)
+
+%.o: %.cpp
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MP -c $< -o $@
+
+$(TARGET): $(OBJ)
+ $(CXX) $(LDFLAGS) $^ -o $@ $(LDLIBS)
 
 clean:
- rm *.so
+ rm -f *.$(LIBEXT) src/*.{o,d}
 
-install: hxsimdjson.so
- cp hxsimdjson.so $(INST_LIBDIR)
+install: $(TARGET)
+ cp $(TARGET) $(INST_LIBDIR)

README.md

@@ -1,4 +1,6 @@
-# hx-lua-simdjson (WIP)
+# hx-lua-simdjson
+
+[![Build Status](https://github.com/FourierTransformer/lua-simdjson/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/FourierTransformer/lua-simdjson/actions?query=branch%3Amaster)
 
 A basic haxe-specific lua binding to [simdjson](https://simdjson.org). This
 library is intended to be used only via the Haxe compiler.

hx-lua-simdjson-0.0.1-0.rockspec → hx-lua-simdjson-0.0.5-1.rockspec

@@ -1,15 +1,15 @@
 package="hx-lua-simdjson"
-version="0.0.1-0"
+version="0.0.5-1"
 source = {
- url = "git://github.com/jdonaldson/hx-lua-simdjson",
- tag = "0.0.2"
+ url = "git://github.com/HaxeFoundation/hx-lua-simdjson",
+ tag = "0.0.5"
 }
 description = {
  summary = "This is a simple Haxe-specific Lua binding for simdjson",
  detailed = [[
  This is a Haxe-specific c++ binding to simdjson for parsing JSON very quickly.
  ]],
- homepage = "https://github.com/jdonaldson/hx-lua-simdjson",
+ homepage = "https://github.com/HaxeFoundation/hx-lua-simdjson",
  license = "Apache-2.0"
 }
 dependencies = {
@@ -20,7 +20,6 @@ build = {
  build_variables = {
  CFLAGS="$(CFLAGS)",
  LIBFLAG="$(LIBFLAG)",
- LUA_LIBDIR="$(LUA_LIBDIR)",
  LUA_BINDIR="$(LUA_BINDIR)",
  LUA_INCDIR="$(LUA_INCDIR)",
  LUA="$(LUA)",
@@ -32,4 +31,12 @@ build = {
  INST_LUADIR="$(LUADIR)",
  INST_CONFDIR="$(CONFDIR)",
  },
+ platforms = {
+ windows = {
+ build_variables = {
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUALIB="$(LUALIB)",
+ }
+ }
+ }
 }

hx-lua-simdjson-scm-0.rockspec

@@ -1,15 +1,15 @@
 package="hx-lua-simdjson"
 version="scm-0"
 source = {
- url = "git://github.com/jdonaldson/hx-lua-simdjson",
+ url = "git://github.com/HaxeFoudnation/hx-lua-simdjson",
  tag = "0.0.0"
 }
 description = {
  summary = "This is a simple Haxe-specific Lua binding for simdjson",
  detailed = [[
  This is a Haxe-specific c++ binding to simdjson for parsing JSON very quickly.
  ]],
- homepage = "https://github.com/jdonaldson/hx-lua-simdjson",
+ homepage = "https://github.com/HaxeFoundation/hx-lua-simdjson",
  license = "Apache-2.0"
 }
 dependencies = {
@@ -20,7 +20,6 @@ build = {
  build_variables = {
  CFLAGS="$(CFLAGS)",
  LIBFLAG="$(LIBFLAG)",
- LUA_LIBDIR="$(LUA_LIBDIR)",
  LUA_BINDIR="$(LUA_BINDIR)",
  LUA_INCDIR="$(LUA_INCDIR)",
  LUA="$(LUA)",
@@ -32,4 +31,12 @@ build = {
  INST_LUADIR="$(LUADIR)",
  INST_CONFDIR="$(CONFDIR)",
  },
+ platforms = {
+ windows = {
+ build_variables = {
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUALIB="$(LUALIB)",
+ }
+ }
+ }
 }

jsonexamples/invalid/bool_trailing.json

@@ -0,0 +1 @@
+true trailing

jsonexamples/invalid/nil_token.json

@@ -0,0 +1 @@
+[nil]

jsonexamples/invalid/nil_token_scalar.json

@@ -0,0 +1 @@
+nil

jsonexamples/invalid/nully_token.json

@@ -0,0 +1 @@
+[nully]

jsonexamples/invalid/nully_token_scalar.json

@@ -0,0 +1 @@
+nully

jsonexamples/invalid/nully_trailing.json

@@ -0,0 +1 @@
+nully trailing

jsonexamples/scalars/bool.json

@@ -0,0 +1 @@
+true

jsonexamples/scalars/null.json

@@ -0,0 +1 @@
+null

jsonexamples/scalars/number.json

@@ -0,0 +1 @@
+10

jsonexamples/scalars/string.json

@@ -0,0 +1 @@
+"hello world"