diff options
| -rwxr-xr-x | include/mruby/dump.h | 16 | ||||
| -rw-r--r-- | src/dump.c | 4 | ||||
| -rw-r--r-- | src/load.c | 6 | ||||
| -rw-r--r-- | test/t/kernel.rb | 16 |
4 files changed, 28 insertions, 14 deletions
diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 76a20df77..55227c8cf 100755 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -42,16 +42,16 @@ mrb_value mrb_load_irep_file(mrb_state*,FILE*); #define MRB_DUMP_NULL_SYM_LEN 0xFFFF /* Rite Binary File header */ -#define RITE_BINARY_IDENFIFIER "RITE" -#define RITE_BINARY_FORMAT_VER "0001" -#define RITE_COMPILER_NAME "MATZ" -#define RITE_COMPILER_VERSION "0000" +#define RITE_BINARY_IDENTIFIER "RITE" +#define RITE_BINARY_FORMAT_VER "0001" +#define RITE_COMPILER_NAME "MATZ" +#define RITE_COMPILER_VERSION "0000" -#define RITE_VM_VER "0000" +#define RITE_VM_VER "0000" -#define RITE_BINARY_EOF "END\0" -#define RITE_SECTION_IREP_IDENTIFIER "IREP" -#define RITE_SECTION_LIENO_IDENTIFIER "LINE" +#define RITE_BINARY_EOF "END\0" +#define RITE_SECTION_IREP_IDENTIFIER "IREP" +#define RITE_SECTION_LINENO_IDENTIFIER "LINE" #define MRB_DUMP_DEFAULT_STR_LEN 128 diff --git a/src/dump.c b/src/dump.c index 8eb64c9b2..c2b987bc8 100644 --- a/src/dump.c +++ b/src/dump.c @@ -304,7 +304,7 @@ mrb_write_section_lineno_header(mrb_state *mrb, uint32_t section_size, uint16_t struct rite_section_lineno_header *header = (struct rite_section_lineno_header*)bin; // TODO - memcpy(header->section_identify, RITE_SECTION_LIENO_IDENTIFIER, sizeof(header->section_identify)); + memcpy(header->section_identify, RITE_SECTION_LINENO_IDENTIFIER, sizeof(header->section_identify)); uint32_to_bin(section_size, header->section_size); uint16_to_bin(nirep, header->nirep); uint16_to_bin(sirep, header->sirep); @@ -396,7 +396,7 @@ write_rite_binary_header(mrb_state *mrb, size_t binary_size, uint8_t* bin) uint16_t crc; size_t offset; - memcpy(header->binary_identify, RITE_BINARY_IDENFIFIER, sizeof(header->binary_identify)); + memcpy(header->binary_identify, RITE_BINARY_IDENTIFIER, sizeof(header->binary_identify)); memcpy(header->binary_version, RITE_BINARY_FORMAT_VER, sizeof(header->binary_version)); memcpy(header->compiler_name, RITE_COMPILER_NAME, sizeof(header->compiler_name)); memcpy(header->compiler_version, RITE_COMPILER_VERSION, sizeof(header->compiler_version)); diff --git a/src/load.c b/src/load.c index 9278f3191..b3f13a8ef 100644 --- a/src/load.c +++ b/src/load.c @@ -309,7 +309,7 @@ read_rite_binary_header(const uint8_t *bin, size_t *bin_size, uint16_t *crc) { const struct rite_binary_header *header = (const struct rite_binary_header *)bin; - if (memcmp(header->binary_identify, RITE_BINARY_IDENFIFIER, sizeof(header->binary_identify)) != 0) { + if (memcmp(header->binary_identify, RITE_BINARY_IDENTIFIER, sizeof(header->binary_identify)) != 0) { return MRB_DUMP_INVALID_FILE_HEADER; } @@ -362,7 +362,7 @@ mrb_read_irep(mrb_state *mrb, const uint8_t *bin) } total_nirep += result; } - else if (memcmp(section_header->section_identify, RITE_SECTION_LIENO_IDENTIFIER, sizeof(section_header->section_identify)) == 0) { + else if (memcmp(section_header->section_identify, RITE_SECTION_LINENO_IDENTIFIER, sizeof(section_header->section_identify)) == 0) { result = read_rite_section_lineno(mrb, bin, sirep); if (result < MRB_DUMP_OK) { return result; @@ -601,7 +601,7 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) } total_nirep += result; } - else if (memcmp(section_header.section_identify, RITE_SECTION_LIENO_IDENTIFIER, sizeof(section_header.section_identify)) == 0) { + else if (memcmp(section_header.section_identify, RITE_SECTION_LINENO_IDENTIFIER, sizeof(section_header.section_identify)) == 0) { fseek(fp, fpos, SEEK_SET); result = read_rite_section_lineno_file(mrb, fp, sirep); if (result < MRB_DUMP_OK) { diff --git a/test/t/kernel.rb b/test/t/kernel.rb index f2f387bb2..28b0cab15 100644 --- a/test/t/kernel.rb +++ b/test/t/kernel.rb @@ -354,12 +354,26 @@ end # Kernel#require is defined in mruby-require. '15.3.1.3.42' assert('Kernel#respond_to?', '15.3.1.3.43') do + e_list = [] + class Test4RespondTo + def valid_method; end + def test_method; end undef test_method end - respond_to?(:nil?) and Test4RespondTo.new.respond_to?(:test_method) == false + begin + Test4RespondTo.new.respond_to?(1) + rescue => e + e_list << e.class + end + + e_list[0] == TypeError and + respond_to?(:nil?) and + Test4RespondTo.new.respond_to?(:valid_method) == true and + Test4RespondTo.new.respond_to?('valid_method') == true and + Test4RespondTo.new.respond_to?(:test_method) == false end assert('Kernel#send', '15.3.1.3.44') do |