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
5,700 Commits 6 Branches 38 Tags
774703c5d786519052d096449d544081443c511d
Commit Graph

5700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yukihiro "Matz" Matsumoto 774703c5d7 Merge pull request #2394 from take-cheeze/fix_conflict_doc 
Fix conflict doc since there is only `add_conflict` method.
 2014-06-14 00:14:33 +09:00
take_cheeze d10cda1ac1 Fix conflict doc since there is only add_conflict method. 2014-06-13 22:19:39 +09:00
Yukihiro "Matz" Matsumoto 40b92e3529 Merge pull request #2392 from take-cheeze/doc_update 
Update document and add :doc task.
 2014-06-13 20:36:10 +09:00
Yukihiro "Matz" Matsumoto 17da8f3c99 git push origin masterMerge branch 'take-cheeze-conflict_doc' 2014-06-13 20:35:00 +09:00
Yukihiro "Matz" Matsumoto 8c283e15e4 update add_confict document; ref #2391 2014-06-13 20:34:51 +09:00
take_cheeze 502baaba39 Update document by regenerating it. 2014-06-13 17:28:45 +09:00
take_cheeze c07feca570 Add :doc task to run document generator. 2014-06-13 17:28:40 +09:00
take_cheeze 66802d9219 Add document for add_conflict and add_conflicts. 2014-06-13 17:16:32 +09:00
Yukihiro "Matz" Matsumoto 7275096f56 git push origin masterMerge branch 'take-cheeze-add_conflicts' 2014-06-13 12:50:11 +09:00
Yukihiro "Matz" Matsumoto 8ef971a373 remove add_conflicts now; use add_conflict; ref #2390 2014-06-13 12:50:00 +09:00
Yukihiro "Matz" Matsumoto 81db9b7090 Merge branch 'add_conflicts' of https://github.com/take-cheeze/mruby into take-cheeze-add_conflicts 2014-06-13 12:39:55 +09:00
take_cheeze eebb94410f Implement add_conflict. Usage is similar to add_dependency. 2014-06-13 01:07:53 +09:00
Yukihiro "Matz" Matsumoto 2067f1f9ff Merge branch 'master' of github.com:mruby/mruby 2014-06-13 00:42:03 +09:00
Yukihiro "Matz" Matsumoto 2ed7089546 need to call write barrier on hash keys; ref #2375 2014-06-13 00:41:49 +09:00
take_cheeze 6157e50843 Implement add_conflicts. Solve #2383. 2014-06-12 13:57:58 +09:00
Yukihiro "Matz" Matsumoto be3e36cb05 Merge pull request #2389 from ksss/str-mem-leaks 
Fix memory leaks in String
 2014-06-12 07:36:36 +09:00
Yukihiro "Matz" Matsumoto d0401dccc4 Merge pull request #2387 from suzukaze/refactor-nofree-p 
Refactor how to use RSTR_NOFREE_P macro
 2014-06-12 07:31:09 +09:00
ksss f1e15b0236 String#clear: use String#replace to simple 2014-06-11 14:46:52 +00:00
ksss bd53818999 str_replace: self should not be shared and nofree 2014-06-11 14:42:18 +00:00
Jun Hiroe 75d1412410 Refactor how to use RSTR_NOFREE_P macro 2014-06-11 23:10:41 +09:00
Yukihiro "Matz" Matsumoto 63be55c77c Merge pull request #2386 from suzukaze/add-nofree-macro 
Add NOFREE macros
 2014-06-11 12:15:33 +09:00
Jun Hiroe 9c259c501a Add NOFREE macros 2014-06-11 01:00:35 +09:00
Yukihiro "Matz" Matsumoto fe95f44013 rename mrb_atexit to mrb_state_atexit to clarify a func will be called at the end of state, not process; ref #2211 2014-06-10 17:59:56 +09:00
Yukihiro "Matz" Matsumoto 2e7de03fe8 Merge branch 'master' of github.com:mruby/mruby 2014-06-10 13:15:27 +09:00
Yukihiro "Matz" Matsumoto c2f6c33fef reserve a register for a block parameter in a for statement body; ref #2375 2014-06-10 13:15:19 +09:00
Yukihiro "Matz" Matsumoto 87038c2c8d Merge pull request #2381 from monaka/pr-add-include_paths-in-dependency-gems 
Append include paths in dependency gems
 2014-06-10 11:46:24 +09:00
