X-Git-Url: http://nitlanguage.org?ds=sidebyside

diff --git a/benchmarks/languages/bench_typetest_depth.nit b/benchmarks/languages/bench_typetest_depth.nit
index 7e4cd43..d5d2f2a 100644
--- a/benchmarks/languages/bench_typetest_depth.nit
+++ b/benchmarks/languages/bench_typetest_depth.nit
@@ -1,394 +1,97 @@
 #!/usr/bin/env nit
 
-# Microbenchmak generation for multiple language
-# Just a quick an dirty Nit script file :)
+import bench_base
 
-# This benchmark focuses on effects of the hierarchy dept
-# on the typetest performances
+class TypeTestDepthGenerator
+	super Generator
 
-# class Root
-# class Klass[E] super Root
-# class C1...CX super Root
-# Klass[CX] isa Klass[C1]
-
-class Klass
-	var id: Int
-	var supers = new Array[Klass]
-	var all_supers = new HashSet[Klass]
-	redef fun to_s
+	redef fun initnit(res)
 	do
-		return "C{id}"
-	end
-end
-
-class Generator
-
-	var classes = new Array[Klass]
-
-	var dept = 5
-	var loops = 10000
-	var middle = 0
-
-	fun genhier
-	do
-		var s: nullable Klass = null
-		for d in [1..dept] do
-			var c = new Klass(d)
-
-			classes.add(c)
-			c.all_supers.add(c)
-			if s != null then
-				c.supers.add(s)
-				c.all_supers.add_all(s.all_supers)
-			end
-			s = c
+		for c in classes do
+			res.add "new {c}[Root]"
 		end
-		middle = (dept + 1) / 2
+
 	end
 
-	var file: nullable OFStream = null
-	fun write(str: String)
+	redef fun testnit
 	do
-		file.write(str)
-		file.write("\n")
+		return "a isa {classes[middle]}[Root]"
 	end
 
-	fun writenit(dir: String, name: String)
+	redef fun initjava(res, interfaces)
 	do
-		dir = "{dir}/nit"
-		dir.mkdir
-		file = new OFStream.open("{dir}/{name}.nit")
 
-		write "class Root\n\tfun id: Int do return 0\nend"
+		var tagc = ""
+		if interfaces then tagc = "X"
 		for c in classes do
-			write "class {c}[E]"
-			if c.supers.is_empty then
-				write "\tsuper Root"
-			else for s in c.supers do
-				write "\tsuper {s}[E]"
-			end
-			write "\tredef fun id do return {c.id}"
-			write "end"
+			res.add "new {tagc}{c}<Root>()"
 		end
-
-		write "var a:{classes.first}[Root] = new {classes.last}[Root]"
-		write "var x = 0"
-		write "for i in [0..{loops}[ do"
-		write "\tfor j in [0..{loops}[ do"
-		write "\t\tif a isa {classes[middle]}[Root] then x += 1"
-		write "\tend"
-		write "end"
-		write "print x"
-
-		file.close
 	end
 
-	fun writejava(dir: String, name: String, interfaces: Bool)
+	redef fun testjava(interfaces)
 	do
-		dir = "{dir}/java"
-		dir.mkdir
-		file = new OFStream.open("{dir}/{name}.java")
-
-		var cl = ""
-		if interfaces then cl = "X"
-		write "class {name} \{"
-		if interfaces then
-			write "static interface Root\n\t\{ int id(); \}"
-		else
-			write "static class Root\n\t\{ int id() \{ return 0;\} \}"
-		end
-		for c in classes do
-			if interfaces then
-				write "static interface {c}<E> "
-			else
-				write "static class {c}<E> "
-			end
-			if c.supers.is_empty then
-				write "\textends Root"
-			else for s in [c.supers.first] do
-				write "\textends {s}<E>"
-			end
-			if interfaces then
-				write "\{\}"
-				write "static class X{c}<E> implements {c}<E>"
-			end
-			write "\{"
-			write "\tpublic int id() \{ return {c.id}; \}"
-			write "\}"
-		end
-
-		write "static public void main(String args[]) \{"
-		if interfaces then
-			write "\t{classes.first}<Root> a = new X{classes.last}<Root>();"
-			write "\t{classes.first}<Root> b = new X{classes.last}<Root>();"
-		else
-			write "\t{classes.first}<Root> a = new {classes.last}<Root>();"
-			write "\t{classes.first}<Root> b = new X{classes.last}<Root>();"
-		end
-		write "\ttest(a, b);"
-		write "\}"
-
-		write "static public void test({classes.first}<Root> a, {classes.first}<Root> b) \{"
-		write "\tint x = 0;"
-		write "\tfor(int i = 0; i < {loops}; i++) \{"
-		write "\t\tfor(int j = 0; j < {loops}; j++) \{"
-		write "\t\t\tif(a instanceof {classes[middle]}) \{ x++; \} else \{ a = b; \};"
-		write "\t\t}"
-		write "\t\}"
-		write "\tSystem.out.println(x);"
-		write "\}"
-		write "\}"
-		file.close
+		return "a instanceof {classes[middle]}"
 	end
 
