Changeset 237

Timestamp:

07/27/2010 05:44:15 PM (13 years ago)

Author:

marcus

Message:

Concat operator for command procedures.

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/parser.py (modified) (7 diffs)
• tests/test_parser.py (modified) (11 diffs)

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

@@ -257 +257 @@
                     inputdata = inputdata.upper()
 
+                self.filename = inputdata
+                
                 # look for file in search path
                 for folder in self.searchpath:
@@ -315 +317 @@
         self.targets = targets
 
+    def traceBack(self):
+        pass
+    
     def run(self):
         while True:
@@ -324 +329 @@
 
                 cmd = parse(cmd).parsed
+
+                # translate variables
+                _ = translate(cmd, self)
 
                 # Check for internal command ...
@@ -335 +343 @@
                 # or execute command...
                 elif cmd["shx_command"] in commands.list:
-                    # translate variables
-                    _ = translate(cmd, self)
-
                     if Settings.swVerify:
                         print cmd["shx_translated"]
@@ -521 +526 @@
         # translate parameters
         for i, p in enumerate(cmd["shx_parameter"]):
-            if p[0] not in '"$^#%':
-                continue
-
-            id = p[0]
-            # system
-            if id == "$":
-                cmd["shx_parameter"][i] = self.handleSystem(p[1:])
-            # symbols
-            elif id == '"':
-                cmd["shx_parameter"][i] = self.handleSymbol(p[1:])
-            # trace XXX
-            elif id == '^':
-                cmd["shx_parameter"][i] = self.handleTrace(p[1:])
-            # options at startup XXX
-            elif id == '#':
-                cmd["shx_parameter"][i] = self.handleOption(p[1:])
-            # file XXX
-            elif id == '%':
-                cmd["shx_parameter"][i] = self.handleFile(p[1:])
+            cmd["shx_parameter"][i] = self.__translate(p)
 
         # translate qualifiers
@@ -549 +536 @@
                 continue
 
-            id = p[0]
-
-            if id == "$":
-                cmd["shx_qualifiers"][q] = self.handleSystem(p[1:])
-            elif id == '"':
-                cmd["shx_qualifiers"][q] = self.handleSymbol(p[1:])
-            elif id == '^':
-                cmd["shx_qualifiers"][q] = self.handleTrace(p[1:])
-            elif id == '#':
-                cmd["shx_qualifiers"][q] = self.handleOption(p[1:])
-            elif id == '%':
-                cmd["shx_qualifiers"][q] = self.handleFile(p[1:])
+            cmd["shx_qualifiers"][q] = self.__translate(p)
 
         # Actually this is only for debugging purposes.
@@ -580 +556 @@
         ])
 
+    def __translate(self, value):
+        idmap = {
+            '$': self.handleSystem,
+            '"': self.handleSymbol,
+            '^': self.handleTrace,
+            '#': self.handleOption,
+            '%': self.handleFile,
+        }
+
+        id = value[0]
+
+        # concat operator
+        if id == "|":
+            parts = filter(None, value.split("|"))
+            newparts = [self.__translate(i) for i in parts]
+            return "".join(newparts)
+
+        if id not in idmap.keys():
+            return value
+
+        value = value[1:]
+
+        return idmap[id](value)
+
     def handleSystem(self, name):
         try:

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

@@ -33 +33 @@
 
     def tearDown(self):
+        """
+        Remove left-overs.
+        """
+
         try:
             os.unlink(self.outfile + ".STX")
@@ -39 +43 @@
 
     def addEchoChannel(self, data):
+        """
+        Add envelope to commands in order to catch output.
+        """
         data.insert(0, "echo_ch %s" % self.outfile)
         data.append("echo_ch")
@@ -45 +52 @@
 
     def callScript(self, data):
+        """
+        Take a list of commands, execute them and return output produced.
+        """
         data = "\n".join(self.addEchoChannel(data.splitlines()))
 
@@ -56 +66 @@
 
     def getResults(self):
+        """
+        Read and return output.
+        """
         return open(self.outfile + ".STX").read()
 
     def testEcho1(self):
+        """
+        Text output with/out newline and case conversion.
+        """
         script = """
         echo foo /NO_CRLF
@@ -69 +85 @@
 
     def testEcho2(self):
+        """
+        Non-existing symbol.
+        """
         script = """
         echo "foo
@@ -75 +94 @@
         self.assertRaises(Exception, self.callScript, script)
 
+    def testEcho3(self):
+        """
+        Concat operator.
+        """
+        script = """
+        echo |foo|bar|$DOLLAR| /NO_CRLF
+        """
+        expect = "FOOBAR$"
+
+        res = self.callScript(script)
+        self.assertEqual(res, expect)
+
     def testSdef(self):
+        """
+        Define and delete user symbols. Local symbols mask global ones.
+        """
         script = """
         sdef foo 1
@@ -90 +124 @@
         self.assertEqual(res, expect)
 
-
     def testSystem(self):
+        """
+        Some system variables.
+        """
         script = """
         echo $DOLLAR /NO_CRLF
@@ -105 +141 @@
 
     def testSwitch1(self):
+        """
+        Stop on error or just a warning.
+        """
         script = """
         switch cmderrstop off
@@ -119 +158 @@
 
     def testSwitch2(self):
+        """
+        Global case conversion.
+        """
         script = """
         switch capconv off
@@ -131 +173 @@
 
     def testSwitch3(self):
+        """
+        Unknown switch.
+        """
         script = """
         switch foo on
@@ -138 +183 @@
 
     def testReturn(self):
+        """
+        Return from script.
+        """
         # the explicit "echo_ch" closes output stream in order to flush contents
         script = """