From f1c8d20fa8d0a2386f53d864032ccd9418ae9e13 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Wed, 2 Dec 2020 10:22:39 +0100
Subject: [PATCH] Fixed codelet bug

---
 src/parsed_text.py | 18 +++++++++---------
 src/util.py        |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/parsed_text.py b/src/parsed_text.py
index 9540307..2635bb5 100644
--- a/src/parsed_text.py
+++ b/src/parsed_text.py
@@ -236,10 +236,10 @@ def get_parsed_text():
         append( (l,line) )
     return result
 
- #main_result = []
- #for filename,text in preprocessed_text:
- #  main_result.append( (filename, func(filename,text)) )
- #return main_result
+  # Remove duplicates
+  global preprocessed_text
+  d = dict(preprocessed_text)
+  preprocessed_text = [ (k,d[k]) for k in d.keys() ]
   return parallel_loop(func,preprocessed_text)
 
 update_variables()
@@ -424,11 +424,11 @@ def move_variables():
       error.fail(line,"Unable to parse file")
     return result
 
-  main_result = []
-  for filename,text in parsed_text:
-    main_result.append( (filename, func(filename,text)) )
-  return main_result
- #return parallel_loop(func,parsed_text)
+#  main_result = []
+#  for filename,text in parsed_text:
+#    main_result.append( (filename, func(filename,text)) )
+#  return main_result
+  return parallel_loop(func,parsed_text)
 
 parsed_text = move_variables()
 
diff --git a/src/util.py b/src/util.py
index 775e64f..0f76ccd 100644
--- a/src/util.py
+++ b/src/util.py
@@ -166,7 +166,7 @@ def parallel_loop(f,source):
   result = []
   for filename, text in src[thread_id]:
     result.append( (filename, f(filename,text)) )
-  result.sort()
+  result = sorted(result, key=lambda x: x[0])
 
   if fork == 0:
     pickle.dump(result,w,-1)