diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-09-09 13:14:32 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-09-09 13:14:32 +0900 |
| commit | 9e7ca5d94462c749b25a34bc2d23984ccd37d14d (patch) | |
| tree | 12aab82d0fcc19ec57d54336d8c915d545994716 /mrblib | |
| parent | fc52d2d6e076248c86525b30d9ea62ecfbcfb12e (diff) | |
| download | mruby-9e7ca5d94462c749b25a34bc2d23984ccd37d14d.tar.gz mruby-9e7ca5d94462c749b25a34bc2d23984ccd37d14d.zip | |
mrb might be intialized incompletely from mrbc; close #457
Diffstat (limited to 'mrblib')
| -rw-r--r-- | mrblib/Makefile | 2 | ||||
| -rw-r--r-- | mrblib/error.rb | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/mrblib/Makefile b/mrblib/Makefile index 01a5a6198..c6a668dbd 100644 --- a/mrblib/Makefile +++ b/mrblib/Makefile @@ -65,7 +65,7 @@ $(MLIB) : $(CLIB) $(CLIB) : $(RLIB) $(MRBC) $(MRBC) -Bmrblib_irep -o$(DLIB) $(RLIB); $(CAT) init_$(TARGET).c $(DLIB) > $@ -$(MRBC) : ../src/opcode.h ../src/codegen.c ../src/parse.y +$(MRBC) : $(LIBR0) $(MAKE) -C ../tools/mrbc $(MAKE_FLAGS) # merge mruby sources diff --git a/mrblib/error.rb b/mrblib/error.rb index 16e88eefb..32b50da92 100644 --- a/mrblib/error.rb +++ b/mrblib/error.rb @@ -51,14 +51,6 @@ end class KeyError < IndexError end -# ISO 15.2.37 -class ScriptError < Exception -end - -# ISO 15.2.38 -class SyntaxError < ScriptError -end - class NotImplementedError < ScriptError end |