Implemented generation of arrays and optional fields

yurablok · Mar 30, 2018 · 89927ae · 89927ae
1 parent 99b89ba
commit 89927ae
Show file tree

Hide file tree

Showing 9 changed files with 876 additions and 176 deletions.
diff --git a/Binaries/ibc_x64 b/Binaries/ibc_x64
diff --git a/Compiler/Compiler.vcxproj b/Compiler/Compiler.vcxproj
@@ -120,6 +120,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,6 +139,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -154,6 +156,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="inbcompiler.cpp" />
+    <ClCompile Include="inbcpp.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

diff --git a/Compiler/inbcompiler.cpp b/Compiler/inbcompiler.cpp
@@ -40,48 +40,6 @@ void splitIbs(const std::string &source, std::list<std::string> &splitted)
         splitted.emplace_back(std::move(buffer));
 }
 
-enum class kw
-{
-    Namespace,
-    Enum,
-    Struct,
-    Optional,
-    Int8,
-    Uint8,
-    Int16,
-    Uint16,
-    Int32,
-    Uint32,
-    Int64,
-    Uint64,
-    Float32,
-    Float64,
-    Bytes,
-};
-static const std::map<std::string, kw> keywords =
-{
-    { "namespace",  kw::Namespace   },
-    { "enum"     ,  kw::Enum        },
-    { "struct"   ,  kw::Struct      },
-    { "optional" ,  kw::Optional    },
-    { "int8"     ,  kw::Int8        },
-    { "uint8"    ,  kw::Uint8       },
-    { "int16"    ,  kw::Int16       },
-    { "uint16"   ,  kw::Uint16      },
-    { "int32"    ,  kw::Int32       },
-    { "uint32"   ,  kw::Uint32      },
-    { "int64"    ,  kw::Int64       },
-    { "uint64"   ,  kw::Uint64      },
-    { "float32"  ,  kw::Float32     },
-    { "float64"  ,  kw::Float64     },
-    { "bytes"    ,  kw::Bytes       }
-};
-static const std::string tokenOpenScope("{");
-static const std::string tokenCloseScope("}");
-static const std::string tokenArray("[]");
-static const std::string tokenEquals("=");
-static const std::string tokenColon(":");
-static const std::string tokenOptional("optional");
 
 INBCompiler::INBCompiler()
 {}
@@ -294,7 +252,9 @@ void INBCompiler::parseStruct(tokens_it &it)
     if (*it != tokenOpenScope) // <{>
         return;
     next(it); // ++<{>
-    auto &fieldsList = m_structs[structName];
+    auto &fieldsList = m_structs[structName].first;
+    auto &optionalCount = m_structs[structName].second;
+    optionalCount = 0;
     bool isExpectType = false;
     while (*it != tokenCloseScope)
     {
@@ -305,6 +265,9 @@ void INBCompiler::parseStruct(tokens_it &it)
             if (fieldsList.empty())
                 return;
             fieldsList.back().second.isArray = true;
+            if (!fieldsList.back().second.isOptional)
+                optionalCount++;
+            fieldsList.back().second.isOptional = true;
             if (!next(it))
                 return;
         }
@@ -314,6 +277,8 @@ void INBCompiler::parseStruct(tokens_it &it)
                 return;
             if (fieldsList.empty())
                 return;
+            if (!fieldsList.back().second.isOptional)
+                optionalCount++;
             fieldsList.back().second.isOptional = true;
             if (!next(it))
                 return;
@@ -327,6 +292,13 @@ void INBCompiler::parseStruct(tokens_it &it)
             if (fieldsList.empty())
                 return;
             fieldsList.back().second.type = std::move(*it);
+            if (fieldsList.back().second.type == tokenBytes)
+            {
+                fieldsList.back().second.isArray = true;
+                if (!fieldsList.back().second.isOptional)
+                    optionalCount++;
+                fieldsList.back().second.isOptional = true;
+            }
             if (!next(it))
                 return;
             isExpectType = false;

diff --git a/Compiler/inbcompiler.h b/Compiler/inbcompiler.h
@@ -8,6 +8,50 @@ enum class Language
 {
     CPP
 };
+enum class kw
+{
+    Namespace,
+    Enum,
+    Struct,
+    Optional,
+    Int8,
+    Uint8,
+    Int16,
+    Uint16,
+    Int32,
+    Uint32,
+    Int64,
+    Uint64,
+    Float32,
+    Float64,
+    Bytes,
+};
+static const std::map<std::string, kw> keywords =
+{
+    { "namespace",  kw::Namespace   },
+    { "enum"     ,  kw::Enum        },
+    { "struct"   ,  kw::Struct      },
+    { "optional" ,  kw::Optional    },
+    { "int8"     ,  kw::Int8        },
+    { "uint8"    ,  kw::Uint8       },
+    { "int16"    ,  kw::Int16       },
+    { "uint16"   ,  kw::Uint16      },
+    { "int32"    ,  kw::Int32       },
+    { "uint32"   ,  kw::Uint32      },
+    { "int64"    ,  kw::Int64       },
+    { "uint64"   ,  kw::Uint64      },
+    { "float32"  ,  kw::Float32     },
+    { "float64"  ,  kw::Float64     },
+    { "bytes"    ,  kw::Bytes       }
+};
+static const std::string tokenOpenScope("{");
+static const std::string tokenCloseScope("}");
+static const std::string tokenArray("[]");
+static const std::string tokenEquals("=");
+static const std::string tokenColon(":");
+static const std::string tokenOptional("optional");
+static const std::string tokenBytes("bytes");
+
 
 class INBCompiler
 {
@@ -42,7 +86,9 @@ class INBCompiler
         bool isOptional = false;
         bool isArray = false;
     };
-    using StructDescr = std::list<std::pair<std::string, StructFieldType>>;
+    using StructDescr = std::pair<std::list<std::pair<std::string,
+                                                      StructFieldType>>,
+                                  uint32_t>;
     std::map<std::string, StructDescr> m_structs;
 
     bool m_detailed = false;