-	fun writecsharp(dir: String, name: String, interfaces: Bool)
+	redef fun initcsharp(res, interfaces)
 	do
-		dir = "{dir}/cs"
-		dir.mkdir
-		file = new OFStream.open("{dir}/{name}.cs")
-
-		var cl = ""
-		if interfaces then cl = "X"
-		write "class {name} \{"
-		if interfaces then
-			write "interface Root\n\t\{ int Id(); \}"
-		else
-			write "class Root\n\t\{ public int Id() \{ return 0;\} \}"
-		end
+		var tagc = ""
+		if interfaces then tagc = "X"
 		for c in classes do
-			if interfaces then
-				write "interface {c}<E> "
-			else
-				write "class {c}<E> "
-			end
-			if c.supers.is_empty then
-				write "\t: Root"
-			else for s in [c.supers.first] do
-				write "\t: {s}<E>"
-			end
-			if interfaces then
-				write "\{\}"
-				write "class X{c}<E> : {c}<E>"
-			end
-			write "\{"
-			write "\tpublic int Id() \{ return {c.id}; \}"
-			write "\}"
+			res.add "new {tagc}{c}<Root>()"
 		end
-
-		write "static void Main(string[] args) \{"
-		if interfaces then
-			write "\t{classes.first}<Root> a = new X{classes.last}<Root>();"
-			write "\t{classes.first}<Root> b = new X{classes.last}<Root>();"
-		else
-			write "\t{classes.first}<Root> a = new {classes.last}<Root>();"
-			write "\t{classes.first}<Root> b = new {classes.last}<Root>();"
-		end
-		write "\tTest(a, b);"
-		write "\}"
-
-		write "static void Test({classes.first}<Root> a, {classes.first}<Root> b) \{"
-		write "\tint x = 0;"
-		write "\tfor(int i = 0; i < {loops}; i++) \{"
-		write "\t\tfor(int j = 0; j < {loops}; j++) \{"
-		write "\t\t\tif(a is {classes[middle]}<Root>) \{ x++; \} else \{ a = b; \};"
-		write "\t\t}"
-		write "\t\}"
-		write "\tSystem.Console.WriteLine(x);"
-		write "\}"
-		write "\}"
-		file.close
 	end
 
-	fun writescala(dir: String, name: String, interfaces: Bool)
+	redef fun testcsharp(interfaces)
 	do
-		dir = "{dir}/scala"
-		dir.mkdir
-		file = new OFStream.open("{dir}/{name}.scala")
+		return "a is {classes[middle]}<Root>"
+	end
 
-		var cl = ""
-		write "object {name} \{"
-		write "class Root\n\t\{ def id: Int = 0 \}"
+	redef fun initscala(res, interfaces)
+	do
+		var tagc = ""
+		if interfaces then tagc = "X"
 		for c in classes do
-			if interfaces then
-				write "trait {c}[E] "
-			else
-				write "class {c}[E] "
-			end
-			if c.supers.is_empty then
-				write "\textends Root"
-			else for s in [c.supers.first] do
-				write "\textends {s}[E]"
-			end
-			if interfaces then
-				write "\{\}"
-				write "class X{c}[E] extends {c}[E]"
-			end
-			write "\{"
-			write "\toverride def id: Int = {c.id}"
-			write "\}"
-		end
-
-		write "def main(args: Array[String]) = \{"
-		if interfaces then
-			write "\tvar a:{classes.first}[Root] = new X{classes.last}[Root]()"
-			write "\tvar b:{classes.first}[Root] = new X{classes.last}[Root]()"
-		else
-			write "\tvar a:{classes.first}[Root] = new {classes.last}[Root]()"
-			write "\tvar b:{classes.first}[Root] = new {classes.last}[Root]()"
+			res.add "new {tagc}{c}[Root]()"
 		end
-		write "\ttest(a, b)"
-		write "\}"
-
-		write "def test(a:{classes.first}[Root], b:{classes.first}[Root]) = \{"
-		write "\tvar o = a"
-		write "\tvar x = 0"
-		write "\tfor (i <- 0 to {loops}) \{"
-		write "\t\tfor (j <- 0 to {loops}) \{"
-		write "\t\tif (o.isInstanceOf[{classes[middle]}[Root]]) \{ x = x + 1 \} else \{ o = b \}"
-		write "\t\t\}"
-		write "\t\}"
-		write "\t\t\tprintln(x)"
-		write "\}"
-		write "\}"
-
-		file.close
 	end
 
-	fun writecpp(dir: String, name: String)
+	redef fun testscala(interfaces)
 	do
-		dir = "{dir}/cpp"
-		dir.mkdir
-		file = new OFStream.open("{dir}/{name}.cpp")
+		return "a.isInstanceOf[{classes[middle]}[Root]]"
+	end
 
-		write "#include <iostream>"
-		write "#include <stdlib.h>"
-		write "class Root\n\t\{ public: virtual int id() \{ return 0;\} \};"
+	redef fun initcpp(res)
+	do
 		for c in classes do
