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

diff --git a/src/nitc.nit b/src/nitc.nit
index 29a4ab4..803f637 100644
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -19,26 +19,30 @@ package nitc
 
 import abstracttool
 import analysis
-private import compiling
-private import syntax
+import global
+import program
+import compiling
+import syntax
+import native_interface
+import separate_options
 
 # The main class of the nitcompiler program
 class NitCompiler
-special AbstractCompiler
+	super 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_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no-cc")
+	readable var _opt_cc_no_link: OptionBool = new OptionBool("Do not invoke C linker", "--cc-no-link")
 	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")
+	readable var _opt_output_format: OptionEnum = new OptionEnum(["none", "C", "icode"], "The type of code we want to be generated", 1, "--output-format")
 
 	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)
+		option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_cc_no_link, opt_cc_libs, opt_cc_lib_paths, opt_cc_include_paths, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix, opt_output_format)
 	end
 
 	redef fun process_options
@@ -47,13 +51,16 @@ special AbstractCompiler
 		output_file = opt_output.value
 		boost = opt_boost.value
 		no_cc = opt_no_cc.value
+		cc_link = not opt_cc_no_link.value
+		cc_lib_paths.add_all( opt_cc_lib_paths.value )
+		cc_libs.add_all( opt_cc_libs.value )
+		cc_include_paths.add_all( opt_cc_include_paths.value )
 		var ext = opt_extension_prefix.value
 		if ext != null then ext_prefix = ext else ext_prefix = ""
-		global = opt_global.value
 		compdir = opt_compdir.value
 		if compdir == null then
-			var dir = once ("NIT_COMPDIR".to_symbol).environ
-			if not dir.is_empty then 
+			var dir = "NIT_COMPDIR".environ
+			if not dir.is_empty then
 				compdir = dir
 			end
 			if compdir == null then
@@ -61,26 +68,28 @@ special AbstractCompiler
 			end
 		end
 		compdir += ext_prefix
+		compdir = compdir.simplify_path
 
 		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}/../lib"
+			var dir = "NIT_DIR".environ
+			if dir.is_empty then
+				dir = "{sys.program_name.dirname}/../clib"
 				if dir.file_exists then clibdir = dir
 			else
-				dir = "{dir}/lib"
+				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
+		clibdir = clibdir.simplify_path
 
+		bindir = opt_bindir.value
 		if bindir == null then
-			var dir = once ("NIT_DIR".to_symbol).environ
-			if dir.is_empty then 
+			var dir = "NIT_DIR".environ
+			if dir.is_empty then
 				dir = "{sys.program_name.dirname}/../bin"
 				if dir.file_exists then bindir = dir
 			else
@@ -91,44 +100,27 @@ special AbstractCompiler
 				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
-					icd = new ICodeDumper
-					routine.dump(icd)
-				end
-			end
-		end
+		bindir = bindir.simplify_path
 	end
 
 	redef fun perform_work(mods)
 	do
-		if opt_dump.value then
-			dump_intermediate_code(mods)
-		end
 		for mod in mods do
-			mod.compile_prog_to_c(self)
+			var p = new Program(mod, self)
+			p.output_format = opt_output_format.value_name
+			p.compute_main_method
+			p.generate_allocation_iroutines
+			if global then p.do_global_analysis
+			p.do_table_computation
+			p.compile_prog
 		end
-
 	end
 end
 
+redef class ToolContext
+	redef init do super # Avoid local property conflict
+end
+
+
 var c = new NitCompiler
 c.exec_cmd_line