updated to a new structure

Author: iliabylich

.depend

@@ -1,101 +1,75 @@
-target/debug/byte_ptr.o: src/byte_ptr.cpp src/byte_ptr.h
-
-target/debug/bytes.o: src/bytes.cpp src/bytes.h src/byte_ptr.h
-
-target/debug/comment.o: src/comment.cpp src/comment.h src/comment_type.h \
-  src/loc.h src/bytes.h src/byte_ptr.h src/input.h
-
-target/debug/custom_decoder.o: src/custom_decoder.cpp \
-  src/custom_decoder.h src/bytes.h src/byte_ptr.h
-
-target/debug/diagnostic.o: src/diagnostic.cpp src/diagnostic.h \
-  src/error_level.h src/bytes.h src/byte_ptr.h src/loc.h src/input.h \
-  src/message.h src/gen/messages/variant.h src/gen/messages/classes.h \
-  src/gen/messages/../../bytes.h
-
-target/debug/input.o: src/input.cpp src/input.h src/bytes.h \
-  src/byte_ptr.h
-
-target/debug/loc.o: src/loc.cpp src/loc.h src/bytes.h src/byte_ptr.h \
-  src/input.h
-
-target/debug/low_level.o: src/low_level.cpp src/low_level.h \
-  src/gen/nodes/make.h src/gen/nodes/../../byte_ptr.h \
-  src/gen/nodes/../../node.h src/gen/nodes/variant.h \
-  src/gen/nodes/classes.h src/gen/nodes/../../loc.h src/bytes.h \
-  src/byte_ptr.h src/input.h src/gen/nodes/../../bytes.h \
-  src/gen/messages/make.h src/gen/messages/../../error_level.h \
-  src/gen/messages/../../byte_ptr.h src/comment_type.h src/error_level.h \
-  src/magic_comment_kind.h src/comment.h src/loc.h src/custom_decoder.h \
-  src/token.h src/diagnostic.h src/message.h src/gen/messages/variant.h \
-  src/gen/messages/classes.h src/gen/messages/../../bytes.h \
-  src/magic_comment.h src/parser_options.h src/token_rewriter.h \
-  src/parser_result.h src/node.h
-
-target/debug/magic_comment.o: src/magic_comment.cpp src/magic_comment.h \
-  src/magic_comment_kind.h src/loc.h src/bytes.h src/byte_ptr.h \
-  src/input.h
-
-target/debug/message.o: src/message.cpp src/message.h \
-  src/gen/messages/variant.h src/gen/messages/classes.h \
-  src/gen/messages/../../bytes.h src/byte_ptr.h
-
-target/debug/node.o: src/node.cpp src/node.h src/gen/nodes/variant.h \
-  src/gen/nodes/classes.h src/gen/nodes/../../loc.h src/bytes.h \
-  src/byte_ptr.h src/input.h src/gen/nodes/../../bytes.h \
-  src/gen/nodes/../../node.h
-
-target/debug/parser_options.o: src/parser_options.cpp \
-  src/parser_options.h src/custom_decoder.h src/bytes.h src/byte_ptr.h \
-  src/token_rewriter.h src/token.h src/loc.h src/input.h
-
-target/debug/parser_result.o: src/parser_result.cpp src/parser_result.h \
-  src/bytes.h src/byte_ptr.h src/node.h src/gen/nodes/variant.h \
-  src/gen/nodes/classes.h src/gen/nodes/../../loc.h src/input.h \
-  src/gen/nodes/../../bytes.h src/gen/nodes/../../node.h src/token.h \
-  src/loc.h src/diagnostic.h src/error_level.h src/message.h \
-  src/gen/messages/variant.h src/gen/messages/classes.h \
-  src/gen/messages/../../bytes.h src/comment.h src/comment_type.h \
-  src/magic_comment.h src/magic_comment_kind.h src/parser_options.h \
-  src/custom_decoder.h src/token_rewriter.h
-
-target/debug/token.o: src/token.cpp src/token.h src/bytes.h \
-  src/byte_ptr.h src/loc.h src/input.h
-
-target/debug/token_rewriter.o: src/token_rewriter.cpp \
-  src/token_rewriter.h src/token.h src/bytes.h src/byte_ptr.h src/loc.h \
-  src/input.h
-
-target/debug/gen/messages/classes.o: src/gen/messages/classes.cpp \
-  src/gen/messages/classes.h src/gen/messages/../../bytes.h \
-  src/gen/messages/../../byte_ptr.h
-
-target/debug/gen/messages/make.o: src/gen/messages/make.cpp \
-  src/gen/messages/make.h src/gen/messages/../../error_level.h \
-  src/gen/messages/../../byte_ptr.h src/gen/messages/variant.h \
-  src/gen/messages/classes.h src/gen/messages/../../bytes.h \
-  src/gen/messages/../../message.h \
-  src/gen/messages/../../gen/messages/variant.h \
-  src/gen/messages/../../loc.h src/gen/messages/../../input.h \
-  src/gen/messages/../../diagnostic.h
-
-target/debug/gen/messages/render.o: src/gen/messages/render.cpp \
-  src/gen/messages/render.h src/gen/messages/../../error_level.h \
-  src/gen/messages/../../byte_ptr.h src/gen/messages/../../diagnostic.h \
-  src/gen/messages/../../bytes.h src/gen/messages/../../loc.h \
-  src/gen/messages/../../input.h src/gen/messages/../../message.h \
-  src/gen/messages/../../gen/messages/variant.h \
-  src/gen/messages/classes.h
-
-target/debug/gen/nodes/classes.o: src/gen/nodes/classes.cpp \
-  src/gen/nodes/classes.h src/gen/nodes/../../loc.h \
-  src/gen/nodes/../../bytes.h src/gen/nodes/../../byte_ptr.h \
-  src/gen/nodes/../../input.h src/gen/nodes/../../node.h \
-  src/gen/nodes/../../gen/nodes/variant.h
-
-target/debug/gen/nodes/make.o: src/gen/nodes/make.cpp \
-  src/gen/nodes/make.h src/gen/nodes/../../byte_ptr.h \
-  src/gen/nodes/../../node.h src/gen/nodes/../../gen/nodes/variant.h \
-  src/gen/nodes/classes.h src/gen/nodes/../../loc.h \
-  src/gen/nodes/../../bytes.h src/gen/nodes/../../input.h
+
+alloc.o: alloc.cpp alloc.hpp
+
+api.o: api.cpp api.hpp parser_options.hpp string.hpp decoder.hpp \
+  bytes.hpp token_rewriter.hpp token.hpp loc.hpp decoded_input.hpp \
+  source_line.hpp token_ids.hpp shared_byte_list.hpp parser_result.hpp \
+  nodes.hpp diagnostic.hpp messages.hpp comment.hpp magic_comment.hpp \
+  utils.hpp test_helper.hpp
+
+blobs.o: blobs.cpp
+
+bytes.o: bytes.cpp bytes.hpp utils.hpp test_helper.hpp
+
+comment.o: comment.cpp utils.hpp comment.hpp loc.hpp decoded_input.hpp \
+  string.hpp source_line.hpp bytes.hpp test_helper.hpp
+
+decoded_input.o: decoded_input.cpp utils.hpp decoded_input.hpp string.hpp \
+  source_line.hpp bytes.hpp test_helper.hpp
+
+decoder.o: decoder.cpp decoder.hpp string.hpp bytes.hpp utils.hpp \
+  test_helper.hpp
+
+diagnostic.o: diagnostic.cpp diagnostic.hpp messages.hpp string.hpp \
+  loc.hpp decoded_input.hpp source_line.hpp bytes.hpp utils.hpp \
+  test_helper.hpp
+
+loc.o: loc.cpp utils.hpp loc.hpp decoded_input.hpp string.hpp \
+  source_line.hpp bytes.hpp test_helper.hpp
+
+magic_comment.o: magic_comment.cpp magic_comment.hpp loc.hpp \
+  decoded_input.hpp string.hpp source_line.hpp bytes.hpp utils.hpp \
+  test_helper.hpp
+
+messages.o: messages.cpp messages.hpp string.hpp utils.hpp \
+  test_helper.hpp
+
+nodes.o: nodes.cpp nodes.hpp string.hpp loc.hpp decoded_input.hpp \
+  source_line.hpp bytes.hpp utils.hpp test_helper.hpp
+
+parser_options.o: parser_options.cpp parser_options.hpp string.hpp \
+  decoder.hpp bytes.hpp token_rewriter.hpp token.hpp loc.hpp \
+  decoded_input.hpp source_line.hpp token_ids.hpp shared_byte_list.hpp \
+  utils.hpp test_helper.hpp
+
+parser_result.o: parser_result.cpp parser_result.hpp nodes.hpp string.hpp \
+  loc.hpp decoded_input.hpp source_line.hpp bytes.hpp token.hpp \
+  token_ids.hpp diagnostic.hpp messages.hpp comment.hpp \
+  magic_comment.hpp utils.hpp test_helper.hpp
+
+shared_byte_list.o: shared_byte_list.cpp shared_byte_list.hpp \
+  test_helper.hpp
+
+source_line.o: source_line.cpp source_line.hpp utils.hpp test_helper.hpp
+
+string.o: string.cpp string.hpp utils.hpp test_helper.hpp
+
+test_helper.o: test_helper.cpp test_helper.hpp
+
+token.o: token.cpp token.hpp bytes.hpp loc.hpp decoded_input.hpp \
+  string.hpp source_line.hpp token_ids.hpp utils.hpp test_helper.hpp
+
+token_rewriter.o: token_rewriter.cpp token_rewriter.hpp token.hpp \
+  bytes.hpp loc.hpp decoded_input.hpp string.hpp source_line.hpp \
+  token_ids.hpp shared_byte_list.hpp utils.hpp test_helper.hpp
+
+tests/runner: tests/test.cpp tests/../test_helper.hpp tests/../bytes.hpp \
+  tests/../comment.hpp tests/../loc.hpp tests/../decoded_input.hpp \
+  tests/../string.hpp tests/../source_line.hpp tests/../decoder.hpp \
+  tests/../diagnostic.hpp tests/../messages.hpp \
+  tests/../magic_comment.hpp tests/../nodes.hpp \
+  tests/../parser_options.hpp tests/../token_rewriter.hpp \
+  tests/../token.hpp tests/../token_ids.hpp \
+  tests/../shared_byte_list.hpp tests/../parser_result.hpp \
+  tests/../api.hpp
 

