Skip to content

Commit 76d2e1a

Browse files
committed
Squashed 'mruby_test/' changes from 6b122c6..8bad195
8bad195 mrb_get_args should consume argument even when type specifier with bang get nil; fix #3002 6149274 mrb_str_concat() may call VM resursively thus may reallocate VM stack; close #3000 57e30b3 Merge pull request #3001 from zzak/fix-mrbtest-task 1e3da80 Ensure mrbs dependency is maintained for mruby-test 727f248 Merge pull request #2999 from sagmor/better-docs d423849 Tag include/mruby/error.h functions with required mrbgem tag 25c8e95 Revert "Mark core gems with mrbgem tag" e5fbf9d align codedump output for OP_JMP 73fa648 align codedump output for OP_RETURN 48771a3 loop() to return StopIteration#result; [ruby-bugs#11498] 7278fd1 loop may return StopIteration#result; [ruby-bugs#11498] f6c5861 Merge pull request #2997 from furunkel/gc_cleanup b41f118 fixed SEGV in mrb_parser_dump(NODE_COLON3) 6b67590 Merge branch 'master' of https://github.com/mruby/mruby into gc_cleanup 0d8012f Merge upstream 68ba386 Merge pull request #2879 from cremno/call-always-frexp-instead-of-frexpl 13b5525 Remove obvious warnings from docs f0e9974 Fix Unknown tag error 45e70e4 Fix enumerator doc errors 5cdcce8 Mark core gems with mrbgem tag 84b7088 Add block to document mrb_value type fe1275a Improved mrb_args_format table e871b77 Increasing docs coverage 1c6b1d0 Prefix mrb_gc_state enum members, make color defines private fc4f0b9 do not assert is_dead() during mark phase; close #2825 ref #2996 #2769 2b39d87 Remove gc_ prefix of mrb_gc fields 2f8b0f6 Move MRB_GC_ARENA_SIZE to gc.h and fix compiler warnings 5c093ed Remove segregated value struct declaration 3ab2f93 Clean up GC code f07ee20 Merge pull request #2995 from Mav7/master 91444ae fixed YARD documentation for mrb_obj_new 12c24e0 got rid of dummy gem d169126 updated YARD docs on mruby.h 83922d0 use visualcpp toolchain for test as well fd8634d Merge pull request #2993 from Mav7/master d890645 Merge branch 'crimsonwoods-fix_androidndk_rake' 622e68e Merge branch 'fix_androidndk_rake' of https://github.com/crimsonwoods/mruby into crimsonwoods-fix_androidndk_rake 2df9786 got rid of dummy gem i was testing d702b7f Add more YARD docs for mruby.h for mrb_undef_method and mrb_undef_class_method. a5b416e Added documentation for mrb_undef_method 6b58d58 Fix issue: LDFLAGS is not applied correctly. 1a98512 always call frexp() instead of frexpl() git-subtree-dir: mruby_test git-subtree-split: 8bad1954a40c258679f51d4e97acc4f7e4697309
1 parent b0f3258 commit 76d2e1a

File tree

36 files changed

+881
-608
lines changed

36 files changed

+881
-608
lines changed

.yardopts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
--markup markdown
12
--plugin mruby
23
--plugin coderay
34
--output-dir doc/api
5+
6+
src/**/*.c
7+
mrblib/**/*.rb
8+
include/**/*.h
9+
10+
mrbgems/*/src/**/*.c
11+
mrbgems/*/mrblib/**/*.rb
12+
mrbgems/*/include/**/*.h
413
-
514
AUTHORS
615
MITL

build_config.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@
109109
end
110110

111111
MRuby::Build.new('test') do |conf|
112-
toolchain :gcc
112+
# Gets set by the VS command prompts.
113+
if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
114+
toolchain :visualcpp
115+
else
116+
toolchain :gcc
117+
end
113118

114119
enable_debug
115120
conf.enable_bintest

0 commit comments

Comments
 (0)