X-Git-Url: http://nitlanguage.org

diff --git a/src/nitc.nit b/src/nitc.nit
index 938c7bb..cab5638 100644
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -1,6 +1,6 @@
 # This file is part of NIT ( http://www.nitlanguage.org ).
 #
-# Copyright 2008 Jean Privat <jean@pryen.org>
+# Copyright 2012 Jean Privat <jean@pryen.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,139 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Nit compiler main module
-package nitc
+# A Nit compiler
+module nitc
 
-import abstracttool
-import analysis
-import program
-private import compiling
-private import syntax
+import frontend
+import compiler
+import transform
 
-# The main class of the nitcompiler program
-class NitCompiler
-special AbstractCompiler
-	readable var _opt_output: OptionString = new OptionString("Output file", "-o", "--output")
-	readable var _opt_boost: OptionBool = new OptionBool("Optimize compilation", "-O", "--boost")
-	readable var _opt_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no_cc")
-	readable var _opt_global: OptionBool = new OptionBool("Use global compilation", "--global")
-	readable var _opt_global_no_STF_opt: OptionBool = new OptionBool("Do not use SFT optimization", "--no-global-SFT-optimization")
-	readable var _opt_global_no_DMR_opt: OptionBool = new OptionBool("Do not use dead method removal optimization", "--no-global-DMR-optimization")
-	readable var _opt_global_callgraph: OptionEnum = new OptionEnum(["none", "cha", "rta"], "The algorithm to use to build the callgraph", 2, "--global-callgraph")
-	readable var _opt_clibdir: OptionString = new OptionString("NIT C library directory", "--clibdir")
-	readable var _opt_bindir: OptionString = new OptionString("NIT tools directory", "--bindir")
-	readable var _opt_compdir: OptionString = new OptionString("Intermediate compilation directory", "--compdir")
-	readable var _opt_extension_prefix: OptionString = new OptionString("Append prefix to file extension", "-p", "--extension-prefix")
-	readable var _opt_dump: OptionBool = new OptionBool("Dump intermediate code", "--dump")
-
-	init
-	do
-		super("nitc")
-		option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix, opt_dump, opt_global_no_STF_opt, opt_global_no_DMR_opt, opt_global_callgraph)
-	end
-
-	redef fun process_options
+redef class ToolContext
+	redef fun process_options(args)
 	do
 		super
-		output_file = opt_output.value
-		boost = opt_boost.value
-		no_cc = opt_no_cc.value
-		var ext = opt_extension_prefix.value
-		if ext != null then ext_prefix = ext else ext_prefix = ""
-		global = opt_global.value
-		use_SFT_optimization = not opt_global_no_STF_opt.value
-		no_dead_method_removal = opt_global_no_DMR_opt.value
-		global_callgraph = opt_global_callgraph.value_name
-		compdir = opt_compdir.value
-		if compdir == null then
-			var dir = once ("NIT_COMPDIR".to_symbol).environ
-			if not dir.is_empty then 
-				compdir = dir
-			end
-			if compdir == null then
-				compdir = ".nit_compile"
-			end
-		end
-		compdir += ext_prefix
 
-		clibdir = opt_clibdir.value
-		if clibdir == null then
-			var dir = once ("NIT_DIR".to_symbol).environ
-			if dir.is_empty then 
-				dir = "{sys.program_name.dirname}/../clib"
-				if dir.file_exists then clibdir = dir
-			else
-				dir = "{dir}/clib"
-				if dir.file_exists then clibdir = dir
-			end
-			if clibdir == null then
-				fatal_error(null, "Error: Cannot locate NIT C library directory. Uses --clibdir or envvar NIT_DIR.")
-			end
-		end
-		bindir = opt_bindir.value
-
-		if bindir == null then
-			var dir = once ("NIT_DIR".to_symbol).environ
-			if dir.is_empty then 
-				dir = "{sys.program_name.dirname}/../bin"
-				if dir.file_exists then bindir = dir
-			else
-				dir = "{dir}/bin"
-				if dir.file_exists then bindir = dir
-			end
-			if bindir == null then
-				fatal_error(null, "Error: Cannot locate NIT tools directory. Uses --bindir or envvar NIT_DIR.")
-			end
-		end
-	end
-
-	fun dump_intermediate_code(mods: Collection[MMModule])
-	do
-		for mod in mods do
-			for c in mod.local_classes do
-				if not c isa MMConcreteClass then continue
-				for p in c.local_local_properties do
-					var routine: nullable IRoutine = null
-					if p isa MMAttribute then
-						routine = p.iroutine
-					else if p isa MMMethod then
-						routine = p.iroutine
-					end
-					if routine == null then continue
-					print "**** Property {p.full_name} ****"
-					var icd = new ICodeDumper
-					routine.dump(icd)
-					print "**** OPTIMIZE {p.full_name} ****"
-					routine.optimize(mod)
-					icd = new ICodeDumper
-					routine.dump(icd)
-				end
-			end
-		end
-	end
-
-	redef fun perform_work(mods)
-	do
-		if opt_dump.value then
-			dump_intermediate_code(mods)
-		end
-		for mod in mods do
-			var p = new Program(mod, self)
-			p.compute_main_method
-			p.generate_allocation_iroutines
-			if global then
-				p.do_global_pre_analysis_optimizations
-				p.do_global_analysis
-				p.do_global_post_analysis_optimizations
-				if opt_log.value then
-					p.dump_global_analysis_information(log_directory)
-				end
-			end
-			p.do_table_computation
-			p.compile_prog_to_c
+		var sum = opt_global.value.to_i + opt_separate.value.to_i + opt_erasure.value.to_i
+		if sum > 1 then
+			print "Options --global, --separate and --erasure are exclusive"
+			exit(1)
+		else if sum == 0 then
+			# --separate by default
+			opt_separate.value = true
 		end
 	end
 end
-
-var c = new NitCompiler
-c.exec_cmd_line