Merge 592a21b into caed147

WDL/CLI.py

@@ -165,18 +165,10 @@ def descend(dobj=None, first_descent=first_descent):
             descend(decl)
     # call
     elif isinstance(obj, WDL.Call):
-        if obj.name != obj.callee_id.name:
-            print(
-                "{}call {} as {}".format(
-                    s, ".".join(obj.callee_id.namespace + [obj.callee_id.name]), obj.name
-                ),
-                file=file,
-            )
+        if obj.name != obj.callee_id[-1]:
+            print("{}call {} as {}".format(s, ".".join(obj.callee_id), obj.name), file=file)
         else:
-            print(
-                "{}call {}".format(s, ".".join(obj.callee_id.namespace + [obj.callee_id.name])),
-                file=file,
-            )
+            print("{}call {}".format(s, ".".join(obj.callee_id)), file=file)
     # scatter
     elif isinstance(obj, WDL.Scatter):
         print("{}scatter {}".format(s, obj.variable), file=file)

WDL/Error.py

@@ -105,6 +105,11 @@ def __init__(self, node: Union[SourceNode, SourcePosition], message: str) -> Non
         super().__init__(node, message)
 
 
+class NoSuchTask(ValidationError):
+    def __init__(self, node: SourceNode, name: str) -> None:
+        super().__init__(node, "No such task/workflow: " + name)
+
+
 class NoSuchFunction(ValidationError):
     def __init__(self, node: SourceNode, name: str) -> None:
         super().__init__(node, "No such function: " + name)
@@ -123,9 +128,9 @@ def __init__(self, node: SourceNode) -> None:
         super().__init__(node, "Not an array")
 
 
-class NotAPair(ValidationError):
-    def __init__(self, node: SourceNode) -> None:
-        super().__init__(node, "Not a pair (taking left or right)")
+class NoSuchMember(ValidationError):
+    def __init__(self, node: SourceNode, member: str) -> None:
+        super().__init__(node, "No such member '{}'".format(member))
 
 
 class StaticTypeMismatch(ValidationError):
@@ -159,9 +164,7 @@ class UnknownIdentifier(ValidationError):
     def __init__(self, node: SourceNode) -> None:
         # avoiding circular dep:
         # assert isinstance(node, WDL.Expr.Ident)
-        namespace: List[str] = getattr(node, "namespace")
-        name: str = getattr(node, "name")
-        super().__init__(node, "Unknown identifier " + ".".join(namespace + [name]))
+        super().__init__(node, "Unknown identifier " + ".".join(getattr(node, "_ident")))
 
 
 class NoSuchInput(ValidationError):