Changeset 231

Timestamp:

07/20/2010 05:16:48 PM (13 years ago)

Author:

marcus

Message:

• parser work
• command sdef done (solved #21)

Location:

SHX/trunk/src/SeismicHandler

Files:

• commands/sdef.py (added)
• core/command.py (modified) (2 diffs)
• core/parser.py (modified) (8 diffs)
• tests/data/SCRIPT1.SHC (modified) (1 diff)

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

@@ -54 +54 @@
             # first from parser
             try:
-                self.qualifiers[q] = kwargs["shx_qualifier"][q]
+                self.qualifiers[q] = kwargs["shx_qualifiers"][q]
                 continue
             except KeyError:
@@ -89 +89 @@
             self.parameters = args
 
+        # transfer symbol set
+        try:
+            self.symbols = kwargs["shx_symbols"]
+        except:
+            self.symbols = None
+
         self.logger.debug("%s: %s, %s" % (self.__class__.__name__, \
                                               self.parameters, self.qualifiers))

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

@@ -59 +59 @@
     Switches may occur at any position, but are commonly placed following the
     command name:
-    >>> sorted(x["shx_qualifier"].keys())
+    >>> sorted(x["shx_qualifiers"].keys())
     ['SWITCH1', 'SWITCH2']
-    >>> x["shx_qualifier"]["SWITCH1"]
+    >>> x["shx_qualifiers"]["SWITCH1"]
     True
-    >>> x["shx_qualifier"]["SWITCH2"]
+    >>> x["shx_qualifiers"]["SWITCH2"]
     '4'
 
@@ -77 +77 @@
     >>> x["shx_parameter"]
     ['BAR', 'FOO']
-    >>> x["shx_qualifier"]["FOO"]
+    >>> x["shx_qualifiers"]["FOO"]
     '1'
 
     Please note that the "suspected" file name is also present as switch:
-    >>> sorted(x["shx_qualifier"].keys())
+    >>> sorted(x["shx_qualifiers"].keys())
     ['BLA', 'FOO', 'SW', 'TEST', 'TMP']
     >>> x["shx_suspectedFilename"]
@@ -127 +127 @@
             sfile = None
 
-        qualifier = {}
+        qualifiers = {}
         # remove cmd and qualifiers from string
         cmd_par = input.replace(cmd, "")
@@ -136 +136 @@
             i = qq.split("=")
             if len(i) > 1:
-                qualifier[i[0][1:]] = i[1]
+                qualifiers[i[0][1:]] = i[1]
             else:
-                qualifier[i[0][1:]] = True
+                qualifiers[i[0][1:]] = True
 
         par = cmd_par.split()
@@ -163 +163 @@
                 "shx_command": cmd.lower(), # command always in lower case
                 "shx_parameter": parameter,
-                "shx_qualifier": qualifier,
+                "shx_qualifiers": qualifiers,
                 "shx_suspectedFilename": sfile,
         }
@@ -291 +291 @@
                 cmd = parse(cmd).parsed
 
-                
                 # Execute command...
                 if cmd["shx_command"] in commands.list:
-                    commands.list[cmd["shx_command"]](*cmd["shx_parameter"], **cmd["shx_qualifier"])
-                    
+                    # also supply recent symbolset
+                    commands.list[cmd["shx_command"]](shx_symbols=self.symbols, \
+                                 *cmd["shx_parameter"], **cmd["shx_qualifiers"])
+
                 # .. or start script.
                 else:
@@ -441 +442 @@
         raise Exception("Symbol %s not found!" % name)
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name, value=None):
         name = name.upper()
 
@@ -466 +467 @@
         raise Exception("Symbol %s not found!" % name)
 
-    def setGlobal(self, name, value):
+    def setGlobal(self, name, value=None):
         name = name.upper()
 

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

@@ -1 @@
-!switch echo on
+switch echo on
+!switch capconv off
+sdef foo 3
+sdel foo
 echo test /NO_LF
 echo_ch xxx