merge

orcc

@@ -18,6 +18,9 @@ else:
     dirs = [os.path.join(cur_dir,'orio')]
 sys.path.extend(dirs)
 
+if 'ORIO_DEBUG' in os.environ.keys():
+    print "DEBUG: system search path:", sys.path
+
 
 # dispatch to Orio's main
 import orio.main.orio_main

orio/main/orio_main.py

@@ -121,6 +121,7 @@ def start(argv, lang):
 
                 optimized_code, _, externals = optimized_code_seq[0]
                 if g.out_filename: out_filename = g.out_filename
+                g.tempfilename = out_filename
                 info('--> writing output to: %s' % out_filename)
                 try:
                     f = open(out_filename, 'w')

orio/main/util/globals.py

@@ -24,6 +24,7 @@ def __init__(self,cmdline={}):
             self.error_pre = "\x1B[00;31m"
             self.error_post = "\x1B[00m"
             self.metadata = {'loop_transformations':[]}
+            self.counter = 0
 
             self.funcDec = ''           #Added by Axel Y. Rivera (UofU)
             self.funcName = ''            #Added by Axel Y. Rivera (UofU)
@@ -172,6 +173,9 @@ def __init__(self,cmdline={}):
                 self.validationMode = False
             self.executedOriginal = False
 
+            # Temporary filename for various helper files (not source)
+            self.tempfilename = 'temp'
+
             pass
 
         def addLogger(self, thelogger):
@@ -180,8 +184,12 @@ def addLogger(self, thelogger):
         def test(self):
             """ Test method, return singleton id """
             return id(self)
+
+        def incrementCounter(self):
+            self.counter += 1
+            return self.counter
 
-
+    pass   # end of Globals class
 
     __single = None  # Used for ensuring singleton instance
     def __init__(self,cmdline={}):