WIP)

Author: GordonSmith

samples/wamr/generated/sample.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef GENERATED_SAMPLE_HPP_HPP
-#define GENERATED_SAMPLE_HPP_HPP
+#ifndef GENERATED_SAMPLE_HPP
+#define GENERATED_SAMPLE_HPP
 
 #include <cmcpp.hpp>
 
@@ -246,4 +246,4 @@ void void_func();
 
 } // namespace host
 
-#endif // GENERATED_SAMPLE_HPP_HPP
+#endif // GENERATED_SAMPLE_HPP

tools/wit-codegen/code_generator.cpp

@@ -23,7 +23,7 @@ void CodeGenerator::generateHeader(const std::vector<InterfaceInfo> &interfaces,
 
     // Generate header guard using just the filename (not full path)
     std::filesystem::path filepath(filename);
-    std::string guard = "GENERATED_" + sanitize_identifier(filepath.filename().string()) + "_HPP";
+    std::string guard = "GENERATED_" + sanitize_identifier(filepath.filename().string());
     std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper);
 
     out << "#pragma once\n\n";
@@ -123,9 +123,10 @@ void CodeGenerator::generateHeader(const std::vector<InterfaceInfo> &interfaces,
                             }
                             else
                             {
-                                // Interface not found in registry - generate placeholder comment
-                                out << "        // External interface not loaded: " << import << "\n";
-                                out << "        // Host must provide implementations for functions from this interface\n";
+                                // Interface not found in registry - this is an error
+                                throw std::runtime_error("External interface not loaded: " + import +
+                                                         "\nPackage '" + package_spec + "' interface '" + interface_name +
+                                                         "' was not found in the registry. Make sure to load all dependent packages before generating code.");
                             }
                         }
                         else
@@ -190,9 +191,10 @@ void CodeGenerator::generateHeader(const std::vector<InterfaceInfo> &interfaces,
                             }
                             else
                             {
-                                // Interface not found in registry - generate placeholder comment
-                                out << "        // External interface not loaded: " << export_name << "\n";
-                                out << "        // Guest must implement functions from this interface\n";
+                                // Interface not found in registry - this is an error
+                                throw std::runtime_error("External interface not loaded: " + export_name +
+                                                         "\nPackage '" + package_spec + "' interface '" + interface_name +
+                                                         "' was not found in the registry. Make sure to load all dependent packages before generating code.");
                             }
                         }
                         else