#637 : working on unit test support

ELENA-LANG · Mar 27, 2024 · 4659999 · 4659999
1 parent 0c6844d
commit 4659999
Show file tree

Hide file tree

Showing 24 changed files with 308 additions and 31 deletions.
diff --git a/doc/todo.txt b/doc/todo.txt
@@ -16,14 +16,20 @@ In development:
   port:win64 gui,helloworld gui sample (button), chat sample, win64 script samples
   --------------------------------------
   - #617
+  - #637 : all bt tests
   --------------------------------------
-  - #637
+  - serialize / deserialize tree : syntax tree
+  - serialize / deserialize tree : build tree
+
+  - #637 : ByRefOpMark - message, property, weak operation
+
+  - remove Serializer / ScriptReader from elc project (when no longer is required)
 
   - port : rest of system module from lib50
 
   === Iteration 22 ===
   --------------------------------------
-  dev: async programming (instant messagange sample (chat) ), #608
+  dev: async programming (instant messagange sample (chat) ), #608, #637 (all bc tests)
   op:
   opt:pi under 6 sec, #601
   maint: #506

diff --git a/elenasrc3/common/dump.cpp b/elenasrc3/common/dump.cpp
@@ -3,7 +3,7 @@
 //
 //		This file contains the implementation of ELENA Engine Data Section
 //		classes.
-//                                             (C)2021-2022, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #include "common.h"
@@ -152,3 +152,10 @@ bool ByteArray :: insert(pos_t position, const void* s, pos_t length)
 void ByteArray :: trim(pos_t position)
 {
 }
+
+// --- DynamicUStrWriter ---
+
+DynamicUStrWriter::DynamicUStrWriter(DynamicUStr* target)
+{
+   _target = target;
+}
diff --git a/elenasrc3/common/dump.h b/elenasrc3/common/dump.h
@@ -3,7 +3,7 @@
 //
 //		This header contains the declaration of ELENA Engine Data Memory dump
 //		classes.
-//                                             (C)2021-2022, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #ifndef DUMP_H
@@ -141,6 +141,46 @@ namespace elena_lang
       }
    };
 
+   // --- DynamicUStrWriter ---
+   class DynamicUStrWriter : public TextWriter<char>
+   {
+      DynamicUStr* _target;
+
+   public:
+      bool isOpen() const override { return true; }
+
+      pos_t position() const override { return _target->length_pos(); }
+
+      bool seek(pos_t position)
+      {
+         if (_target->length_pos() < position)
+            return false;
+
+         _target->trim(position);
+         return true;
+      }
+
+      bool writeNewLine() override
+      {
+         char ch = '\n';
+
+         return write(&ch, 1);
+      }
+
+      bool write(const char* s, pos_t length)
+      {
+         _target->append(s, length);
+
+         return true;
+      }
+
+      void reset()
+      {
+         _target->clear();
+      }
+
+      DynamicUStrWriter(DynamicUStr* target);
+   };
 }
 
 #endif // DUMP_H
diff --git a/elenasrc3/common/tree.h b/elenasrc3/common/tree.h
@@ -3,7 +3,7 @@
 //
 //		This file contains ELENA Tree template classes
 //
-//                                             (C)2021-2023, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #ifndef TREE_H
@@ -720,6 +720,36 @@ namespace elena_lang
          return counter;
       }
 
+      static void serialize(Node& node, void(*encoder)(TextWriter<char>&, Key, ustr_t, int, void*), TextWriter<char>& writer, void* arg)
+      {
+         encoder(writer, node.key, node.identifier(), node.arg.value, arg);
+         Node current = node.firstChild();
+         while (current != defKey) {
+            serialize(current, encoder, writer, arg);
+
+            current = current.nextNode();
+         }
+
+         encoder(writer, defKey, nullptr, 0, nullptr);
+      }
+
+      static void deserialize(Node root, bool(*reader)(Key&, IdentifierString&, int&, void*), void* arg)
+      {
+         Key              key = defKey;
+         IdentifierString strArg;
+         int              intArg;
+
+         Node current = {};
+         while (reader(key, strArg, intArg, arg)) {
+            if (strArg.length() > 0) {
+               current = root.appendChild(key, *strArg);
+            }
+            else current = root.appendChild(key, intArg);
+
+            deserialize(current, reader, arg);
+         }
+      }
+
       Tree() = default;
    };
 }

diff --git a/elenasrc3/common/ustring.cpp b/elenasrc3/common/ustring.cpp
@@ -3,7 +3,7 @@
 //
 //		This file contains String classes implementations
 //
-//                                             (C)2021-2023, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //                                             (C)1994-2004, Unicode, Inc.
 //---------------------------------------------------------------------------
 

diff --git a/elenasrc3/common/ustring.h b/elenasrc3/common/ustring.h
@@ -3,7 +3,7 @@
 //
 //		This header contains UTF8 String classes declarations
 //
-//                                             (C)2021-2022, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #ifndef USTRING_H
@@ -675,6 +675,12 @@ namespace elena_lang
             _string[0] = 0;
       }
 
+      void trim(size_t position)
+      {
+         if (_string)
+            _string[position] = 0;
+      }
+
       DynamicString()
       {
          _size = 0;
@@ -690,6 +696,7 @@ namespace elena_lang
 
    };
 
+   typedef DynamicString<char> DynamicUStr;
 }
 
 #endif // USTRING_H
