Changeset 242

Timestamp:

07/28/2010 02:59:40 PM (11 years ago)

Author:

marcus

Message:

• parser work and minor bug fixes
• closes #26 (default), tests included

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/parser.py (modified) (12 diffs)
• tests/data (modified) (1 prop)
• tests/data/SCRIPT1.SHC (modified) (1 diff)
• tests/data/SCRIPT2.SHC (modified) (1 diff)
• tests/data/SCRIPT3.SHC (added)
• tests/data/SCRIPT4.SHC (added)
• tests/test_parser.py (modified) (3 diffs)

SHX/trunk/src/SeismicHandler/core/parser.py

@@ -239 +239 @@
         # also qualifiers.
         if parameters:
-#            print parameters
-#            self.parameters = translate(parameters, self)
             self.parameters = parameters
 
@@ -263 +261 @@
 
                 self.filename = inputdata
-                
+
                 # look for file in search path
                 for folder in self.searchpath:
@@ -335 +333 @@
             import warnings
             warnings.warn((error, msg))
-    
+
     def run(self):
         while True:
@@ -361 +359 @@
                     if Settings.swVerify:
                         print cmd["shx_translated"]
-                    
+
                     try:
                         # also supply recent symbolset
@@ -411 +409 @@
         # jump to end of script
         self.pointer = len(self.content)
+
+    def commandDefault(self, *args):
+        """
+        Query default values.
+
+        Since this statement manipulates script option variables, it's not done
+        as command class.
+
+        Note: No qualifiers are supported! Input is read from stdin.
+        """
+
+        # no parameters given at all -> request user input
+        # set as class attribute for caching.
+        try:
+            self.userreq = self.userreq and True or \
+                                      len(self.parameters["shx_parameter"]) == 0
+        except AttributeError:
+            self.userreq = len(self.parameters["shx_parameter"]) == 0
+
+        id = int(args[0])-1
+        default = args[1]
+
+        val = None
+        try:
+            val = self.parameters["shx_parameter"][id]
+        except IndexError:
+            if self.userreq:
+                # request user input
+                if len(default):
+                    q = " [default: %s]: " % default
+                else:
+                    q = " : "
+
+                userinput = raw_input(" ".join(args[2:]) + q)
+                if userinput:
+                    default = userinput
+
+        if not val:
+            # fill from default
+            try:
+                self.parameters["shx_parameter"][id] = default
+            except IndexError:
+                self.parameters["shx_parameter"].append(default)
 
     def commandGoto(self, target):
@@ -472 +513 @@
 
     After translation all parameter and qualifiers are replaced.
-    
+
     If the global option "Verify" is set the translated command string is saved
     into "shx_translated". This string is rebuild from the translated parts,
@@ -530 +571 @@
     def __init__(self, cmd, script=None):
         self.script = script
-        
+
         # translate parameters
         for i, p in enumerate(cmd["shx_parameter"]):
@@ -548 +589 @@
         if not Settings.swVerify:
             return
-        
+
         qual = []
         for q in cmd["shx_qualifiers"]:
@@ -555 +596 @@
             else:
                 qual.append("%s=%s" % (q, cmd["shx_qualifiers"][q]))
-            
+
         cmd["shx_translated"] = " ".join([
             cmd["shx_converted"] and cmd["shx_command"].upper() or \
@@ -564 +605 @@
 
     def _translate(self, value):
+        if not value:
+            return ''
+
         idmap = {
             '$': self.__handleSystem,
@@ -622 +666 @@
 
     def __handleOption(self, name):
+        """
+        Return parameters set on procedure call.
+
+        Possible values:
+        #0 - filename
+        #1..#99 - parameter number xx
+        #name - qualifier "name"
+        """
         if name.isdigit():
-            return self.script.parameters['shx_parameter'][int(name)-1]
+            id = int(name)-1
+            if id >= 0:
+                return self.script.parameters['shx_parameter'][id]
+            else:
+                return self.script.filename
         else:
             return self.script.parameters['shx_qualifiers'][name]
@@ -647 +703 @@
                 return line.strip()
 
-        return str(cnt+1)
+        if l == 0:
+            return str(cnt+1)
+        else:
+            raise Exception("Line %d not found in file '%s'!" % (l, f))
 
 class symbol(object):

SHX/trunk/src/SeismicHandler/tests/data

@@ -1 +1 @@
 .SCRIPT1.SHC.swp
+.SCRIPT4.SHC.swp
+.nfs00000000002188580000016d

@@ -1 +1 @@
 .SCRIPT1.SHC.swp
+.SCRIPT4.SHC.swp
+.nfs00000000002188580000016d

SHX/trunk/src/SeismicHandler/tests/data/SCRIPT1.SHC

@@ -10 +10 @@
 ! close output stream
 echo_ch
+return

SHX/trunk/src/SeismicHandler/tests/data/SCRIPT2.SHC

@@ -1 @@
-echo script2: "foo #1 #qux
+echo #0 "foo #1 #qux
 sdef bar /global 42
 return

SHX/trunk/src/SeismicHandler/tests/test_parser.py

@@ -234 +234 @@
         self.assertEqual(res, expect)
 
+    def test2Default(self):
+        """
+        Default options.
+
+        Uses SCRIPT3 and SCRIPT4 for testing.
+        """
+
+        from SeismicHandler.core.parser import script, symbol
+
+        s = symbol()
+        x = script("script3", s, searchpath=["data"])
+        x.run()
+
+        expect = 'ONE "FOO" QUX\nFOO "BAR" QUX\nONE "bar" QUX\n'
+
+        res = self.getResults()
+        self.assertEqual(res, expect)
+
     def testScript1(self):
         """
@@ -256 +274 @@
         x.run()
 
-        expect = "SCRIPT2: 23 BAR 1\nSCRIPT1: 42\n"
+        expect = "SCRIPT2.SHC 23 BAR 1\nSCRIPT1: 42\n"
 
         res = self.getResults()
@@ -262 +280 @@
 
 def suite():
-    return unittest.makeSuite(parserTestCase, 'test')
+    return unittest.makeSuite(parserTestCase, 'test2')
 
 if __name__ == "__main__":

@@ -1 +1 @@
 .SCRIPT1.SHC.swp
+.SCRIPT4.SHC.swp
+.nfs00000000002188580000016d