Masaki Muranaka 4e5315ff41 Add more info about "include_paths and GEM dependency". 2014-06-10 11:02:58 +09:00
Masaki Muranaka 7b6150ab90 Add include_paths in dependency gems. 2014-06-10 10:55:02 +09:00
Yukihiro "Matz" Matsumoto 2f8047461f Merge pull request #2377 from monaka/pr-add-dot-s-extension 
Add ".s" to source extensions.
 2014-06-10 00:38:58 +09:00
Yukihiro "Matz" Matsumoto 74ed32f25c Merge pull request #2378 from monaka/pr-add-tools-dir-to-cxx-files-check-oaths 
Find c++ files in tools/.
 2014-06-10 00:38:33 +09:00
Yukihiro "Matz" Matsumoto d6882f1b65 Merge pull request #2379 from monaka/pr-do-not-export-include-dir-in-gems-to-core 
Do not export include/ dirs in mrbgems to core build.
 2014-06-10 00:38:01 +09:00
Yukihiro "Matz" Matsumoto 58e87996b9 should not add extra stack space to callinfo->nregs; maybe related to #2375 2014-06-10 00:32:45 +09:00
Yukihiro "Matz" Matsumoto 6c524af646 NODE_FOR does not introduce new local variables 2014-06-10 00:03:54 +09:00
Yukihiro "Matz" Matsumoto 4c69a9d09e codedump should display proper L(n) for OP_STRING op 2014-06-09 23:37:20 +09:00
Yukihiro "Matz" Matsumoto a036cbea16 Merge pull request #2373 from take-cheeze/static_assert 
Add macro `mrb_static_assert`.
 2014-06-09 23:27:44 +09:00
Yukihiro "Matz" Matsumoto f1b1a8acd1 Merge pull request #2376 from kou/patch-1 
Add a missing space after ","
 2014-06-09 23:26:54 +09:00
Yukihiro "Matz" Matsumoto 53c6c77f93 Merge pull request #2374 from take-cheeze/timeat_fix 
Fix `Time.at` args spec.
 2014-06-09 23:26:01 +09:00
Masaki Muranaka c6d589e049 Do not export include/ dirs in mrbgems to core build. 
In the current behavior, include/ dirs in mrbgems are set to
core's compiler.include_paths.
And they are never set to mrbgem's include_paths.
It may cause some dangerous issues because it can change
mruby core's macros by mrbgems.

After this fix, include/ in a gem is used in the gem itself only.
 2014-06-09 23:08:13 +09:00
Kouhei Sutou 4f3114dbc9 Add a missing space after "," 2014-06-09 23:00:02 +09:00
Masaki Muranaka 2c144425d9 Find c++ files in tools/. 
Some tools may be written in C++.
 2014-06-09 22:55:02 +09:00
Masaki Muranaka 9601777893 Add ".s" to source extensions. 
It uses ".s" as the source for assembler on some toolchains including GCC.
 2014-06-09 22:46:35 +09:00
take_cheeze 4de468e754 Fallback to mrb_assert instead of dirty trick. 2014-06-09 18:47:07 +09:00
take_cheeze d386b35337 Fix Time.at args spec. 2014-06-09 16:34:04 +09:00
take_cheeze 64994a1764 Check RSTRING_EMBED_LEN_MAX with static assert. 2014-06-08 23:16:55 +09:00
take_cheeze 4a27dd0e8a Use _Static_assert when C11 is available and use it in pointer size check. 2014-06-08 23:16:51 +09:00
Yukihiro "Matz" Matsumoto e070fce835 Merge pull request #2372 from monaka/pr-remove-redundant-substitutions 
Remove redundant substitutions.
 2014-06-08 17:45:37 +09:00
Masaki Muranaka 78176ee7f5 Remove redundant substitutions. 
"#{MRUBY_ROOT}/include" is set in Command::Compiler#initialize .
 2014-06-08 14:42:21 +09:00
Yukihiro "Matz" Matsumoto 05d4542c10 Merge branch 'master' of github.com:mruby/mruby 2014-06-08 01:42:09 +09:00
take_cheeze aa187956cf Add test for end-of-program marker. 2014-06-08 01:38:44 +09:00
Yukihiro "Matz" Matsumoto d75b84016c do not ignore negative characters (e.g. EOF and partial EOF); fix #2361 fix #2369 2014-06-08 01:38:44 +09:00