From 4da0cb54a82a79ee509727f5bc5694e0864f429d Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Tue, 6 Apr 2021 21:23:17 +0200
Subject: [PATCH] use format contants in default ivar/fvar/svar handlers

---
 include/cubescript/cubescript_conf.hh |  2 +-
 src/cs_state.cc                       | 10 +++++++---
 src/cs_val.cc                         |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/cubescript/cubescript_conf.hh b/include/cubescript/cubescript_conf.hh
index fdbb30f..d40d75c 100644
--- a/include/cubescript/cubescript_conf.hh
+++ b/include/cubescript/cubescript_conf.hh
@@ -7,7 +7,7 @@ namespace cubescript {
     using integer_type = int;
     using float_type = float;
 
-    constexpr auto const INT_FORMAT = "%d";
+    constexpr auto const INTEGER_FORMAT = "%d";
     constexpr auto const FLOAT_FORMAT = "%.7g";
     constexpr auto const ROUND_FLOAT_FORMAT = "%.1f";
 } /* namespace cubescript */
diff --git a/src/cs_state.cc b/src/cs_state.cc
index 8c6a185..45cc9ff 100644
--- a/src/cs_state.cc
+++ b/src/cs_state.cc
@@ -132,7 +132,9 @@ state::state(alloc_func func, void *data) {
     ) {
         auto *iv = args[0].get_ident()->get_ivar();
         if (args[2].get_integer() <= 1) {
-            std::printf("%s = %d\n", iv->get_name().data(), iv->get_value());
+            std::printf("%s = ", iv->get_name().data());
+            std::printf(INTEGER_FORMAT, iv->get_value());
+            std::printf("\n");
         } else {
             iv->set_value(cs, args[1].get_integer());
         }
@@ -144,11 +146,13 @@ state::state(alloc_func func, void *data) {
         auto *fv = args[0].get_ident()->get_fvar();
         if (args[2].get_integer() <= 1) {
             auto val = fv->get_value();
+            std::printf("%s = ", fv->get_name().data());
             if (std::floor(val) == val) {
-                std::printf("%s = %.1f\n", fv->get_name().data(), val);
+                std::printf(ROUND_FLOAT_FORMAT, val);
             } else {
-                std::printf("%s = %.7g\n", fv->get_name().data(), val);
+                std::printf(FLOAT_FORMAT, val);
             }
+            std::printf("\n");
         } else {
             fv->set_value(cs, args[1].get_float());
         }
diff --git a/src/cs_val.cc b/src/cs_val.cc
index e1225dc..76339b5 100644
--- a/src/cs_val.cc
+++ b/src/cs_val.cc
@@ -11,10 +11,10 @@ namespace cubescript {
 
 static std::string_view intstr(integer_type v, charbuf &buf) {
     buf.reserve(32);
-    int n = snprintf(buf.data(), 32, INT_FORMAT, v);
+    int n = snprintf(buf.data(), 32, INTEGER_FORMAT, v);
     if (n > 32) {
         buf.reserve(n + 1);
-        int nn = snprintf(buf.data(), n + 1, INT_FORMAT, v);
+        int nn = snprintf(buf.data(), n + 1, INTEGER_FORMAT, v);
         if ((nn > n) || (nn <= 0)) {
             n = -1;
         } else {