diff --git a/elenasrc3/elc/cliconst.h b/elenasrc3/elc/cliconst.h
@@ -13,7 +13,7 @@
 
 namespace elena_lang
 {
-   #define ELC_REVISION_NUMBER               0x0244
+   #define ELC_REVISION_NUMBER               0x0245
 
 #if defined _M_IX86 || _M_X64
 

diff --git a/elenasrc3/elc/vs/elc.vcxproj b/elenasrc3/elc/vs/elc.vcxproj
@@ -181,7 +181,9 @@
     <ClCompile Include="..\..\engine\libman.cpp" />
     <ClCompile Include="..\..\engine\module.cpp" />
     <ClCompile Include="..\..\engine\parsertable.cpp" />
+    <ClCompile Include="..\..\engine\scriptreader.cpp" />
     <ClCompile Include="..\..\engine\section.cpp" />
+    <ClCompile Include="..\..\engine\serializer.cpp" />
     <ClCompile Include="..\..\engine\syntaxtree.cpp" />
     <ClCompile Include="..\..\engine\windows\presenter.cpp" />
     <ClCompile Include="..\..\engine\x86compiler.cpp" />
@@ -232,7 +234,9 @@
     <ClInclude Include="..\..\engine\module.h" />
     <ClInclude Include="..\..\engine\parsertable.h" />
     <ClInclude Include="..\..\engine\projectbase.h" />
+    <ClInclude Include="..\..\engine\scriptreader.h" />
     <ClInclude Include="..\..\engine\section.h" />
+    <ClInclude Include="..\..\engine\serializer.h" />
     <ClInclude Include="..\..\engine\syntaxtree.h" />
     <ClInclude Include="..\..\engine\windows\presenter.h" />
     <ClInclude Include="..\..\engine\x86compiler.h" />

diff --git a/elenasrc3/elena-tests/bt_optimization.cpp b/elenasrc3/elena-tests/bt_optimization.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/elenasrc3/elena-tests/bt_optimization.h b/elenasrc3/elena-tests/bt_optimization.h
@@ -0,0 +1,24 @@
+//---------------------------------------------------------------------------
+//		E L E N A   P r o j e c t:  ELENA Compiler
+//
+//		This header contains ELENA Test Optimization Fixture declarations
+//                                             (C)2024, by Aleksey Rakov
+//---------------------------------------------------------------------------
+
+#ifndef BTOPTIMIZATION_H
+#define BTOPTIMIZATION_H
+
+#include "common.h"
+
+namespace elena_lang
+{
+   class BTOptimization1 : public testing::Test
+   {
+   protected:
+      void SetUp() override
+      {
+      }
+   };
+}
+
+#endif
diff --git a/elenasrc3/elena-tests/bt_tests.cpp b/elenasrc3/elena-tests/bt_tests.cpp
@@ -0,0 +1,8 @@
+#include "pch.h"
+#include "bt_optimization.h"
+
+using namespace elena_lang;
+TEST_F(BTOptimization1, BuildTapeTest) {
+  EXPECT_EQ(1, 1);
+  EXPECT_TRUE(true);
+}
diff --git a/elenasrc3/elena-tests/common.cpp b/elenasrc3/elena-tests/common.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/elenasrc3/elena-tests/common.h b/elenasrc3/elena-tests/common.h
@@ -0,0 +1,11 @@
+//---------------------------------------------------------------------------
+//		E L E N A   P r o j e c t:  ELENA Compiler
+//
+//		This header contains ELENA Test Common declarations
+//                                             (C)2024, by Aleksey Rakov
+//---------------------------------------------------------------------------
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#endif
diff --git a/elenasrc3/elena-tests/compiler_tests.cpp b/elenasrc3/elena-tests/compiler_tests.cpp
@@ -0,0 +1,10 @@
+#include "pch.h"
+// ------------------------------------------------
+#include "bt_optimization.h"
+
+using namespace elena_lang;
+
+TEST_F(BTOptimization1, CompilerTest) {
+  EXPECT_EQ(1, 1);
+  EXPECT_TRUE(true);
+}
diff --git a/elenasrc3/elena-tests/elena-tests.vcxproj b/elenasrc3/elena-tests/elena-tests.vcxproj
@@ -117,9 +117,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="bt_optimization.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="test.cpp" />
+    <ClCompile Include="common.cpp" />
+    <ClCompile Include="bt_optimization.cpp" />
+    <ClCompile Include="compiler_tests.cpp" />
+    <ClCompile Include="bt_tests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

diff --git a/elenasrc3/elena-tests/test.cpp b/elenasrc3/elena-tests/test.cpp
diff --git a/elenasrc3/engine/bcwriter.h b/elenasrc3/engine/bcwriter.h
@@ -3,7 +3,7 @@
 //
 //		This file contains ELENA byte code writer class.
 //
-//                                             (C)2021-2023, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #ifndef BCWRITER_H

diff --git a/elenasrc3/engine/scriptreader.cpp b/elenasrc3/engine/scriptreader.cpp
@@ -3,7 +3,7 @@
 //
 //		This file contains ELENA ScriptReader class implementation.
 //
-//                                             (C)2021-2023, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #include "elena.h"

diff --git a/elenasrc3/engine/scriptreader.h b/elenasrc3/engine/scriptreader.h
@@ -3,7 +3,7 @@
 //
 //		This header contains ELENA Script Reader class declaration.
 //
-//                                             (C)2021-2023, by Aleksey Rakov
+//                                             (C)2021-2024, by Aleksey Rakov
 //---------------------------------------------------------------------------
 
 #ifndef SCRIPTREADER_H