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

diff --git a/src/nitc.nit b/src/nitc.nit
index d288e81..6115520 100644
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -18,90 +18,110 @@
 package nitc
 
 import abstracttool
-private import compiling
+import analysis
+import global
+import program
+import compiling
+import syntax
+import native_interface
+import separate_options
+import ffi
 
 # The main class of the nitcompiler program
 class NitCompiler
-special AbstractCompiler
-	readable attr _opt_output: OptionString = new OptionString("Output file", "-o", "--output")
-	readable attr _opt_boost: OptionBool = new OptionBool("Optimize compilation", "-O", "--boost")
-	readable attr _opt_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no_cc")
-	readable attr _opt_attr_sim: OptionBool = new OptionBool("Use attribute simulation", "--attr-sim")
-	readable attr _opt_global: OptionBool = new OptionBool("Use global compilation", "--global")
-	readable attr _opt_clibdir: OptionString = new OptionString("NIT C library directory", "--clibdir")
-	readable attr _opt_bindir: OptionString = new OptionString("NIT tools directory", "--bindir")
-	readable attr _opt_compdir: OptionString = new OptionString("Intermediate compilation directory", "--compdir")
-	readable attr _opt_extension_prefix: OptionString = new OptionString("Append prefix to file extension", "-p", "--extension-prefix")
+	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_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_output_format: OptionEnum = new OptionEnum(["none", "C", "icode"], "The type of code we want to be generated", 1, "--output-format")
 
 	init
 	do
-		super
-		option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_attr_sim, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix)
+		super("nitc")
+		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 meth process_options
+	redef fun process_options
 	do
 		super
 		output_file = opt_output.value
 		boost = opt_boost.value
 		no_cc = opt_no_cc.value
-		ext_prefix = opt_extension_prefix.value
-		if ext_prefix == null then ext_prefix = ""
-		attr_sim = opt_attr_sim.value
-		global = opt_global.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 = ""
 		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
 				compdir = ".nit_compile"
 			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 
-				var 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
-				error("Error: Cannot locate NIT C library directory. Uses --clibdir or envvar NIT_DIR.")
-				exit(1)
+				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 = "{sys.program_name.dirname}/../bin"
+			var dir = "NIT_DIR".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
-				error("Error: Cannot locate NIT tools directory. Uses --bindir or envvar NIT_DIR.")
-				exit(1)
+				fatal_error(null, "Error: Cannot locate NIT tools directory. Uses --bindir or envvar NIT_DIR.")
 			end
 		end
+		bindir = bindir.simplify_path
 	end
 
-	redef meth perform_work(mods)
+	redef fun perform_work(mods)
 	do
 		for mod in mods do
-			assert mod isa MMSrcModule
-			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