.github/workflows/test.yml

@@ -11,74 +11,79 @@ env:
 
 jobs:
   test:
-    name: ${{matrix.build.name}}
+    name: ${{ matrix.build.name }}
     runs-on: ${{ matrix.build.os }}
     env:
-      CARGO_BUILD_TARGET: ${{ matrix.build.target }}
-      CC: ${{ matrix.build.cc }}
+      BUILD_ENV: debug
+      TARGET: ${{ matrix.build.target }}
       CXX: ${{ matrix.build.cxx }}
       LD: ${{ matrix.build.ld }}
-      CARGOFLAGS: ${{ matrix.build.cargoflags }}
+      AR: ${{ matrix.build.ar }}
     strategy:
       fail-fast: false
       matrix:
         build:
-          - os: ubuntu-latest
+          - name: test on linux (clang)
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            cc: clang-9
-            cxx: clang++-9
-            ld: ld.lld-9
-            cargoflags: --features="generate-bindings,onig"
-            name: valgrind
-            run: make clean test-valgrind
+            cxx: clang++-12
+            ld: ld.lld-12
+            ar: llvm-ar-12
+            run: make tests/run
 
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            cc: clang-9
-            cxx: clang++-9
-            ld: ld.lld-9
-            cargoflags: --features="generate-bindings,onig"
-            name: asan
-            run: CXXFLAGS="-fsanitize=address" make clean test
-
-          - os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            cc: clang-9
-            cxx: clang++-9
-            ld: ld.lld-9
-            cargoflags: --features="generate-bindings,onig"
-            name: test on linux
-            run: make clean test
-
-          - os: macos-latest
+          - name: test on mac (clang)
+            os: macos-latest
             target: x86_64-apple-darwin
