add codegen for lib-ruby-parser.hpp

Author: iliabylich

.depend

@@ -7,8 +7,6 @@ api.o: api.cpp api.hpp parser_options.hpp string.hpp decoder.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 \

.github/workflows/test.yml

@@ -97,3 +97,25 @@ jobs:
 
       - name: run tests
         run: ${{ matrix.build.run }}
+
+  test-header:
+    name: test building lib-ruby-parser.hpp
+    runs-on: ubuntu-latest
+    env:
+      TARGET: x86_64-unknown-linux-gnu
+    steps:
+      - name: install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: build lib-ruby-parser.hpp
+        run: make lib-ruby-parser.hpp
+
+      - name: validate lib-ruby-parser.hpp
+        run: clang++ -fsyntax-only -Wall -Wextra -Wpedantic lib-ruby-parser.hpp

api.cpp

@@ -21,7 +21,7 @@ namespace lib_ruby_parser
     }
 }
 
-// #ifdef TEST_ENV
+#ifdef TEST_ENV
 
 #include "test_helper.hpp"
 
@@ -58,4 +58,4 @@ namespace lib_ruby_parser
     }
 }
 
-// #endif
+#endif

api.hpp

@@ -12,9 +12,9 @@ namespace lib_ruby_parser
     */
     ParserResult parse(ParserOptions options, ByteList input);
 
-    // #ifdef TEST_ENV
+#ifdef TEST_ENV
     void run_test_group_api(void);
-    // #endif
-}
+#endif
+} // namespace lib_ruby_parser
 
 #endif // LIB_RUBY_PARSER_API_HPP

bytes.cpp

@@ -28,7 +28,7 @@ namespace lib_ruby_parser
     Bytes::Bytes(ByteList raw_) : raw(std::move(raw_)) {}
 } // namespace lib_ruby_parser
 
-// #ifdef TEST_ENV
+#ifdef TEST_ENV
 
 #include "test_helper.hpp"
 #include <cstdlib>
@@ -94,4 +94,4 @@ namespace lib_ruby_parser
 
 }
 
-// #endif
+#endif

bytes.hpp

@@ -48,9 +48,9 @@ namespace lib_ruby_parser
         Bytes &operator=(Bytes &&) = default;
     };
 
-    // #ifdef TEST_ENV
+#ifdef TEST_ENV
     void run_test_group_bytes(void);
-    // #endif
+#endif
 
 } // namespace lib_ruby_parser
 

codegen/build.mk

@@ -12,21 +12,21 @@ CODEGEN_DEPS += codegen/build.rs
 DO_CODEGEN = cd codegen && cargo build
 
 # Codegen deps
-messages.c: $(CODEGEN_DEPS)
+messages.cpp: $(CODEGEN_DEPS)
 	$(DO_CODEGEN)
-CLEAN += messages.c
+CLEAN += messages.cpp
 
-messages.h: $(CODEGEN_DEPS)
+messages.hpp: $(CODEGEN_DEPS)
 	$(DO_CODEGEN)
-CLEAN += messages.h
+CLEAN += messages.hpp
 
-nodes.c: $(CODEGEN_DEPS)
+nodes.cpp: $(CODEGEN_DEPS)
 	$(DO_CODEGEN)
-CLEAN += nodes.c
+CLEAN += nodes.cpp
 
-nodes.h: $(CODEGEN_DEPS)
+nodes.hpp: $(CODEGEN_DEPS)
 	$(DO_CODEGEN)
-CLEAN += nodes.h
+CLEAN += nodes.hpp
 
 ruby-parser-c/src/node.rs: $(CODEGEN_DEPS)
 	$(DO_CODEGEN)
@@ -48,8 +48,7 @@ update-depend: token_ids.hpp
 lib-ruby-parser.hpp: codegen/examples/merge_headers.rs $(HPP_FILES) token_ids.hpp
 	cargo run --example merge_headers --manifest-path codegen/Cargo.toml
 CLEAN += lib-ruby-parser.hpp
-# update-depend: lib-ruby-parser.hpp
-# FIXME
+update-depend: lib-ruby-parser.hpp
 
 # manual codegen task
 do-codegen:

codegen/codegen/messages_cpp.rs

@@ -63,7 +63,7 @@ namespace lib_ruby_parser
 {{ end }}
 } // namespace lib_ruby_parser
 
-// #ifdef TEST_ENV
+#ifdef TEST_ENV
 
 #include \"test_helper.hpp\"
 
@@ -133,7 +133,7 @@ namespace lib_ruby_parser {
     }
 }
 
-// #endif
+#endif
 ";
 
 pub(crate) fn codegen() {

codegen/codegen/messages_hpp.rs

@@ -8,7 +8,8 @@ const TEMPLATE: &str = "#ifndef LIB_RUBY_PARSER_MESSAGES_HPP
 #include <cstdint>
 #include \"string.hpp\"
 
-namespace lib_ruby_parser {
+namespace lib_ruby_parser
+{
 {{ each message }}<dnl>
 {{ helper message-comment }}
     class {{ helper message-camelcase-name }}
@@ -94,10 +95,10 @@ namespace lib_ruby_parser {
         DiagnosticMessageList &operator=(DiagnosticMessageList &&);
     };
 
-    // #ifdef TEST_ENV
+#ifdef TEST_ENV
     void run_test_group_message(void);
-    // #endif
-}
+#endif
+} // namespace lib_ruby_parser
 
 #endif // LIB_RUBY_PARSER_MESSAGES_HPP
 ";

codegen/codegen/nodes_cpp.rs

@@ -47,7 +47,7 @@ namespace lib_ruby_parser
     LIST_IMPL(NodeList, Node, LIB_RUBY_PARSER_drop_node_list);
 } // namespace lib_ruby_parser
 
-// #ifdef TEST_ENV
+#ifdef TEST_ENV
 
 #include \"test_helper.hpp\"
 
@@ -133,7 +133,7 @@ namespace lib_ruby_parser {
     }
 } // namespace lib_ruby_parser
 
-// #endif
+#endif
 ";
 
 pub(crate) fn codegen() {