P_SET_CONSTANT macro added, does not fully work

Author: lukas-valenta-tul

nitpick/nitpick_def.cc

@@ -40,6 +40,9 @@ int main() {
 	}
 	constexpr int vres_size = vec_size * 3;
 	double vres[vres_size];
+	for (uint i = 0; i < vres_size; ++i) {
+		vres[i] = NAN;
+	}
 
 		// Create parser, give the size of the value spaces.
 	// That is maximal allocated space. Actual values and 
@@ -51,11 +54,10 @@ int main() {
 	// parse an expression.
 	p.parse("1 * v1 + cs1 * v2");
 
-	//TODO: Create the SET_CONSTANT macro
 	// "cs1" constant with shape {}, i.e. scalar and values {2}.
-	p.set_constant("cs1", {}, {2});
+	P_SET_CONSTANT(cs1, {}, {2});
 	// "cv1" vector constant with shape {3}
-	p.set_constant("cv1", {3}, {1, 2, 3});
+	P_SET_CONSTANT(cv1, {3}, ARG({1, 2, 3}));
 	// "v1" variable with shape {3}; v1 is pointer to the value space
 	P_SET_VARIABLE(v1, { 3 }, v1);
 	P_SET_VARIABLE(v2, { 3 }, v2);

nitpick/nitpick_generate.cc

@@ -10,6 +10,7 @@ int main() {
 	p.compile();
 
 	ExpressionDAG dag(p.result_array().elements());
+	//dag.print_in_dot2();
 
 	std::ofstream file(NITPICK_AUTOGENERATED_FILE_NAME);
 	file << dag.print_in_cxx(inv_map);

nitpick/nitpick_include.hh

@@ -3,40 +3,53 @@
 
 #define NITPICK_AUTOGENERATED_FILE_NAME "autogenerated.cc" //Keep the same in .gitignore
 
+#define ARG(...) __VA_ARGS__
+
 #define P_SET_(TYPE, NAME, SHAPE, POINTER)											\
-		Array NAME##_array = Array::value(POINTER, max_vec_size, SHAPE);				\
+		Array NAME##_array = Array::value(POINTER, max_vec_size, SHAPE);			\
 																					\
 		for (MultiIdx idx(NAME##_array.range()); idx.valid(); idx.inc_src()) {		\
 			std::string var_name = get_var_name(#NAME, idx.indices());				\
-			inv_map[NAME##_array[idx]->values_] = var_name;									\
+			inv_map[NAME##_array[idx]->values_] = var_name;							\
 			node_map[var_name] = NAME##_array[idx]->values_;						\
 		}																			\
 		p.set_##TYPE(#NAME, SHAPE, POINTER);
 
-#define P_SET_VARIABLE(NAME, SHAPE, POINTER) P_SET_(variable, NAME, SHAPE, POINTER)
-//#define P_SET_CONSTANT(NAME, SHAPE, POINTER) P_SET_(constant, NAME, SHAPE, POINTER)
-#define P_SET_VAR_COPY(NAME, SHAPE, POINTER) P_SET_(var_copy, NAME, SHAPE, POINTER)
+#define P_SET_C(TYPE, NAME, SHAPE, VALUES)											\
+		Array NAME##_array = Array::constant(VALUES, SHAPE);						\
+																					\
+		for (MultiIdx idx(NAME##_array.range()); idx.valid(); idx.inc_src()) {		\
+			std::string var_name = get_var_name(#NAME, idx.indices());				\
+			inv_map[NAME##_array[idx]->values_] = var_name;							\
+			node_map[var_name] = NAME##_array[idx]->values_;						\
+		}																			\
+		p.set_##TYPE(#NAME, SHAPE, VALUES);
+
+//this has different pointers than the parser's Array::constant, so it does not work
+
+#define P_SET_VARIABLE(NAME, SHAPE, POINTER) P_SET_(variable, NAME, ARG(SHAPE), POINTER)
+#define P_SET_CONSTANT(NAME, SHAPE, VALUES) P_SET_C(constant, NAME, ARG(SHAPE), ARG(VALUES))
+#define P_SET_VAR_COPY(NAME, SHAPE, POINTER) P_SET_(var_copy, NAME, ARG(SHAPE), POINTER)
 
 #include "test_tools.hh"
 #include "parser.hh"
 #include <iostream>
 #include <fstream>
 
-std::string get_var_name(const std::string & name, const bparser::MultiIdx::VecUint & indices);
-
-// v1, (1,2,3) => "v1__1_2_3"
+// v1, (1,2,3) => "v1[1,2,3]"
 std::string get_var_name(const std::string& name, const bparser::MultiIdx::VecUint& indices) {
 	bparser::MultiIdx::VecUint::size_type size(indices.size());
 
 	std::ostringstream result;
 	result << name;
-	result << "__";
+	result << "[";
 	for (bparser::MultiIdx::VecUint::size_type i = 0; i < size; i++) {
 		result << indices.at(i);
 		if (i != size - 1) {
-			result << '_';
+			result << ',';
 		}
 	}
+	result << "]";
 	return result.str();
 }