From: Jean Privat <jean@pryen.org>
Date: Thu, 4 Dec 2014 03:09:58 +0000 (-0500)
Subject: nitls: make -d and -r usable together
X-Git-Tag: v0.7~75^2~20
X-Git-Url: http://nitlanguage.org

nitls: make -d and -r usable together

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/nitls.nit b/src/nitls.nit
index 0dd3cfd..ad087ee 100644
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -89,39 +89,34 @@ tc.keep_going = opt_keep.value
 var model = new Model
 var mb = new ModelBuilder(model, tc)
 
-if opt_depends.value then
-	if opt_recursive.value then
-		print "-M incompatible with -r"
-		exit 1
-	end
-
-	mb.parse(tc.option_context.rest)
-else
-	var files
-	if opt_recursive.value then
-		files = new Array[String]
-		for d in tc.option_context.rest do
-			var pipe = new IProcess("find", d, "-name", "*.nit")
-			while not pipe.eof do
-				var l = pipe.read_line
-				if l == "" then break # last line
-				l = l.substring(0,l.length-1) # strip last oef
-				files.add l
-			end
-			pipe.close
-			pipe.wait
-			if pipe.status != 0 and not opt_keep.value then exit 1
+var files
+if opt_recursive.value then
+	files = new Array[String]
+	for d in tc.option_context.rest do
+		var pipe = new IProcess("find", d, "-name", "*.nit")
+		while not pipe.eof do
+			var l = pipe.read_line
+			if l == "" then break # last line
+			l = l.substring(0,l.length-1) # strip last oef
+			files.add l
 		end
-	else
-		files = tc.option_context.rest
+		pipe.close
+		pipe.wait
+		if pipe.status != 0 and not opt_keep.value then exit 1
 	end
+else
+	files = tc.option_context.rest
+end
 
-	for a in files do
-		var mp = mb.identify_file(a)
-		tc.check_errors
-		if mp != null and not opt_paths.value then
-			mb.load_module(mp.filepath)
+for a in files do
+	var mp = mb.identify_file(a)
+	tc.check_errors
+	if mp != null and not opt_paths.value then
+		var mm = mb.load_module(mp.filepath)
+		if mm != null and opt_depends.value then
+			mb.build_module_importation(mm)
 		end
+		tc.check_errors
 	end
 end