Merge pull request #104 from ydah/feature-embed-include

Change to automatically insert `#include` of header files when they are specified
ruby · Oct 17, 2023 · da4a6cd · da4a6cd
2 parents 21e405a + 71b82bc
commit da4a6cd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/lrama/output.rb b/lib/lrama/output.rb
@@ -7,7 +7,7 @@ class Output
  extend Forwardable
  include Report::Duration
 
- attr_reader :grammar_file_path, :context, :grammar, :error_recovery
+ attr_reader :grammar_file_path, :context, :grammar, :error_recovery, :include_header
 
  def_delegators "@context", :yyfinal, :yylast, :yyntokens, :yynnts, :yynrules, :yynstates,
  :yymaxutok, :yypact_ninf, :yytable_ninf
@@ -28,6 +28,7 @@ def initialize(
  @context = context
  @grammar = grammar
  @error_recovery = error_recovery
+ @include_header = header_file_path ? header_file_path.sub("./", "") : nil
  end
 
  if ERB.instance_method(:initialize).parameters.last.first == :key

diff --git a/sample/calc.y b/sample/calc.y
@@ -16,8 +16,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "calc.h"
-
 static int yylex(YYSTYPE *val, YYLTYPE *loc);
 static int yyerror(YYLTYPE *loc, const char *str);
 %}

diff --git a/sample/parse.y b/sample/parse.y
@@ -4,9 +4,6 @@
 
 %{
 // Prologue
-
-#include "y.tab.h"
-
 static enum yytokentype yylex(YYSTYPE *lval, YYLTYPE *yylloc);
 static void yyerror(YYLTYPE *yylloc, const char *msg);
 

diff --git a/template/bison/yacc.c b/template/bison/yacc.c
@@ -101,8 +101,12 @@
 # endif
 
 <%# b4_header_include_if -%>
+<%- if output.include_header -%>
+#include "<%= output.include_header %>"
+<%- else -%>
 /* Use api.header.include to #include this header
  instead of duplicating it here. */
+<%- end -%>
 <%# b4_shared_declarations -%>
  <%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
  <%- if output.spec_mapped_header_file -%>