Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change to automatically insert #include of header files when they are specified #104

Merged
merged 8 commits into from
Oct 17, 2023
Merged

Change to automatically insert #include of header files when they are specified #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8940ca
Change to automatically insert `#include` of header files when they a…
ydah Oct 5, 2023
359ff74
Add NewPerser support
ydah Oct 6, 2023
d306c1d
If already included, change to not add
ydah Oct 6, 2023
dce7785
Fix an error for prologue
ydah Oct 14, 2023
fecb608
Add `--auto-include` option
ydah Oct 14, 2023
9fe8482
Revert changes to old Parser and Lexer
ydah Oct 14, 2023
339c9a2
Add usage for `--auto-include`
ydah Oct 15, 2023
71b82bc
Change yacc.c to automatically add includes and remove --auto-include…
ydah Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/lrama/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions sample/calc.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
%}
Expand Down
3 changes: 0 additions & 3 deletions sample/parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 4 additions & 0 deletions template/bison/yacc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
ydah marked this conversation as resolved.
Show resolved Hide resolved
<%# b4_shared_declarations -%>
<%-# b4_cpp_guard_open([b4_spec_mapped_header_file]) -%>
<%- if output.spec_mapped_header_file -%>
Expand Down