mir: Start implementing declare_dependency

Author: dcbaker

src/mir/functions.xml

@@ -31,4 +31,14 @@ Copyright © 2024 Intel Corporation
       </optional>
     </arguments>
   </function>
+  <function name="declare_dependency">
+    <arguments>
+      <keyword>
+        <argument name="version" type="string"/>
+        <!-- <argument name="compile_args" type="array[string]" /> -->
+        <!-- <argument name="include_directories" type="array[string | include_directories]" /> -->
+        <!-- <argument name="dependencies" type="array[dependency]" /> -->
+      </keyword>
+    </arguments>
+  </function>
 </functions>

src/mir/generate_function_arguments.py

@@ -59,7 +59,11 @@ class Arguments(T.Protocol):
       % if function.keywords:
         struct {
           % for kw in function.keywords:
+            % if kw.default is not None:
             ${kw.type.value} ${kw.name};
+            % else:
+            std::optional<${kw.type.value}> ${kw.name};
+            % endif
           % endfor
         } keywords;
       % endif
@@ -189,7 +193,11 @@ class Arguments(T.Protocol):
                 .${kw.name} = extract_keyword_argument<${kw.type.value}>(
                         func.kw_args, "${kw.name}",
                         "${function.name}: ${kw.name} argument must be a ${kw.type.name.lower()}"
+                % if kw.default is not None:
                     ).value_or(${kw.type.value}{${kw.default}}),
+                % else:
+                    ),
+                % endif
               % endfor
             },
           % endif
@@ -210,6 +218,7 @@ class ArgumentType(enum.Enum):
     STRING = 'String'
     FILE = 'File'
     BOOL = 'Boolean'
+    ARRAY_STRING = 'Array[String]'
 
 
 @dataclasses.dataclass(slots=True)
@@ -247,7 +256,7 @@ class Function:
 
     @property
     def struct_name(self) -> str:
-        return self.name.capitalize()
+        return ''.join(n.capitalize() for n in self.name.split('_'))
 
     @property
     def min_pos_args(self) -> int:
@@ -309,7 +318,7 @@ def parse_keyword_arguments(element: et.Element | None) -> list[KeywordArgument]
         keywords.append(KeywordArgument(
             extract_attr(var, 'name'),
             type_,
-            parse_value(extract_attr(var, 'default'), type_),
+            parse_value(v, type_) if (v := var.get('default')) else None,
         ))
 
     return keywords

src/mir/passes/free_functions.cpp

@@ -137,7 +137,7 @@ std::optional<T> lower_build_target(const FunctionCall & f, const State::Persist
 
 std::optional<Instruction> lower_include_dirs(const FunctionCall & f,
                                               const State::Persistant & pstate) {
-    ArgumentValidator::Include_directories args =
+    ArgumentValidator::IncludeDirectories args =
         ArgumentValidator::parse_include_directories(f, pstate);
 
     std::vector<std::string> dirs{};
@@ -283,16 +283,8 @@ std::optional<Instruction> lower_ne(const FunctionCall & f) {
 
 std::optional<Instruction> lower_declare_dependency(const FunctionCall & f,
                                                     const State::Persistant & pstate) {
-    if (!f.pos_args.empty()) {
-        throw Util::Exceptions::InvalidArguments(
-            "declare_dependency: takes 0 positional arguments.");
-    }
-
-    std::string version =
-        extract_keyword_argument<String>(
-            f.kw_args, "version", "declare_dependency: 'version' keyword argument must be a string")
-            .value_or(String("unknown"))
-            .value;
+    ArgumentValidator::DeclareDependency _args =
+        ArgumentValidator::parse_declare_dependency(f, pstate);
 
     std::vector<Arguments::Argument> args{};
     const auto & raw_comp_args = extract_keyword_argument_a<String>(
@@ -343,7 +335,12 @@ std::optional<Instruction> lower_declare_dependency(const FunctionCall & f,
         std::copy(dargs.begin(), dargs.end(), std::back_inserter(args));
     }
 
-    return Dependency{"internal", true, version, args};
+    return Dependency{
+        "internal",
+        true,
+        _args.keywords.version.value_or(String{pstate.project_version}).value,
+        args,
+    };
 }
 
 class CallableReducer {