From c8c90d364438febfb7419db996afeecc6ebdb51b Mon Sep 17 00:00:00 2001 From: Patrick Hogan Date: Fri, 20 Apr 2012 09:22:30 -0500 Subject: Fixed typos in usage message. --- tools/mruby/mruby.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 4e84b3c7d..769746530 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -22,10 +22,10 @@ usage(const char *name) { static const char *const usage_msg[] = { "switches:", - "-b load and execute RiteBinary(mrb) file", + "-b load and execute RiteBinary (mrb) file", "-c check syntax only", - "-v print version number, then trun on verbose mode", - "--verbose run at verbose mode", + "-v print version number, then run in verbose mode", + "--verbose run in verbose mode", "--version print the version", "--copyright print the copyright", NULL -- cgit v1.2.3 From 4cb86f87a1d02ed2c9a659391f3817a930743a8f Mon Sep 17 00:00:00 2001 From: Patrick Hogan Date: Fri, 20 Apr 2012 09:32:35 -0500 Subject: #undef DEBUG for compatibility with environments that define DEBUG (like Xcode) Signed-off-by: Patrick Hogan --- include/mruby.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mruby.h b/include/mruby.h index eb121c971..4fccfaa79 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -388,6 +388,10 @@ void mrb_write_barrier(mrb_state *, struct RBasic*); #define MRUBY_VERSION "Rite" +#ifdef DEBUG +#undef DEBUG +#endif + #if 0 #define DEBUG(x) x #else -- cgit v1.2.3 From 9e32b5152edc6d5935e4cdb0c44b7b138169027b Mon Sep 17 00:00:00 2001 From: Ranmocy Date: Fri, 20 Apr 2012 22:39:46 +0800 Subject: fixed statement alignment --- include/mruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mruby.h b/include/mruby.h index 8084735bf..397885ac5 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -75,7 +75,7 @@ typedef struct mrb_value { #define mrb_test(o) ((o).tt != MRB_TT_FALSE) #define mrb_fixnum(o) (o).value.i #define mrb_float(o) (o).value.f -#define mrb_symbol(o) (o).value.sym +#define mrb_symbol(o) (o).value.sym #define mrb_object(o) (o).value.p #define FIXNUM_P(o) ((o).tt == MRB_TT_FIXNUM) #define UNDEF_P(o) ((o).tt == MRB_TT_UNDEF) -- cgit v1.2.3 From f7f31188be83e937308ddd3abe7dec42ea48ba78 Mon Sep 17 00:00:00 2001 From: takahashim Date: Sat, 21 Apr 2012 00:15:39 +0900 Subject: fix git commands --- README | 4 ++-- README.ja | 4 ++-- README.ja.md | 4 ++-- README.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 12f8f5135..bfcd138cc 100644 --- a/README +++ b/README @@ -40,12 +40,12 @@ The mruby distribution files can be found in the following site: The trunk of the mruby source tree can be checked out with the following command: - $ git .... + $ git clone https://github.com/mruby/mruby.git There are some other branches under development. Try the following command and see the list of branches: - $ git .... + $ git branch -r * mruby home-page (sorry, it's not launched yet. we're working on this) diff --git a/README.ja b/README.ja index 22895a403..18ef16d13 100644 --- a/README.ja +++ b/README.ja @@ -44,11 +44,11 @@ mrubyはISO規格に準拠したRuby言語を様々な環境で動作可能と 開発先端のソースコードは次のコマンドで取得できます． - $ git .... + $ git clone https://github.com/mruby/mruby.git 他に開発中のブランチの一覧は次のコマンドで見られます． - $ git .... + $ git branch -r * ホームページ (まだ準備中です。ただいま鋭意製作中です。) diff --git a/README.ja.md b/README.ja.md index 0776226aa..aabad4c15 100644 --- a/README.ja.md +++ b/README.ja.md @@ -45,11 +45,11 @@ mrubyは[ISO規格](http://www.ipa.go.jp/about/press/20120402_2.html)に準拠 開発先端のソースコードは次のコマンドで取得できます。 - $ git .... + $ git clone https://github.com/mruby/mruby.git 他に開発中のブランチの一覧は次のコマンドで見られます。 - $ git .... + $ git branch -r ## ホームページ diff --git a/README.md b/README.md index 8fcbf44c7..f9a64ebb3 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ following command: There are some other branches under development. Try the following command and see the list of branches: - $ git .... + $ git branch -r ## mruby home-page -- cgit v1.2.3 From e4afcf6c4313f5779c912775e1929f7557efb8c9 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Fri, 20 Apr 2012 10:18:08 -0500 Subject: Made text edits to README.md to improve clarity. --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8fcbf44c7..568cd41c9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ mruby is the lightweight implementation of the Ruby language complying to the [ISO standard](http://www.ipa.go.jp/about/press/20120402_2.html). -mruby can run Ruby code in 'interpreter mode' or 'compile and execute it on a virtual machine' depending on how the developer's preference. +mruby can run Ruby code in 'interpreter mode' or 'compile and execute it on a virtual machine' depending on the developer's preference. This achievement was sponsored by the Regional Innovation Creation R&D Programs of the Ministry of Economy, Trade and Industry of Japan. @@ -44,7 +44,7 @@ following command: $ git clone https://github.com/mruby/mruby.git -There are some other branches under development. Try the following +There are some other branches under development. Try the following command and see the list of branches: $ git .... @@ -61,7 +61,7 @@ The URL of the mruby home-page will be: ## Mailing list -To subscribe the mruby mailing list....[T.B.D.] +To subscribe to the mruby mailing list....[T.B.D.] ## How to compile and install @@ -78,19 +78,19 @@ See the COPYING file. Thank you for considering contributing to mruby. mruby has chosen a MIT License due to its permissive license allowing -developer to target various environments such as embedded systems. -However, the license requires to display the copyright notice and license +developers to target various environments such as embedded systems. +However, the license requires the display of the copyright notice and license information in manuals for instance. Doing so for big projects can be complicated or troublesome. -This is why, mruby has decided to display "mruby developers" as copyright name +This is why mruby has decided to display "mruby developers" as the copyright name to make it simple conventionally. -In the future, mruby might ask you to distribute your new codes -(that you will commit,) under MIT License as a member of +In the future, mruby might ask you to distribute your new code +(that you will commit,) under the MIT License as a member of "mruby developers" but contributors will keep their copyright. (We did not intend for contributors to transfer or waive their copyrights, Actual copyright holder name (contributors) will be listed in the AUTHORS file.) -Please ask us if you want to distribute your code under other license +Please ask us if you want to distribute your code under another license or if your code is derived from GPL code. @@ -99,7 +99,7 @@ or if your code is derived from GPL code. See the file AUTHORS. -Feel free to send comments and bug reports to the author. Here is the +Feel free to send comments and bug reports to the author. Here is the author's latest mail address: devel@mruby.org -- cgit v1.2.3