From 6bdc7afde4eb3662fdfb51a6cf8201e80f9db876 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Fri, 23 May 2014 22:34:09 +0200
Subject: [PATCH] Disallow provide, touch, soft_touch, provide_all in openMP

---
 src/preprocessed_text.py | 22 ++++++++++++++++++++++
 src/variable.py          | 23 +++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/preprocessed_text.py b/src/preprocessed_text.py
index 63d0c72..eabe855 100644
--- a/src/preprocessed_text.py
+++ b/src/preprocessed_text.py
@@ -852,6 +852,27 @@ def remove_ifdefs(text):
         result.append(line)
   return result
 
+######################################################################
+def check_OpenMP(text):
+  assert type(text) == list
+  result = []
+  inside_openmp = False
+  for line in text:
+     if type(line) == Openmp:
+       # Detect OpenMP blocks
+       buffer = line.text.lower().split()
+       if buffer[1] == "parallel":
+         inside_openmp = True
+       if buffer[1] == "end" and buffer[2] == "parallel":
+         inside_openmp = False
+     result.append(line)
+
+     if inside_openmp:
+       if type(line) in [ Provide_all, Provide, Touch, SoftTouch ]:
+          error.fail(line,type(line).str+" is not allowed in an OpenMP block.")
+
+  return result
+
 ######################################################################
 def create_preprocessed_text(filename):
   file = open(filename,"r")
@@ -869,6 +890,7 @@ def create_preprocessed_text(filename):
   result = change_single_line_ifs(result)
   result = process_old_style_do(result)
   result = irp_simple_statements(result)
+  result = check_OpenMP(result)
   check_begin_end(result)
   return result
 
diff --git a/src/variable.py b/src/variable.py
index 82904d7..b4b4499 100644
--- a/src/variable.py
+++ b/src/variable.py
@@ -58,14 +58,8 @@ class Variable(object):
   ############################################################
   def has_openmp(self):
     if '_has_openmp' not in self.__dict__:
-      buffer = None
-      text = self.text
-      result = False
-      for line in text:
-        if type(line) == Openmp:
-          result = True
-          break
-      self._has_openmp = result
+      self._has_openmp = False
+      self.builder()
     return self._has_openmp
   has_openmp = property(has_openmp)
 
@@ -593,6 +587,7 @@ class Variable(object):
         text = parsed_text.move_to_top(text,Implicit)
         text = parsed_text.move_to_top(text,Use)
         text = map(lambda x: x[1], text)
+        inside_omp = False
         for line in filter(lambda x: type(x) not in [ Begin_doc, End_doc, Doc], text):
           if type(line) == Begin_provider:
             result = []
@@ -608,7 +603,19 @@ class Variable(object):
                           "  call irp_set_timer(%d,(irp_rdtsc2-irp_rdtsc1))"%self.label ]
             result.append( "end subroutine bld_%s"%(name) )
             break
+          elif type(line) == Openmp:
+            # Detect OpenMP blocks
+            buffer = line.text.lower().split()
+            if buffer[1] == "parallel":
+              inside_omp = True
+              self._has_openmp = True
+            if buffer[1] == "end" and buffer[2] == "parallel":
+              inside_omp = False
+            result.append(line.text)
           else:
+#           if inside_omp:
+#             if type(line) in [ Provide_all, Provide, Touch, SoftTouch ]:
+#               error.fail(line,str(type(line))+"is not allowed in an OpenMP block.")
             result.append(line.text)
         self._builder = result
     return self._builder