diff options
| -rw-r--r-- | COPYING | 14 | ||||
| -rw-r--r-- | INSTALL | 11 | ||||
| -rw-r--r-- | INSTALL.ja | 1 | ||||
| -rw-r--r-- | LEGAL | 2 | ||||
| -rw-r--r-- | MITL.ja | 6 | ||||
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | README.ja | 3 | ||||
| -rw-r--r-- | TODO | 15 | ||||
| -rw-r--r-- | TODO.ja (renamed from Todo.txt) | 6 | ||||
| -rw-r--r-- | src/error.c | 2 | ||||
| -rw-r--r-- | src/load.c | 2 | ||||
| -rw-r--r-- | src/parse.y | 1 |
12 files changed, 52 insertions, 29 deletions
@@ -11,8 +11,8 @@ MIT license (see the file MITL), or the conditions below: a) place your modifications in the Public Domain or otherwise make them Freely Available, such as by posting said - modifications to Usenet or an equivalent medium, or by allowing - the author to include your modifications in the software. + modifications to Usenet or an equivalent medium, or by allowing + the author to include your modifications in the software. b) use the modified software only within your corporation or organization. @@ -26,11 +26,11 @@ MIT license (see the file MITL), or the conditions below: provided that you do at least ONE of the following: a) distribute the binaries and library files of the software, - together with instructions (in the manual page or equivalent) - on where to get the original distribution. + together with instructions (in the manual page or equivalent) + on where to get the original distribution. b) accompany the distribution with the machine-readable source of - the software. + the software. c) give non-standard binaries non-standard names, with instructions on where to get the original software distribution. @@ -44,9 +44,9 @@ MIT license (see the file MITL), or the conditions below: For the list of those files and their copying conditions, see the file LEGAL. - 5. The scripts and library files supplied as input to or produced as + 5. The scripts and library files supplied as input to or produced as output from the software do not automatically fall under the - copyright of the software, but belong to whomever generated them, + copyright of the software, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this software. @@ -1,19 +1,20 @@ * Compilation and Installation - 1. Run make in top directory. + 1. Run make in the top directory. - This command will create following directories and + This command will create the following directories and store libraries and binaries files into them. * bin * lib * include -If you fail to compile ruby, please send the detailed error report with -the error log and machine/OS type, to help others. +If an error occurs when compiling mRuby, it will be helpful for others if you +send a detailed report to the developers that includes the error log, machine, +and OS type. -* Porting to other platforms +* Porting to other platforms That's all. diff --git a/INSTALL.ja b/INSTALL.ja index 94671f711..032f91f41 100644 --- a/INSTALL.ja +++ b/INSTALL.ja @@ -8,6 +8,7 @@ * bin * lib + * include もし，コンパイル時にエラーが発生した場合にはエラーのログとマ シン，OSの種類を含むできるだけ詳しいレポートを作者に送ってく @@ -5,4 +5,4 @@ All the files in this distribution are covered under the MIT license (see the file COPYING) except some files mentioned below: -(currently no item are listed.) +(Currently no items are listed.) @@ -2,9 +2,9 @@ Copyright (c) 2012 mruby developers 以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソフトウ ェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱うことを無償 -で許可します。これには、ソフトウェアの複製を使用、複写、変更、結合、掲載、頒布 -、サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手 -に同じことを許可する権利も無制限に含まれます。 +で許可します。これには、ソフトウェアの複製を使用、複写、変更、結合、掲載、頒布、 +サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手に +同じことを許可する権利も無制限に含まれます。 上記の著作権表示および本許諾表示を、ソフトウェアのすべての複製または重要な部分 に記載するものとします。 @@ -1,14 +1,16 @@ -!!Notice!! This is preliminary release for team reviewing. - the URL and address discribed below are not available yet. +!!Notice!! This is a preliminary release for internal team reviewing. + The URL and address discribed below are not available yet. The official release will be announced later. Thanks. + Any suggestion of the modification are welcome, + but the response might be delayed. Sorry for that in advance. * What's mRuby -mRuby is the light-weighted implementation of ruby language complied with ISO -standard to execute various environment. It can run as 'interpreter form' or +mRuby is the light-weight implementation of the Ruby language complied to the ISO +standard to execute various environments. It can run in 'interpreter form' or 'compile and execute on vm form' according to its module construction. -This achivement is due to the Regional Innovation Creation R&D Programs of +This achievement is due to the Regional Innovation Creation R&D Programs of the Ministry of Economy, Trade and Industry of Japan. @@ -47,7 +49,7 @@ command and see the list of branches: * mRuby home-page (sorry, it's not launched yet. we're working on this) -The URL of the mRuby home-page is: +The URL of the mRuby home-page is: http://www.mruby.org/ @@ -84,7 +86,7 @@ In the future, mRuby might ask you to distribute your new codes Actual copyright holder name, you, will be listed in AUTHORS file.) Please ask us if you want to distribute your code under other license -or if your code is dirived from GPL code. +or if your code is derived from GPL code. * The Author @@ -92,7 +94,7 @@ or if your code is dirived 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: @@ -2,6 +2,9 @@ 記述されているURLやメールアドレスは現在使用できません。 正式リリースは後日アナウンス予定です。 + 修正のご指摘は随時受け付けていますが、対応が遅くなるかもしれません。 + 予めご了承ください。 + * mRubyとは mRubyはISO規格に準拠したRuby言語を様々な環境で動作可能となるように @@ -0,0 +1,15 @@ +Things to do (Things that are not done yet) + +* Here document +* Special variables ($1,$2..) +* super in aliased methods +* BEGIN/END (Were we not supporting this?) +* const_missing +* respond_to_missing + +Things to improve (Done but things to fix) + +* Hash (Reduce size. Use khash or save the order) +* stringEx (Delete encoding、delete CODERANGE、delete everything except UTF-8 or ASCII) +* Make additions as they are noticed. + @@ -1,7 +1,7 @@ -やること(まだできてないこと) / not yet complete +やること(まだできてないこと) -* ヒアドキュメント / here document -* 特殊変数 ($1,$2..) / special variables +* ヒアドキュメント +* 特殊変数 ($1,$2..) * super in aliased methods * BEGIN/END (対応しないんだっけ？) * const_missing diff --git a/src/error.c b/src/error.c index 9dbfc972f..a671c6bbd 100644 --- a/src/error.c +++ b/src/error.c @@ -199,8 +199,8 @@ mrb_raise(mrb_state *mrb, struct RClass *c, const char *fmt, ...) va_start(args, fmt); vsnprintf(buf, 256, fmt, args); - mrb_raise_va(mrb, c, fmt, args); va_end(args); + mrb_exc_raise(mrb, mrb_exc_new(mrb, c, buf, strlen(buf))); } void diff --git a/src/load.c b/src/load.c index 848cf8f9a..3f5dc2c57 100644 --- a/src/load.c +++ b/src/load.c @@ -444,7 +444,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, mrb_irep *irep, uint32 irep->slen = bin_to_uint32(src); //syms length src += MRB_DUMP_SIZE_OF_LONG; if (irep->slen > 0) { - if ((irep->syms = mrb_malloc(mrb, MRB_DUMP_SIZE_OF_INT * irep->slen)) == NULL) { + if ((irep->syms = mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen)) == NULL) { ret = MRB_DUMP_INVALID_IREP; goto error_exit; } diff --git a/src/parse.y b/src/parse.y index 5925b9a5e..b22dd10f6 100644 --- a/src/parse.y +++ b/src/parse.y @@ -4228,6 +4228,7 @@ parser_yylex(parser_state *p) else if (term == '[') term = ']'; else if (term == '{') term = '}'; else if (term == '<') term = '>'; + p->sterm = term; #if 0 else paren = 0; #endif |