Integrated symbol table into language + retired LinkedListSetOrAddValue

Author: tmshaer

linkedlist.h

@@ -123,43 +123,6 @@ struct LinkedListSetValue<A<OldID, OldValue, T>, LookupID, NewValue> {
 
 };
 
-// template<string_literal LookupID, auto NewValue>
-// struct LinkedListSetValue<LinkedListEmptyNode, LookupID, NewValue> {
-//     using newList  = LinkedListNode<OldID, OldValue>;
-
-// };
-
-/*
-Either sets value if it exists or adds new one
-Helper function that combines set and add functionality into one
-
-*/
-
-template<typename T, string_literal LookupID, auto NewValue>
-struct LinkedListSetOrAddValue {
-    using newList  = T;
-};
-
-
-//end case couldn't find a value
-template<string_literal LookupID, auto NewValue>
-struct LinkedListSetOrAddValue<LinkedListEmptyNode, LookupID, NewValue> {
-    using newList  = LinkedListNode<LookupID, NewValue>;
-};
-
-
-//match case
-template<template <string_literal, auto, typename> typename A, string_literal OldID, auto OldValue, typename T, auto NewValue>
-struct LinkedListSetOrAddValue<A<OldID, OldValue, T>, OldID, NewValue> {
-    using newList  = LinkedListNode<OldID, NewValue, T>;
-};
-
-template<template <string_literal, auto, typename> typename A, string_literal OldID, auto OldValue, typename T, string_literal LookupID, auto NewValue>
-struct LinkedListSetOrAddValue<A<OldID, OldValue, T>, LookupID, NewValue> {
-    using extract = LinkedListSetOrAddValue<T, LookupID, NewValue>::newList;
-    using newList  = LinkedListNode<OldID, OldValue, extract>;
-
-};
 
 
 void runLinkedListTests() {
@@ -211,20 +174,4 @@ void runLinkedListTests() {
     //n cases
     static_assert(std::is_same_v<LinkedListNode<"a", 3, LinkedListNode<"b", 4, LinkedListNode<"c", 9, LinkedListNode<"d", 12>>>>, LinkedListAddValue<storageN, "d", 12>::newList>); 
 
-
-    // set or add tests
-
-    //0 cases
-    static_assert(std::is_same_v<LinkedListNode<"a", 40>, LinkedListSetOrAddValue<storage0, "a", 40>::newList>); 
-
-    //1 cases
-    static_assert(std::is_same_v<LinkedListNode<"a", 40>, LinkedListSetOrAddValue<storage1, "a", 40>::newList>); 
-    static_assert(std::is_same_v<LinkedListNode<"a", 3, LinkedListNode<"b", 40>>, LinkedListSetOrAddValue<storage1, "b", 40>::newList>); //add case
-
-    //n cases
-    static_assert(std::is_same_v<LinkedListNode<"a", 40, LinkedListNode<"b", 4, LinkedListNode<"c", 9>>>, LinkedListSetOrAddValue<storageN, "a", 40>::newList>); 
-    static_assert(std::is_same_v<LinkedListNode<"a", 3, LinkedListNode<"b", 40, LinkedListNode<"c", 9>>>, LinkedListSetOrAddValue<storageN, "b", 40>::newList>); 
-    static_assert(std::is_same_v<LinkedListNode<"a", 3, LinkedListNode<"b", 4, LinkedListNode<"c", 40>>>, LinkedListSetOrAddValue<storageN, "c", 40>::newList>); 
-    static_assert(std::is_same_v<LinkedListNode<"a", 3, LinkedListNode<"b", 4, LinkedListNode<"c", 9, LinkedListNode<"d", 40>>>>, LinkedListSetOrAddValue<storageN, "d", 40>::newList>);  //invalid case
-
 }

main

@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
     bool = !true
    */
 
-    using code = Execute<LinkedListEmptyNode,
+    using code = Execute<TypeStackEmptyNode,
                          Assign<"x", Val<6>>,
                          Assign<"y", Apply<std::plus<>, Val<2>, Var<"x">>>,
                          Assign<"z", Apply<std::plus<>, Apply<std::multiplies<>, Var<"y">, Val<10>>, Val<7>>>,
@@ -49,12 +49,12 @@ int main(int argc, char* argv[])
                          //If<Val<true>, 
                             //Assign<"g", Val<5>>>>;
 
-    static_assert(LinkedListGetValue<code::values, "x">::value == 6);
-    static_assert(LinkedListGetValue<code::values, "y">::value == 8);
-    static_assert(LinkedListGetValue<code::values, "z">::value == 87);
+    static_assert(SymbolTableGetValue<NONE, code::values, "x">::value == 6);
+    static_assert(SymbolTableGetValue<NONE, code::values, "y">::value == 8);
+    static_assert(SymbolTableGetValue<NONE, code::values, "z">::value == 87);
     constexpr string_literal teststring = "Hello World!";
-    static_assert(LinkedListGetValue<code::values, "text2">::value == teststring);
-    static_assert(!LinkedListGetValue<code::values, "bool">::value);
+    static_assert(SymbolTableGetValue<NONE, code::values, "text2">::value == teststring);
+    static_assert(!SymbolTableGetValue<NONE, code::values, "bool">::value);
 
 
 

main.cpp

@@ -1,8 +1,5 @@
 #include "symboltable.h"
 
-
-
-
 /*
 Contains all the valid AST nodes for our language.
 */
@@ -41,7 +38,7 @@ struct Var {
 
     template<typename SymbolTable>
      static const constexpr auto getValue() {
-        return LinkedListGetValue<SymbolTable, VarName>::value;
+        return SymbolTableGetValue<NONE, SymbolTable, VarName>::value;
     }
 };
 
@@ -67,9 +64,9 @@ struct If {
 
 
 
-template<string_literal VarName, typename Value, typename SymbolTable = LinkedListEmptyNode>
+template<string_literal VarName, typename Value, typename SymbolTable = TypeStackEmptyNode>
 struct Assign {
-    using UpdatedSymbolTable = LinkedListSetOrAddValue<SymbolTable, VarName, Value::template getValue<SymbolTable>()>::newList;
+    using UpdatedSymbolTable = SymbolTableDeclareOrAssignVariable<SymbolTable, VarName, Value::template getValue<SymbolTable>()>::newStack;
 };
 
 
@@ -84,19 +81,12 @@ struct Execute {
 
 
 // match assign node
-template <typename SymbolTable, template <string_literal, typename> typename AssignNode, string_literal VarName, typename Value, typename... Statements>
+template <typename SymbolTable, 
+          template <string_literal, typename> typename AssignNode, string_literal VarName, typename Value,
+          typename... Statements>
 struct Execute<SymbolTable, AssignNode<VarName, Value>, Statements...> {
 
     using TempTable = Assign<VarName, Value, SymbolTable>::UpdatedSymbolTable;
     using values = Execute<TempTable, Statements...>::values;
 };
 
-// match assign node
-// template <typename SymbolTable, template <string_literal, typename> typename AssignNode, string_literal VarName, typename Value, typename... Statements>
-// struct Execute<SymbolTable, AssignNode<VarName, Value>, Statements...> {
-
-//     using TempTable = Assign<VarName, Value, SymbolTable>::UpdatedSymbolTable;
-//     using values = Execute<TempTable, Statements...>::values;
-// };
-
-