Remove Vector, because it's no longer needed

kornerr · kornerr · commit 1eabb134ee1e · 2017-08-07T14:55:12.000+07:00
diff --git a/script.lua b/script.lua
@@ -19,28 +19,14 @@ ec.callbackRespondsToKey = function(key)
     return key == "lua"
 end
 
-useStrings = true
-
--- Use strings.
-if (useStrings) then
-    ec.callbackCall = function(key, values)
-        printValues("Inside normal callback", values)
-        return values
-        --return {"Z", "A"}
-    end
--- Use vector.
-else
-    ec.callbackCallVector = function(key, vector)
-        printValues("Inside vector callback", vector.values)
-        v = Vector.new()
-        v:setValues({"Z", "A"})
-        return v
-    end
+ec.callbackCall = function(key, values)
+    printValues("Inside callback", values)
+    return {"Z", "A"}
 end
 
 -- Add ec as Environment client.
 env:addClient(ec)
 
 -- Call newly registered module.
 values = env:call("lua", {"X", "Y"})
-printValues("Values after calling 'lua'", values)
+printValues("Calling 'lua'", values)
diff --git a/src/Common.h b/src/Common.h
@@ -6,7 +6,6 @@
 #include <vector>
 
 typedef std::string String;
-
 typedef std::vector<String> Strings;
 
 String stringsToString(const Strings &strings)
diff --git a/src/EnvironmentClient.h b/src/EnvironmentClient.h
@@ -3,7 +3,6 @@
 #define CPP_CALLBACK_SCRIPT_ENVIRONMENT_CLIENT_H
 
 #include "Common.h"
-#include "Vector.h"
 
 #include <cstdio>
 #include <functional>
@@ -19,14 +18,9 @@ class EnvironmentClient
         typedef std::function<Strings (const String &, const Strings &)> CallbackCall;
         CallbackCall callbackCall;
 
-        // Callback for 'call' method using Vector.
-        typedef std::function<Vector (const String &, const Vector &)> CallbackCallVector;
-        CallbackCallVector callbackCallVector;
-
         EnvironmentClient() :
             callbackRespondsToKey(nullptr),
-            callbackCall(nullptr),
-            callbackCallVector(nullptr) { }
+            callbackCall(nullptr) { }
         ~EnvironmentClient() { }
 
         bool respondsToKey(const String &key)
@@ -40,19 +34,10 @@ class EnvironmentClient
         }
         Strings call(const String &key, const Strings &values)
         {
-            // Strings version.
             if (this->callbackCall)
             {
                 return this->callbackCall(key, values);
             }
-            // Vector version.
-            else if (this->callbackCallVector)
-            {
-                Vector in;
-                in.values = values;
-                Vector out = this->callbackCallVector(key, in);
-                return out.values;
-            }
             printf(
                 "EnvironmentClient.call(%s, %s). provide callback!\n",
                 key.c_str(),
diff --git a/src/Vector.h b/src/Vector.h
diff --git a/src/main.cpp b/src/main.cpp
@@ -76,7 +76,7 @@ void runSol(const char *fileName)
         }
     );
 
-#define REGISTER_PLAIN_CALLBACK
+//#define REGISTER_PLAIN_CALLBACK
 
     // Register environment client class.
     lua.new_usertype<EnvironmentClient>(
@@ -96,21 +96,9 @@ void runSol(const char *fileName)
                     };
             }),
 #endif // REGISTER_PLAIN_CALLBACK
-        "callbackCallVector", &EnvironmentClient::callbackCallVector,
         "callbackRespondsToKey", &EnvironmentClient::callbackRespondsToKey
     );
 
-    // Register vector class.
-    lua.new_usertype<Vector>(
-        "Vector",
-        "values", &Vector::values,
-        "setValues",
-        [](Vector &vector, sol::nested<Strings> values)
-        {
-            return vector.setValues(values);
-        }
-    );
-
     // Load and execute script.
     lua.script_file(fileName);
 }
