Support Function Calls

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
2026-04-09 23:16:27 -04:00
parent 708f65a0a9
commit d39127ac17
21 changed files with 984 additions and 311 deletions
@@ -379,185 +379,6 @@ extension P4Lang.Parser: CompilableDeclaration {
  }
 }

-func parameter_list_compiler(
-  node: SwiftTreeSitter.Node, withContext context: CompilerContext
-) -> Common.Result<(ParameterList, CompilerContext)> {
-
-  var currentChildIdx = 0
-  var currentChildIdxSafe = 1
-  var currentChild: Node? = .none
-
-  if node.text == ")" {
-    // There are no parameters!
-    return Result.Ok((ParameterList([]), context))
-  }
-
-  #RequireNodeType<Node, (ParameterList, CompilerContext)>(
-    node: node, type: "parameter_list", nice_type_name: "Parameter List")
-
-  var parameters: ParameterList = ParameterList([])
-
-  if node.childCount < currentChildIdxSafe {
-    return Result.Error(
-      ErrorOnNode(node: node, withError: "Missing parameter list component"))
-  }
-
-  currentChild = node.child(at: currentChildIdx)
-  if currentChild?.nodeType == "parameter_list" {
-    switch parameter_list_compiler(node: currentChild!, withContext: context) {
-    case .Ok(let (ps, _)):
-      parameters = ps
-    case .Error(let e): return Result.Error(e)
-    }
-
-    currentChildIdx += 1
-    currentChildIdxSafe += 1
-  }
-
-  // We may have moved nodes, check/reset currentChild.
-  if node.childCount < currentChildIdxSafe {
-    return Result.Error(
-      ErrorOnNode(node: node, withError: "Missing parameter list component"))
-  }
-  currentChild = node.child(at: currentChildIdx)
-
-  // If this is a ')', we are done.
-  if currentChild?.text == ")" {
-    return Result.Ok((parameters, context))
-  }
-
-  // If this is a comma, we skip it!
-  if currentChild?.text == "," {
-    currentChildIdx += 1
-    currentChildIdxSafe += 1
-  }
-
-  if node.childCount < currentChildIdxSafe {
-    return Result.Error(
-      ErrorOnNode(node: node, withError: "Missing parameter list component"))
-  }
-  currentChild = node.child(at: currentChildIdx)
-
-  // Otherwise, there should be one parameter left!
-  switch Parameter.Compile(node: currentChild!, withContext: context) {
-  case .Ok(let (vds, updated_context)):
-    return Result.Ok((parameters.addParameter(vds), updated_context))
-  case .Error(let e): return Result.Error(e)
-  }
-}
-
-extension ParameterList: Compilable {
-  public typealias T = ParameterList
-  public static func Compile(
-    node: SwiftTreeSitter.Node, withContext context: CompilerContext
-  ) -> Common.Result<(ParameterList, CompilerContext)> {
-
-    let parameter_node = node
-    #RequireNodeType<Node, (ParameterList, CompilerContext)>(
-      node: parameter_node, type: "parameters", nice_type_name: "Parameters")
-
-    var currentChildIdx = 0
-    var currentChildIdxSafe = 1
-
-    // Let's eat the '(' before we start ...
-    if parameter_node.childCount < currentChildIdxSafe {
-      return .Error(
-        ErrorOnNode(node: parameter_node, withError: "Missing '(' in parameter list component"))
-    }
-
-    currentChildIdx += 1
-    currentChildIdxSafe += 1
-    if parameter_node.childCount < currentChildIdxSafe {
-      return .Error(
-        ErrorOnNode(node: parameter_node, withError: "Missing parameter list component"))
-    }
-    let currentChild = parameter_node.child(at: currentChildIdx)
-
-    return parameter_list_compiler(node: currentChild!, withContext: context)
-  }
-}
-
-extension Parameter: Compilable {
-  public typealias T = Parameter
-  public static func Compile(
-    node: Node, withContext context: CompilerContext
-  ) -> Result<(Parameter, CompilerContext)> {
-
-    #RequireNodeType<Node, (EvaluatableStatement, CompilerContext)>(
-      node: node, type: "parameter", nice_type_name: "parameter")
-
-    var currentChildIdx = 0
-    var currentChildIdxSafe = 1
-    var currentChild: Node? = .none
-
-    if node.childCount < currentChildIdxSafe {
-      return .Error(
-        ErrorOnNode(node: node, withError: "Missing parameter declaration component"))
-    }
-
-    currentChild = node.child(at: currentChildIdx)
-
-    // Annotation?
-    if currentChild!.nodeType == "annotations" {
-      return .Error(
-        ErrorOnNode(
-          node: currentChild!,
-          withError: "Annotations in parameter declarations are not yet handled"))
-      // Will increment indexes here.
-    }
-
-    // Direction?
-    if currentChild!.nodeType == "direction" {
-      return .Error(
-        ErrorOnNode(
-          node: currentChild!, withError: "Direction in parameter declarations are not yet handled"
-        ))
-      // Will increment indexes here.
-    }
-
-    if currentChild!.nodeType != "typeRef" {
-      return Result.Error(
-        ErrorOnNode(
-          node: node, withError: "Did not find type name for parameter declaration"))
-    }
-
-    guard
-      case .Ok(let parameter_type) = Types.CompileType(type: currentChild!, withContext: context)
-    else {
-      return Result.Error(
-        Error(withMessage: "Could not parse a P4 type from \(currentChild!.text!)"))
-    }
-
-    currentChildIdx += 1
-    currentChildIdxSafe += 1
-    if node.childCount < currentChildIdxSafe {
-      return .Error(
-        ErrorOnNode(node: node, withError: "Missing parameter declaration component"))
-    }
-
-    currentChild = node.child(at: currentChildIdx)
-    if currentChild!.nodeType != "identifier" {
-      return Result.Error(
-        ErrorOnNode(
-          node: node, withError: "Did not find identifier for parameter statement"))
-    }
-
-    guard
-      case .Ok(let parameter_name) = Identifier.Compile(node: currentChild!, withContext: context)
-    else {
-      return Result.Error(
-        Error(withMessage: "Could not parse a parameter name from \(currentChild!.text!)"))
-    }
-
-    return Result.Ok(
-      (
-        Parameter(
-          identifier: parameter_name, withType: parameter_type),
-        context
-      ))
-  }
-}
-
 extension Control: CompilableDeclaration {
  public static func Compile(
    node: SwiftTreeSitter.Node, withContext context: CompilerContext