Fixed crash and generation bug in swift generator

Author: Yuri6037

Swift/Sources/testprog/test/test.messages.swift

@@ -29,6 +29,15 @@
 import Foundation;
 import BP3DProto;
 
+public struct TestZst<B: BP3DProto.Buffer> {
+
+    public init() {
+
+    }
+
+}
+
+
 public struct TestTest1<B: BP3DProto.Buffer> {
     public let s1: String;
     public let p1: UInt32;

Swift/Sources/testprog/test/test.messages_from_bytes.swift

@@ -29,6 +29,7 @@
 import Foundation;
 import BP3DProto;
 
+
 extension TestTest1: BP3DProto.FromBytes  {
     public typealias Buffer = B;
     public typealias Output = Self;

Swift/Sources/testprog/test/test.messages_write.swift

@@ -29,6 +29,7 @@
 import Foundation;
 import BP3DProto;
 
+
 extension TestTest1: BP3DProto.WriteTo {
     public typealias Input = Self;
     public static func write<B1: BP3DProto.WritableBuffer>(input: Self, to out: inout B1) throws {

compiler/src/gen/swift/default_codec/string.template

@@ -1,3 +1,5 @@
+#include base
+
 #fragment push decl.buffer:inline
 String
 #fragment pop

compiler/src/gen/swift/message/from_bytes.rs

@@ -40,6 +40,9 @@ use std::borrow::Cow;
 const TEMPLATE: &[u8] = include_bytes!("from_bytes.template");
 
 pub fn gen_message_from_slice_impl(proto: &Protocol, codec_map: &CodecMap, msg: &Message) -> Result<String, Error> {
+    if msg.ty.is_some() {
+        return Ok(String::new());
+    }
     let mut options = Options::default();
     options.functions_mut().add("remove_leading_coma", |v| Cow::Borrowed(&v[..v.len() - 2]));
     let mut templates = Templates {

compiler/src/gen/swift/message/write.rs

@@ -39,6 +39,9 @@ use crate::gen::template::Template;
 const TEMPLATE: &[u8] = include_bytes!("write.template");
 
 pub fn gen_message_write_impl(proto: &Protocol, codec_map: &CodecMap, msg: &Message) -> Result<String, Error> {
+    if msg.ty.is_some() {
+        return Ok(String::new());
+    }
     let type_path_map = TypePathMapper::new(&proto.type_path_map, SwiftTypeMapper::from_protocol(proto));
     let mut templates = Templates {
         template: Template::compile(TEMPLATE).unwrap(),

compiler/src/gen/template/core.rs

@@ -33,6 +33,7 @@ use crate::gen::template::Error;
 use itertools::Itertools;
 use std::borrow::Cow;
 use std::collections::HashMap;
+use bp3d_debug::trace;
 
 pub struct Template<'fragment, 'variable> {
     fragments: HashMap<String, Fragment<'fragment>>,
@@ -163,6 +164,7 @@ impl<'fragment, 'variable> Template<'fragment, 'variable> {
                 false => Cow::Owned(format!("{}.{}", path, name)),
                 true => Cow::Borrowed(name),
             };
+            trace!({fragments=?self.fragments}, "Attempt to find fragment '{}'", name);
             let fragment = self.fragments.get(&*name).ok_or_else(|| Error::FragmentNotFound(String::from(&*name)))?;
             let sub_rendered = fragment
                 .content