-			write "template<class E>"
-			write "class {c} "
-			if c.supers.is_empty then
-				write "\t: public virtual Root"
-			else for s in [c.supers.first] do
-				write "\t: public virtual {s}<E>"
-			end
-			write "\{"
-			write "\tpublic: virtual int id() \{ return {c.id}; \}"
-			write "\};"
+			res.add "new {c}<Root>()"
 		end
-
-		write "void test({classes.first}<Root>* a, {classes.first}<Root>* b) \{"
-		write "\tint x = 0;"
-		write "\tfor(int i = 0; i < {loops}; i++) \{"
-		write "\t\tfor(int j = 0; j < {loops}; j++) \{"
-		write "\t\t\t{classes[middle]}<Root>* to = dynamic_cast<{classes[middle]}<Root>*>(a);"
-		write "\t\tif(to != 0) \{ x++; \} else \{ a = b; \}"
-		write "\t\t}"
-		write "\t\}"
-		write "\tstd::cout << x << std::endl;"
-		write "\}"
-
-		write "int main(int argc, char **argv) \{"
-		write "\t{classes.first}<Root>* a = new {classes.first}<Root>();"
-		write "\t{classes.first}<Root>* b = new {classes.first}<Root>();"
-		write "\ttest(a, b);"
-		write "\}"
-
-		file.close
 	end
 
-	fun writee(dir: String, name: String, se: Bool)
+	redef fun testcpp
 	do
-		if se then
-			dir = "{dir}/se/{name}"
-		else
-			dir = "{dir}/es/{name}"
-		end
-		dir.mkdir
-		file = new OFStream.open("{dir}/root.e")
-
-		var istk = ""
-		if se then istk = " is"
-		write "class ROOT"
-		write "feature id: INTEGER {istk} do Result := 0 end"
-		write "end"
-		file.close
+		write "\t\t\t{classes[middle]}<Root> *to = dynamic_cast<{classes[middle]}<Root>*>(a);"
+		return "to != 0"
+	end
 
+	redef fun inite(res, se)
+	do
 		for c in classes do
-			file = new OFStream.open("{dir}/{c}.e")
-			write "class {c}[E] "
-			if c.supers.is_empty then
-				write "\tinherit ROOT"
-			else for s in [c.supers.first] do
-				write "\tinherit {s}[E]"
-			end
-			write "\t\tredefine id end"
-			write "feature"
-			write "\tid: INTEGER {istk} do Result := {c.id} end"
-			write "end"
-			file.close
-		end
-
-		file = new OFStream.open("{dir}/app{name}.e")
-		write "class APP{name.to_upper}"
-		if se then
-			write "insert ARGUMENTS"
+			res.add "create \{{c}[ROOT]\} a"
 		end
-		write "create make"
-		write "feature"
+	end
 
-		if se then
-			write "\tmake{istk}"
-		else
-			write "\tmake(args: ARRAY[STRING]){istk}"
-		end
-		write "\t\tlocal"
-		write "\t\t\ta: {classes.first}[ROOT]"
-		write "\t\t\tb: {classes.first}[ROOT]"
-		write "\t\tdo"
-		write "\t\t\tcreate \{{classes.last}[ROOT]\} a"
-		write "\t\t\tcreate \{{classes.last}[ROOT]\} b"
-		write "\t\t\ttest(a, b)"
-		write "\t\tend"
+	redef fun teste(se)
+	do
+		write "\t\t\t\t\tto ?= a"
+		return "to /= Void"
+	end
 
-		write "\ttest(a: {classes.first}[ROOT]; b: {classes.first}[ROOT]){istk}"
-		write "\t\tlocal"
-		write "\t\t\to: {classes.first}[ROOT]"
+	redef fun locale(se)
+	do
 		write "\t\t\tto: {classes[middle]}[ROOT]"
-		write "\t\t\ti: INTEGER"
-		write "\t\t\tj: INTEGER"
-		write "\t\t\tx: INTEGER"
-		write "\t\tdo"
-		write "\t\t\to := a"
-		write "\t\t\tfrom i := 0 until i>={loops} loop"
-		write "\t\t\t\tfrom j := 0 until j>={loops} loop"
-		write "\t\t\t\t\tto ?= o"
-		write "\t\t\t\t\tif to /= Void then x := x + 1 else o := b end"
-		write "\t\t\t\t\tj := j + 1"
-		write "\t\t\t\tend"
-		write "\t\t\t\ti := i + 1"
-		write "\t\t\tend"
-		write "\t\t\tprint(x.out)"
-		write "\t\tend"
-		write "end"
-		file.close
 	end
-
-	var count = false
 end
 
-var g = new Generator
-var outdir = args.first
-var name = args[1]
-var use_interfaces = true
-if args.length > 2 then g.dept = args[2].to_i
-if args.length > 3 then use_interfaces = false
-
-g.genhier
-
-g.writenit(outdir, name)
-g.writejava(outdir, name, use_interfaces)
-g.writecsharp(outdir, name, use_interfaces)
-g.writescala(outdir, name, use_interfaces)
-g.writecpp(outdir, name)
-g.writee(outdir, "{name}_se", true)
-g.writee(outdir, name, false)
+var g = new TypeTestDepthGenerator
+g.genall