Handle duplicate module names in the project file. (rems-project#1551)

* Handle duplicate module names in the project file.

A missed check would result in an uncaught `Not_found` exception
when the `id` for the first module was looked up after the
duplicate shadowed it in the StringMap.

* Complete the test script in test/project.

* Add test case for duplicate module names in project file.

Author: pmundkur

src/lib/project.ml

@@ -588,7 +588,21 @@ let initialize_project_structure ~variables defs =
   let _ = visit_defs (new order_visitor xs) defs in
   let names = Array.of_list (List.rev !xs) in
   let ids =
-    snd (Array.fold_left (fun (n, m) name -> (n + 1, StringMap.add (fst name) n m)) (0, StringMap.empty) names)
+    snd
+      (Array.fold_left
+         (fun ((n, d), m) (name, loc) ->
+           if StringMap.mem name d then
+             raise
+               (Reporting.err_general (to_loc loc)
+                  ("Duplicate module name '" ^ name ^ "', previously defined at\n"
+                  ^ Reporting.loc_to_string (to_loc (StringMap.find name d))
+                  )
+               );
+           ((n + 1, StringMap.add name loc d), StringMap.add name n m)
+         )
+         ((0, StringMap.empty), StringMap.empty)
+         names
+      )
   in
   (* Evaluate the expressions in the project file *)
   let defs = visit_defs (new eval_visitor variables) defs in

test/project/failure/duplicate.expect

@@ -0,0 +1,9 @@
+Error:
+failure/duplicate.sail_project:4.0-1:
+4 |A {
+  |^
+  | Duplicate module name 'A', previously defined at
+  | failure/duplicate.sail_project:1.0-1:
+  | 1 |A {
+  |   |^
+  |   | 

test/project/failure/duplicate.sail_project

@@ -0,0 +1,5 @@
+A {
+}
+
+A {
+}

test/project/run_tests.py

@@ -18,3 +18,30 @@
 
 print("Sail is {}".format(sail))
 print("Sail dir is {}".format(sail_dir))
+
+def test_project():
+    banner('Testing project')
+    results = Results('project')
+    for filenames in chunks(os.listdir('failure'), parallel()):
+        tests = {}
+        for filename in filenames:
+            basename = os.path.splitext(os.path.basename(filename))[0]
+            tests[filename] = os.fork()
+            if tests[filename] == 0:
+                step('\'{}\' failure/{} 2> failure/{}.error'.format(sail, filename, basename), expected_status = 1)
+                step('diff failure/{}.expect failure/{}.error'.format(basename, basename))
+                step('rm failure/{}.error'.format(basename))
+                print_ok(filename)
+                sys.exit(0)
+        results.collect(tests)
+    return results.finish()
+
+xml = '<testsuites>\n'
+
+xml += test_project()
+
+xml += '</testsuites>\n'
+
+output = open('tests.xml', 'w')
+output.write(xml)
+output.close()

test/sailtest.py

@@ -92,7 +92,7 @@ def chunks(filenames, cores):
     chunk = []
     for filename in filenames:
         basename = os.path.splitext(os.path.basename(filename))[0]
-        if re.match(r'.+\.sail$', filename) and (not args.test or basename in args.test):
+        if (re.match(r'.+\.sail$', filename) or re.match(r'.+\.sail_project$', filename)) and (not args.test or basename in args.test):
             chunk.append(filename)
         if len(chunk) >= cores:
             ys.append(list(chunk))