Changeset 533

Timestamp:

02/08/2012 04:16:37 PM (12 years ago)

Author:

marcus

Message:

• finished IF command (without /forward support)

File:

• SHX/trunk/SeismicHandler/modules/parse.py (modified) (7 diffs)

SHX/trunk/SeismicHandler/modules/parse.py

@@ -300 +300 @@
         except:
             # cannot open
-            raise ShxError("Input not readable!")
+            raise ShxError("Command or procedure not found!", status=1001)
 
         # Cache self-handled commands. These methods begin with "command".
@@ -378 +378 @@
                 print cmd
 
+            logMessage("debug.parse", "executing '%s'" % cmd)
+
             cmd = Parse(cmd, switches=self.switches).parsed
 
@@ -383 +385 @@
             _ = Translate(cmd, self, switches=self.switches)
             self.__recent = cmd.get("shx_translated", cmd["shx_input_conv"])
+
+            logMessage("debug.parse", "converted '%s'" % self.__recent)
 
             # Check for internal command ...
@@ -510 +514 @@
 
     def commandIf(self, *args, **kwargs):
-        print args, kwargs
-        pass
-
-    def IfGoto(self, cmd):
         # cast format
         cast = {
@@ -521 +521 @@
                 }
 
-        cmp, check = cmd.p[2].value, cmd.p[2].value[:2]
-
-        var1 = cast[cmp[-1]](cmd.p[1].value)
-        var2 = cast[cmp[-1]](cmd.p[3].value)
+        try:
+            var1, cmp, var2, operation = args[:4]
+        except:
+            raise ShxError("invalid parameters", status=1701)
+
+        operation = operation.lower()
+        if operation not in ["goto", "return"]:
+            raise ShxError("illegal IF command %s" % operation, status=1712)
+
+        var1 = cast[cmp[-1].upper()](var1)
+        var2 = cast[cmp[-1].upper()](var2)
 
         # comparison
@@ -548 +555 @@
 
         # check condition
-        if comp[check](var2):
-            self.Goto(cmd.p[5].value)
+        if not comp[cmp[:2].upper()](var2):
+            logMessage("debug.parse.if", "statement is evaluated as false")
+            return
+
+        logMessage("debug.parse.if", "statement is evaluated as true")
+
+        if operation == "return":
+            self.commandReturn()
+        else:
+            # GOTO is left
+            try:
+                self.commandGoto(args[4])
+            except IndexError:
+                raise ShxError("too less parameters passed", status=1712)
 
 
@@ -662 +681 @@
             cmd["shx_converted"] and cmd["shx_command"].upper() or \
                                                              cmd["shx_command"],
-            " ".join(cmd["shx_parameter"]),
+            " ".join(map(str, cmd["shx_parameter"])),
             len(qual) and "/" + " /".join(qual) or "",
         ])