parser updates

Author: prkrtg

wdl/wdlParser.py

@@ -75,6 +75,7 @@ class ParserError(Exception):
 setLevel = 0
 constList = []
 constNames = []
+constMap = {}
 paramList = []
 paramNames = []
 subroutines = []
@@ -259,8 +260,9 @@ def lvds(slot_number):
 
     lvds_chan = None
 
-    if found(IDENTIFIER) and token.cargo in Constants:
-        lvds_chan = str(int(float(Constants[token.cargo])))
+    # accept IDENTIFIER const or NUMBER
+    if found(IDENTIFIER) and token.cargo in constMap:
+        lvds_chan = str(int(float(constMap[token.cargo])))
         consume(IDENTIFIER)
     elif found(NUMBER):
         lvds_chan = token.cargo
@@ -1921,14 +1923,14 @@ def to():
     consume("TO")
     # optional leading minus sign
     if found("-"):
-        consume("-")
+        consume("-");
         sign = -1.0
     else:
         sign = 1.0
 
-    # level can be a NUMBER or a defined constant
-    if found(IDENTIFIER) and token.cargo in Constants:
-        setLevel = str(sign * float(Constants[token.cargo]))
+    # NUMBER or const IDENTIFIER
+    if found(IDENTIFIER) and token.cargo in constMap:
+        setLevel = str(sign * float(constMap[token.cargo]))
         consume(IDENTIFIER)
     elif found(NUMBER):
         setLevel = str(sign * float(token.cargo))
@@ -1953,16 +1955,34 @@ def slew():
         setSlew = __SLEW_NONE
         return
 
-    # otherwise continue, flag as fast (1) or slow (0)
     consume(",")
+
     if found("SLOW"):
-        consume("SLOW")
+        consume("SLOW");
         setSlew = __SLEW_SLOW
     elif found("FAST"):
-        consume("FAST")
+        consume("FAST");
         setSlew = __SLEW_FAST
+    elif found(IDENTIFIER) and token.cargo in constMap:
+        _sv = float(constMap[token.cargo])
+        if abs(_sv - 0.0) < 0.5:
+            setSlew = __SLEW_SLOW
+        elif abs(_sv - 1.0) < 0.5:
+            setSlew = __SLEW_FAST
+        else:
+            error("SLEW constant must be 0 (SLOW) or 1 (FAST)")
+        consume(IDENTIFIER)
+    elif found(NUMBER):
+        _sv = float(token.cargo)
+        if abs(_sv - 0.0) < 0.5:
+            setSlew = __SLEW_SLOW
+        elif abs(_sv - 1.0) < 0.5:
+            setSlew = __SLEW_FAST
+        else:
+            error("SLEW number must be 0 (SLOW) or 1 (FAST)")
+        consume(NUMBER)
     else:
-        error("SLEW expected SLOW | FAST but got: " + dq(token.cargo))
+        error("SLEW expected SLOW|FAST or 0|1 or defined constant")
 
 
 # -----------------------------------------------------------------------------
@@ -2206,7 +2226,6 @@ def generic_sequence(*sequenceName):
                 (found(IDENTIFIER))
                 and (token.cargo not in subroutines)
                 and (token.cargo not in paramNames)
-                and (token.cargo not in Constants)
             ):
                 error(
                     "(wdlParser.py::generic_sequence) undefined symbol "
@@ -2238,18 +2257,17 @@ def generic_sequence(*sequenceName):
                 consume(IDENTIFIER)
                 consume("(")
                 # if next token isn't a closing paren then assume
-                # it's a number, param, or constant
+                # it's a number or param
                 if not found(")"):
                     sequence_line += "(" + token.cargo  # keep the name; const is emitted earlier
                     # validate: allow NUMBER, defined param, or defined constant
                     if (
                             not found(NUMBER)
                             and token.cargo not in paramNames
-                            and token.cargo not in constNames
                     ):
                         error(
                             "(wdlParser.py::generic_sequence) undefined "
-                            "param or constant " + token.show(align=False)
+                            "param " + token.show(align=False)
                         )
             elif found("RETURN"):
                 consume("RETURN")
@@ -2365,15 +2383,21 @@ def const():
 
     line = "constant "
     consume("const")
-    constNames.append(token.cargo)
-    line += token.cargo
+    name = token.cargo
+    constNames.append(name)
+    line += name
     consume(IDENTIFIER)
     line += token.cargo
     consume("=")
-    line += token.cargo
+    val_str = token.cargo
+    line += val_str
     consume(NUMBER)
     constList.append(line)
 
+    try:
+        constMap[name] = float(val_str)
+    except ValueError:
+        error(f"(wdlParser.py::const) invalid const value for {name}: {val_str}")
 
 # -----------------------------------------------------------------------------
 # @fn     print