diff options
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rw-r--r-- | build_config/ci/gcc-clang.rb | 2 | ||||
| -rw-r--r-- | build_config/ci/msvc.rb | 4 | ||||
| -rw-r--r-- | include/mruby/presym.h | 4 | ||||
| -rw-r--r-- | include/mruby/presym/scanning.h | 5 |
7 files changed, 18 insertions, 15 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60aa438a2..5e530ae5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: - name: Build and test # If build and test are separated like `rake && rake test`, somehow # it will be fully built even at `rake test`, so it is not separated. - run: rake -E STDOUT.sync=true test + run: rake test Windows-Cygwin: needs: Check-Skip @@ -130,9 +130,7 @@ jobs: run: ${{ env.CC }} --version - name: Build and test shell: cmd - run: | - ruby /usr/bin/rake -E STDOUT.sync=true -m - ruby /usr/bin/rake -E STDOUT.sync=true test + run: ruby /usr/bin/rake -m && ruby /usr/bin/rake test - name: Set PATH for cache archiving (tar) # set Windows path so that Cygwin tar is not used for cache archiving run: echo '::set-env name=PATH::C:\windows\System32' @@ -150,4 +148,4 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - rake -E STDOUT.sync=true -m && rake -E STDOUT.sync=true test + rake -m && rake test diff --git a/.travis.yml b/.travis.yml index f3ed6a73e..1e09654be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,9 @@ language: c jobs: - os: linux - os: osx - before_install: - - HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install bison - - export PATH="/usr/local/opt/bison/bin:$PATH" env: - MRUBY_CONFIG=ci/gcc-clang script: - - rake gensym && rake -m && rake test + - rake -m && rake test diff --git a/appveyor.yml b/appveyor.yml index d05696e69..227d7898e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,5 @@ init: build_script: - set MRUBY_CONFIG=ci/msvc - - rake gensym - - rake -m all - - rake -E $stdout.sync=true test + - rake -m + - rake test diff --git a/build_config/ci/gcc-clang.rb b/build_config/ci/gcc-clang.rb index 7da8c1bf4..e3ef1ad53 100644 --- a/build_config/ci/gcc-clang.rb +++ b/build_config/ci/gcc-clang.rb @@ -1,3 +1,5 @@ +STDOUT.sync = STDERR.sync = true + MRuby::Build.new('full-debug') do |conf| conf.toolchain conf.enable_debug diff --git a/build_config/ci/msvc.rb b/build_config/ci/msvc.rb index 2df2d4864..801b5fcb5 100644 --- a/build_config/ci/msvc.rb +++ b/build_config/ci/msvc.rb @@ -1,3 +1,5 @@ +STDOUT.sync = STDERR.sync = true + def setup_option(conf) conf.cc.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS'] conf.cxx.compile_options.sub!(%r{/Zi }, "") unless ENV['CFLAGS'] || ENV['CXXFLAGS'] @@ -5,7 +7,7 @@ def setup_option(conf) end MRuby::Build.new do |conf| - toolchain :visualcpp + conf.toolchain :visualcpp # include all core GEMs conf.gembox 'full-core' diff --git a/include/mruby/presym.h b/include/mruby/presym.h index fd326c758..d5ed72e72 100644 --- a/include/mruby/presym.h +++ b/include/mruby/presym.h @@ -29,8 +29,8 @@ * MRB_SYM(xor) //=> xor (Word characters) * * For `MRB_OPSYM`, specify the names corresponding to operators (see - * `MRuby::Presym::OPERATORS` in `lib/mruby/presym.rb for the names that can - * be specified for it). Other than that, describe only word characters + * `MRuby::Presym::OPERATORS` in `lib/mruby/presym.rb` for the names that + * can be specified for it). Other than that, describe only word characters * excluding leading and ending punctuations. * * These macros are expanded to `mrb_intern_lit` if presym is disabled, diff --git a/include/mruby/presym/scanning.h b/include/mruby/presym/scanning.h index 11a3ba312..0a9844913 100644 --- a/include/mruby/presym/scanning.h +++ b/include/mruby/presym/scanning.h @@ -11,14 +11,19 @@ #undef mrb_intern_lit #define mrb_intern_lit(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name) +#define mrb_intern_cstr(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_method(mrb, c, name, f, a) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_class_method(mrb, c, name, f, a) MRB_PRESYM_SCANNING_TAGGED(name) +#define mrb_define_singleton_method(mrb, c, name, f, a) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_class(mrb, name, s) MRB_PRESYM_SCANNING_TAGGED(name) +#define mrb_define_class_under(mrb, o, name, s) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_module(mrb, name) MRB_PRESYM_SCANNING_TAGGED(name) +#define mrb_define_module_under(mrb, o, name) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_module_function(mrb, c, name, f, s) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_const(mrb, c, name, v) MRB_PRESYM_SCANNING_TAGGED(name) #define mrb_define_global_const(mrb, name, v) MRB_PRESYM_SCANNING_TAGGED(name) + #define MRB_OPSYM(name) MRB_OPSYM__##name(mrb) #define MRB_CVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@@" #name) #define MRB_IVSYM(name) MRB_PRESYM_SCANNING_TAGGED("@" #name) |