Refine Vector

kornerr · kornerr · commit 8b8262b75de6 · 2017-08-03T20:37:22.000+07:00
diff --git a/script.lua b/script.lua
@@ -28,9 +28,9 @@ if (useStrings) then
 -- Use vector.
 else
     ec.callbackCallVector = function(key, vector)
-        printValues("callVector", vector.strings)
+        printValues("callVector", vector.values)
         v = Vector.new()
-        v:setStrings({"Z", "A"})
+        v:setValues({"Z", "A"})
         return v
     end
 end
diff --git a/src/EnvironmentClient.h b/src/EnvironmentClient.h
@@ -49,9 +49,9 @@ class EnvironmentClient
             else if (this->callbackCallVector)
             {
                 Vector in;
-                in.strings = values;
+                in.values = values;
                 Vector out = this->callbackCallVector(key, in);
-                return out.strings;
+                return out.values;
             }
             printf(
                 "EnvironmentClient.call(%s, %s). provide callback!\n",
diff --git a/src/Vector.h b/src/Vector.h
@@ -10,12 +10,12 @@ struct Vector
 {
     Vector() { }
 
-    void setStrings(const Strings &strings)
+    void setValues(const Strings &values)
     {
-        this->strings = strings;
+        this->values = values;
     }
 
-    Strings strings;
+    Strings values;
 };
 
 #endif // CPP_CALLBACK_SCRIPT_VECTOR_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -86,11 +86,11 @@ void runSol(const char *fileName)
     // Register vector class.
     lua.new_usertype<Vector>(
         "Vector",
-        "strings", &Vector::strings,
-        "setStrings",
-        [](Vector &vector, sol::nested<Strings> strings)
+        "values", &Vector::values,
+        "setValues",
+        [](Vector &vector, sol::nested<Strings> values)
         {
-            return vector.setStrings(strings);
+            return vector.setValues(values);
         }
     );
 

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ class EnvironmentClient`
`49`	`49`	`else if (this->callbackCallVector)`
`50`	`50`	`{`
`51`	`51`	`Vector in;`
`52`		`- in.strings = values;`
	`52`	`+ in.values = values;`
`53`	`53`	`Vector out = this->callbackCallVector(key, in);`
`54`		`- return out.strings;`
	`54`	`+ return out.values;`
`55`	`55`	`}`
`56`	`56`	`printf(`
`57`	`57`	`"EnvironmentClient.call(%s, %s). provide callback!\n",`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ struct Vector`
`10`	`10`	`{`
`11`	`11`	`Vector() { }`
`12`	`12`
`13`		`- void setStrings(const Strings &strings)`
	`13`	`+ void setValues(const Strings &values)`
`14`	`14`	`{`
`15`		`- this->strings = strings;`
	`15`	`+ this->values = values;`
`16`	`16`	`}`
`17`	`17`
`18`		`- Strings strings;`
	`18`	`+ Strings values;`
`19`	`19`	`};`
`20`	`20`
`21`	`21`	`#endif // CPP_CALLBACK_SCRIPT_VECTOR_H`