admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build for C++ version >= C++11 when enable_cxx_exception; close #5199

Browse Source
This commit is contained in:
KOBAYASHI Shuji
2020-12-02 19:15:42 +09:00
parent 661081a072
commit 00df809609
4 changed files with 1700 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/keywords
+5
View File
@@ -1,4 +1,9 @@
%{
/* Workaround for `enable_cxx_exception` (#5199) */
#if defined __cplusplus && __cplusplus >= 201103L
# define register
#endif
struct kwtable {const char *name; int id[2]; enum mrb_lex_state_enum state;};
%}
mrbgems/mruby-compiler/core/lex.def
+49 -44
View File
@@ -1,5 +1,5 @@
/* ANSI-C code produced by gperf version 3.1 */
/* Command-line: gperf -L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k'1,3,$' /home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords */
/* Command-line: gperf -L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k'1,3,$' mrbgems/mruby-compiler/core/keywords */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,10 +28,15 @@
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
#endif
#line 1 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 1 "mrbgems/mruby-compiler/core/keywords"
/* Workaround for `enable_cxx_exception` (#5199) */
#if defined __cplusplus && __cplusplus >= 201103L
# define register
#endif
struct kwtable {const char *name; int id[2]; enum mrb_lex_state_enum state;};
#line 5 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 10 "mrbgems/mruby-compiler/core/keywords"
struct kwtable;
#define TOTAL_KEYWORDS 40
@@ -101,87 +106,87 @@ mrb_reserved_word (register const char *str, register size_t len)
static const struct kwtable wordlist[] =
{
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 15 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 20 "mrbgems/mruby-compiler/core/keywords"
{"break", {keyword_break, keyword_break}, EXPR_MID},
#line 20 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 25 "mrbgems/mruby-compiler/core/keywords"
{"else", {keyword_else, keyword_else}, EXPR_BEG},
#line 30 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 35 "mrbgems/mruby-compiler/core/keywords"
{"nil", {keyword_nil, keyword_nil}, EXPR_END},
#line 23 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 28 "mrbgems/mruby-compiler/core/keywords"
{"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
#line 22 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 27 "mrbgems/mruby-compiler/core/keywords"
{"end", {keyword_end, keyword_end}, EXPR_END},
#line 39 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 44 "mrbgems/mruby-compiler/core/keywords"
{"then", {keyword_then, keyword_then}, EXPR_BEG},
#line 31 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 36 "mrbgems/mruby-compiler/core/keywords"
{"not", {keyword_not, keyword_not}, EXPR_ARG},
#line 24 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 29 "mrbgems/mruby-compiler/core/keywords"
{"false", {keyword_false, keyword_false}, EXPR_END},
#line 37 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 42 "mrbgems/mruby-compiler/core/keywords"
{"self", {keyword_self, keyword_self}, EXPR_END},
#line 21 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 26 "mrbgems/mruby-compiler/core/keywords"
{"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
#line 34 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 39 "mrbgems/mruby-compiler/core/keywords"
{"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
#line 40 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 45 "mrbgems/mruby-compiler/core/keywords"
{"true", {keyword_true, keyword_true}, EXPR_END},
#line 43 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 48 "mrbgems/mruby-compiler/core/keywords"
{"until", {keyword_until, modifier_until}, EXPR_VALUE},
#line 42 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 47 "mrbgems/mruby-compiler/core/keywords"
{"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
#line 36 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 41 "mrbgems/mruby-compiler/core/keywords"
{"return", {keyword_return, keyword_return}, EXPR_MID},
#line 18 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 23 "mrbgems/mruby-compiler/core/keywords"
{"def", {keyword_def, keyword_def}, EXPR_FNAME},
#line 13 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 18 "mrbgems/mruby-compiler/core/keywords"
{"and", {keyword_and, keyword_and}, EXPR_VALUE},
#line 19 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 24 "mrbgems/mruby-compiler/core/keywords"
{"do", {keyword_do, keyword_do}, EXPR_BEG},
#line 46 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 51 "mrbgems/mruby-compiler/core/keywords"
{"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
#line 25 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 30 "mrbgems/mruby-compiler/core/keywords"
{"for", {keyword_for, keyword_for}, EXPR_VALUE},
#line 41 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 46 "mrbgems/mruby-compiler/core/keywords"
{"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
#line 32 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 37 "mrbgems/mruby-compiler/core/keywords"
{"or", {keyword_or, keyword_or}, EXPR_VALUE},
#line 27 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 32 "mrbgems/mruby-compiler/core/keywords"
{"in", {keyword_in, keyword_in}, EXPR_VALUE},
#line 44 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 49 "mrbgems/mruby-compiler/core/keywords"
{"when", {keyword_when, keyword_when}, EXPR_VALUE},
#line 35 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 40 "mrbgems/mruby-compiler/core/keywords"
{"retry", {keyword_retry, keyword_retry}, EXPR_END},
#line 26 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 31 "mrbgems/mruby-compiler/core/keywords"
{"if", {keyword_if, modifier_if}, EXPR_VALUE},
#line 16 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 21 "mrbgems/mruby-compiler/core/keywords"
{"case", {keyword_case, keyword_case}, EXPR_VALUE},
#line 33 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 38 "mrbgems/mruby-compiler/core/keywords"
{"redo", {keyword_redo, keyword_redo}, EXPR_END},
#line 29 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 34 "mrbgems/mruby-compiler/core/keywords"
{"next", {keyword_next, keyword_next}, EXPR_MID},
#line 38 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 43 "mrbgems/mruby-compiler/core/keywords"
{"super", {keyword_super, keyword_super}, EXPR_ARG},
#line 28 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 33 "mrbgems/mruby-compiler/core/keywords"
{"module", {keyword_module, keyword_module}, EXPR_VALUE},
#line 14 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 19 "mrbgems/mruby-compiler/core/keywords"
{"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
#line 9 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 14 "mrbgems/mruby-compiler/core/keywords"
{"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
#line 8 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 13 "mrbgems/mruby-compiler/core/keywords"
{"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
#line 7 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 12 "mrbgems/mruby-compiler/core/keywords"
{"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
#line 11 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 16 "mrbgems/mruby-compiler/core/keywords"
{"END", {keyword_END, keyword_END}, EXPR_END},
#line 12 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 17 "mrbgems/mruby-compiler/core/keywords"
{"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
#line 10 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 15 "mrbgems/mruby-compiler/core/keywords"
{"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
{""},
#line 17 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 22 "mrbgems/mruby-compiler/core/keywords"
{"class", {keyword_class, keyword_class}, EXPR_CLASS},
{""}, {""},
#line 45 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 50 "mrbgems/mruby-compiler/core/keywords"
{"while", {keyword_while, modifier_while}, EXPR_VALUE}
};
@@ -199,5 +204,5 @@ mrb_reserved_word (register const char *str, register size_t len)
}
return 0;
}
#line 47 "/home/matz/work/mruby/mrbgems/mruby-compiler/core/keywords"
#line 52 "mrbgems/mruby-compiler/core/keywords"
mrbgems/mruby-compiler/core/y.tab.c
+1636 -1252
View File
File diff suppressed because it is too large Load Diff
mrbgems/mruby-compiler/mrbgem.rake
+10 -2
View File
@@ -21,15 +21,23 @@ MRuby::Gem::Specification.new 'mruby-compiler' do |spec|
# Parser
file "#{dir}/core/y.tab.c" => ["#{dir}/core/parse.y", lex_def] do |t|
yacc.run t.name, t.prerequisites.first
content = File.read(t.name).gsub(/^#line +\d+ +"\K.*$/){$&.relative_path}
File.write(t.name, content)
replace_line_directive(t.name)
end
# Lexical analyzer
file lex_def => "#{dir}/core/keywords" do |t|
gperf.run t.name, t.prerequisites.first
replace_line_directive(t.name)
end
file build.libmruby_core_static => core_objs
build.libmruby << core_objs
def replace_line_directive(path)
content = File.read(path).gsub(%r{
^\#line\s+\d+\s+"\K.*$ | # #line directive
^/\*\s+Command-line:.*\s\K\S+(?=\s+\*/$) # header comment in lex.def
}x, &:relative_path)
File.write(path, content)
end
end