Merge branch 'master' of github.com:mruby/mruby

Makefile

@@ -27,10 +27,17 @@ all :
 	@$(MAKE) -C tools/mruby $(MAKE_FLAGS)
 	@$(MAKE) -C tools/mirb $(MAKE_FLAGS)
 
+# mruby iso test
+.PHONY : mrit
+mrit :
+	@$(MAKE) -C test $(MAKE_FLAGS)
+	@$(MAKE) -C tools/mrit $(MAKE_FLAGS)
+
 # clean up
 .PHONY : clean
 clean :
 	@$(MAKE) clean -C src $(MAKE_FLAGS)
 	@$(MAKE) clean -C tools/mruby $(MAKE_FLAGS)
 	@$(MAKE) clean -C tools/mirb $(MAKE_FLAGS)
-
+	@$(MAKE) clean -C tools/mrit $(MAKE_FLAGS)
+	@$(MAKE) clean -C test $(MAKE_FLAGS)

test/Makefile

+# makefile discription.
+# basic build file for mruby library (Ruby part)
+
+# project-specific macros
+# extension of the executable-file is modifiable(.exe .out ...)
+BASEDIR = .
+TARGET := mritlib
+MLIB := $(TARGET).o
+CLIB := $(TARGET).c
+DLIB := $(TARGET).ctmp
+RLIB := $(TARGET).rbtmp
+DEPLIB := $(TARGET).d
+MRB1 := $(BASEDIR)/*.rb
+MRBS := $(MRB1)
+LIBR := ../lib/libmrit.a
+
+# C compiler (gcc)
+CC = gcc
+LL = gcc
+AR = ar
+DEBUG_MODE = 1
+ifeq ($(DEBUG_MODE),1)
+CFLAGS = -g
+else
+CFLAGS = -O3
+endif
+INCLUDES = -I../src -I../include
+ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
+ifeq ($(OS),Windows_NT)
+  MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
+else
+  MAKE_FLAGS = CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)'
+endif
+
+# mruby compiler
+ifeq ($(OS),Windows_NT)
+MRBC = ../bin/mrbc.exe
+else
+MRBC = ../bin/mrbc
+endif
+
+##############################
+# generic build targets, rules
+
+.PHONY : all
+all : $(MRBC) $(MLIB)
+	$(AR) r $(LIBR) $(MLIB)
+	@echo "make: built targets of `pwd`"
+
+# Compile mrblib source
+$(MLIB) : $(CLIB)
+	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $(CLIB) -o $(MLIB)
+
+# Compile C source from merged mruby source
+$(CLIB) : $(RLIB) $(MRBC)
+	$(MRBC) -Bmritlib_irep -o$(DLIB) $(RLIB); cat init_$(TARGET).c $(DLIB) > $@
+
+$(MRBC) : ../src/opcode.h ../src/codegen.c ../src/parse.y
+	$(MAKE) -C ../tools/mrbc $(MAKE_FLAGS)
+
+# merge mruby sources
+$(RLIB) : $(MRBS)
+	cat $? > $@
+
+# clean up
+.PHONY : clean
+clean :
+	@echo "make: removing targets, objects and depend files of `pwd`"
+	-rm -f $(MRBC) $(MLIB) $(CLIB) $(RLIB) $(DLIB) $(DEPLIB) $(LIBR)
+

test/_assert.rb

+$ok_test = 0
+$ko_test = 0
+$asserts  = []
+
+##
+# Verify a code block.
+#
+# str : A remark which will be printed in case
+#       this assertion fails
+# iso : The ISO reference code of the feature
+#       which will be tested by this
+#       assertion
+def assert(str = 'Assertion failed', iso = '')
+ if(!yield)
+    $asserts.push([str, iso])
+    $ko_test += 1
+    print "F"
+ else
+    $ok_test += 1
+    print "."
+  end
+end
+
+##
+# Report the test result and print all assertions
+# which were reported broken.
+def report()
+  print "\n"
+  $asserts.each do |str, iso|
+    print("Test Failed: #{str} [#{iso}]\n");
+  end
+
+  $total_test = $ok_test + $ko_test
+  print 'Total tests:'
+  print $total_test
+  print "\n"
+
+  print '  OK: '
+  print $ok_test
+  print "\n"
+  print '  KO: '
+  print $ko_test
+  print "\n"
+end

test/array.rb

+##
+# Array ISO Test
+
+assert('Array', '15.2.12') do
+  Array.class == Class
+end
+
+assert('Array.[]', '15.2.12.4.1') do
+  Array.[](1,2,3) == [1, 2, 3]
+end
+
+assert('Array#*', '15.2.12.5.1') do
+  [1].*(3) == [1, 1, 1]
+end
+
+assert('Array#+', '15.2.12.5.2') do
+  [1].+([1]) == [1, 1]
+end
+
+assert('Array#<<', '15.2.12.5.3') do
+  [1].<<(1) == [1, 1]
+end
+
+assert('Array#[]', '15.2.12.5.4') do
+  [1,2,3].[](1) == 2
+end
+
+assert('Array#[]=', '15.2.12.5.5') do
+  [1,2,3].[]=(1,4) == [1, 4, 3]
+end
+
+assert('Array#clear', '15.2.12.5.6') do
+  a = [1]
+  a.clear
+  a == []
+end
+
+# Not ISO specified
+
+

test/init_mritlib.c

+#include "mruby.h"
+#include "mruby/irep.h"
+#include "mruby/dump.h"
+#include "mruby/string.h"
+#include "mruby/proc.h"
+
+extern const char mritlib_irep[];
+
+void
+mrb_init_mritlib(mrb_state *mrb)
+{
+  int n = mrb_read_irep(mrb, mritlib_irep);
+
+  extern mrb_value mrb_top_self(mrb_state *mrb);
+  mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));
+}
+

test/test_time.rb

-$ok     = 0
-$failed = 0
-$ftest  = []
-
-def assert(str = "Assertion failed")
-    if(!yield)
-      $ftest.push(str)
-      $failed += 1
-      print "F"
-    else
-      $ok     += 1
-      print "."
-    end
-end
-
-def report()
-  print "\n"
-  $ftest.each do |str|
-    puts("Test Failed: #{str}");
-  end
-  $total = $ok + $failed
-  puts "Ran #{$total} tests: #{$ok} OK and #{$failed} failed."
-end
-
-doom = Time.gm(2012, 12, 23)
-assert("Time.gm")   { doom                      }
-assert("gm year")   { doom.year == 2012         }
-assert("gm month")  { doom.month == 12          }
-assert("gm day")    { doom.mday == 23           }
-
-t0 = Time.new
-assert("Can create time.") { t0 }
-
-t1 = Time.at(1300000000.0).utc
-assert("asctime") { t1.asctime == "Sun Mar 13 07:06:40 UTC 2011" }
-assert("usec")    { t1.usec    ==  0              }
-assert("to_i")    { t1.to_i    ==  1300000000     }
-assert("to_f")    { t1.to_f    ==  1300000000.0   }
-assert("utc?")    { t1.utc?                       }
-assert("zone")    { t1.zone    == "UTC"           }
-assert("wday")    { t1.wday    ==  0              }
-assert("yday")    { t1.yday    ==  71             }
-assert("year")    { t1.year    ==  2011           }
-
-t2 = Time.at(7.0e6)
-assert("initialize_copy") { t2.clone == t2 }
-
-report()

test/time.rb

+##
+# Time ISO Test
+
+assert('Time', '15.2.19') do
+  Time.class == Class
+end
+
+assert('Time.at', '15.2.19.6.1') do
+  Time.at(1300000000.0)
+end
+
+assert('Time.gm', '15.2.19.6.2') do
+  Time.gm(2012, 12, 23)
+end
+
+assert('Time#asctime', '15.2.19.7.4') do
+  Time.at(1300000000.0).utc.asctime == "Sun Mar 13 07:06:40 UTC 2011"
+end
+
+assert('Time#initialize_copy', '15.2.19.7.17') do
+  time_tmp_2 = Time.at(7.0e6)
+  time_tmp_2.clone == time_tmp_2
+end
+
+assert('Time#mday', '15.2.19.7.19') do
+  Time.gm(2012, 12, 23).mday == 23 
+end 
+
+assert('Time#month', '15.2.19.7.22') do
+  Time.gm(2012, 12, 23).month == 12
+end
+
+assert('Time#to_f', '15.2.19.7.24') do
+  Time.at(1300000000.0).to_f == 1300000000.0
+end
+
+assert('Time#to_i', '15.2.19.7.25') do
+  Time.at(1300000000.0).to_i == 1300000000
+end
+
+assert('Time#usec', '15.2.19.7.26') do
+  Time.at(1300000000.0).usec == 0
+end
+
+assert('Time#utc', '15.2.19.7.27') do
+  Time.at(1300000000.0).utc
+end
+
+assert('Time#utc?', '15.2.19.7.28') do
+  Time.at(1300000000.0).utc.utc?
+end
+
+assert('Time#wday', '15.2.19.7.30') do
+  Time.at(1300000000.0).utc.wday == 0
+end
+
+assert('Time#yday', '15.2.19.7.31') do
+  Time.at(1300000000.0).utc.yday == 71
+end
+
+assert('Time#year', '15.2.19.7.32') do
+  Time.gm(2012, 12, 23).year == 2012
+end
+
+assert('Time#zone', '15.2.19.7.33') do
+  Time.at(1300000000.0).utc.zone == 'UTC'
+end
+
+# Not ISO specified
+
+assert('Time#new') do
+  Time.new.class == Time
+end

tools/mrit/Makefile

+# makefile discription.
+# basic build file for mrit executable
+
+# project-specific macros
+# extension of the executable-file is modifiable(.exe .out ...)
+BASEDIR = ../../src
+TARGET := ../../bin/mrit
+LIBR := ../../lib/libmruby.a
+LIBRIT := ../../lib/libmrit.a
+ifeq ($(OS),Windows_NT)
+EXE := $(TARGET).exe
+else
+EXE := $(TARGET)
+endif
+OBJ0 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../tools/mrit/*.c))
+#OBJ1 := $(patsubst %.c,%.o,$(filter-out $(EXCEPT1),$(wildcard $(BASEDIR)/*.c)))
+#OBJ2 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/ext/regex/*.c))
+#OBJ3 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/ext/enc/*.c))
+OBJS := $(OBJ0)
+
+# ext libraries
+#EXT1 := $(patsubst %.c,%.o,$(wildcard $(BASEDIR)/../ext/socket/*.c))
+EXTS := $(EXT1)
+
+# libraries, includes
+LIBS = -lm
+INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
+
+# compiler, linker (gcc)
+CC = gcc
+LL = gcc
+YACC = bison
+DEBUG_MODE = 1
+ifeq ($(DEBUG_MODE),1)
+CFLAGS = -g -O3
+else
+CFLAGS = -O3
+endif
+ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
+ifeq ($(OS),Windows_NT)
+  MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
+else
+  MAKE_FLAGS = CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)'
+endif
+
+##############################
+# generic build targets, rules
+
+.PHONY : all
+all : $(LIBRIT) $(LIBR) $(EXE)
+	@echo "make: built targets of `pwd`"
+
+# executable constructed using linker from object files
+$(EXE) : $(LIBRIT) $(LIBR) $(OBJS) $(EXTS)
+	$(LL) -o $@ $(CFLAGS) $(OBJS) $(LIBRIT) $(LIBR) $(EXTS) $(LIBS)
+
+-include $(OBJS:.o=.d)
+
+# objects compiled from source
+$(OBJS) : %.o : %.c
+	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
+
+# C library compile
+$(LIBR) :
+	@$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS)
+$(LIBRIT) :
+	@$(MAKE) -C $(BASEDIR) $(MAKE_FLAGS)
+
+# mrit library compile
+# extend libraries complile
+$(EXTS) : %.o : %.c
+	$(CC) $(ALL_CFLAGS) -MMD $(INCLUDES) -c $< -o $@
+
+# clean up
+.PHONY : clean #cleandep
+clean :
+	$(MAKE) clean -C ../../test $(MAKE_FLAGS)
+	$(MAKE) clean -C ../../mrblib $(MAKE_FLAGS)
+	$(MAKE) clean -C ../mrbc $(MAKE_FLAGS)
+	@echo "make: removing targets, objects and depend files of `pwd`"
+	-rm -f $(EXE) $(OBJS)
+	-rm -f $(OBJS:.o=.d)

tools/mrit/mrit.c

+/*
+** mrit - Embeddable Ruby ISO Test
+**
+** This program verifies ISO/IEC 30170:2012
+** against the current mruby implementation.
+*/
+ 
+#include <string.h>
+
+#include <mruby.h>
+#include <mruby/proc.h>
+#include <mruby/data.h>
+#include <compile.h>
+
+void
+mrb_init_mritlib(mrb_state *);
+
+/* Print a short remark for the user */
+void print_hint(void)
+{
+  printf("mrit - Embeddable Ruby ISO Test\n");
+  printf("\nThis is a very early version, please test and report errors.\n");
+  printf("Thanks :)\n\n");
+}
+
+int
+main(void)
+{
+  struct mrb_parser_state *parser;
+  mrb_state *mrb_interpreter;
+  mrb_value mrb_return_value;
+  int byte_code;
+
+  print_hint();
+
+  /* new interpreter instance */
+  mrb_interpreter = mrb_open();
+  mrb_init_mritlib(mrb_interpreter);
+  parser = mrb_parse_nstring_ext(mrb_interpreter, "report()", strlen("report()"));
+
+  /* generate bytecode */
+  byte_code = mrb_generate_code(mrb_interpreter, parser->tree);
+
+  /* evaluate the bytecode */
+  mrb_return_value = mrb_run(mrb_interpreter,
+    /* pass a proc for evaulation */
+    mrb_proc_new(mrb_interpreter, mrb_interpreter->irep[byte_code]),
+    mrb_top_self(mrb_interpreter));
+  /* did an exception occur? */
+  if (mrb_interpreter->exc) {
+    mrb_p(mrb_interpreter, mrb_obj_value(mrb_interpreter->exc));
+    mrb_interpreter->exc = 0;
+  }
+  else {
+    /* no */
+  }
+
+  return 0;
+}