-            cc: clang
             cxx: clang++
             ld: ld
-            cargoflags: --features="generate-bindings,onig"
-            name: test on mac
-            run: make clean test
+            ar: ar
+            run: |
+              $CC --version
+              make tests/run
 
-          - os: windows-latest
+          - name: test on windows (msvc)
+            os: windows-latest
             target: x86_64-pc-windows-msvc
-            cc: cl.exe
             cxx: cl.exe
             ld: link.exe
-            cargoflags: ""
-            name: test on windows
-            run: make clean test
+            run: |
+              make tests/run
+
+          - name: test on windows (mingw)
+            os: windows-latest
+            target: x86_64-pc-windows-gnu
+            cxx: g++
+            ld: ld
+            ar: ar
+            run: |
+              gcc --version
+              make tests/run
+
+          - name: valgrind
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            cxx: clang++-12
+            ld: ld.lld-12
+            ar: llvm-ar-12
+            run: |
+              sudo apt-get update
+              sudo apt-get install -y valgrind libtool-bin
+              make tests/runner
+              valgrind ./tests/runner
+
+          - name: asan
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            cxx: clang++-12
+            ld: ld.lld-12
+            ar: llvm-ar-12
+            run: ASAN_OPTIONS=detect_leaks=1 CXXFLAGS="-fsanitize=address" make tests/run
 
     steps:
       - name: setup msvc on windows
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: fix linker on windows
-        if: runner.os == 'Windows'
-        run: |
-          rm "C:\\Program Files\\Git\\usr\\bin\\link.exe"
-          which -a link.exe
-
       - name: install rust
         uses: actions-rs/toolchain@v1
         with:
@@ -87,15 +92,18 @@ jobs:
           target: ${{ matrix.build.target }}
           override: true
 
+      - name: print rustc detailed version
+        run: rustc --version --verbose
+
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: install valgrind
-        if: runner.os == 'Linux'
+      - name: codegen
+        env:
+          RUSTFLAGS: ""
         run: |
-          sudo apt-get update
-          sudo apt-get install -y valgrind
+          make do-codegen
+          make token_ids.h
 
       - name: run tests
-        shell: bash
         run: ${{ matrix.build.run }}

.gitignore

@@ -1,3 +1,24 @@
-target/
-lib-ruby-parser-cpp-bindings/target
-lib-ruby-parser-cpp-bindings/Cargo.lock
+ruby-parser-cpp/src/message.rs
+ruby-parser-cpp/src/node.rs
+ruby-parser-cpp/target
+ruby-parser-cpp/Cargo.lock
+codegen/Cargo.lock
+lib-ruby-parser.hpp
+messages.hpp
+messages.cpp
+nodes.hpp
+nodes.cpp
+token_ids.hpp
+target
+*.o
+*.a
+*.dSYM
+tests/runner
+benchmark/repos.zip
+benchmark/rust-parser
+benchmark/ruby-parser.rb
+benchmark/repos
+benchmark/c-parser
+benchmark/filelist
+benchmark/stats
+*.benchmark-out