From da8857549304590d8d32e643a22617318add542a Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Wed, 18 Jan 2023 18:42:13 +0100
Subject: Improve NAG parsing

---
 tests/combined.cpp |  2 +-
 tests/valid.cpp    | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'tests')

diff --git a/tests/combined.cpp b/tests/combined.cpp
index a4b2089..137257c 100644
--- a/tests/combined.cpp
+++ b/tests/combined.cpp
@@ -50,7 +50,7 @@ TEST_CASE("Hartwig PGN", "[combined/hartwig]") {
           "just loses thanks to the interpolation of 11. c3 fxe4:");
     
     HalfMove *m20w = (m->GetHalfMoveAt(38)); // move 20 white => m20w
-    CHECK(m20w->NAG == "$1");
+    CHECK(m20w->NAG == 1);
 
     HalfMove *m21b = (m->GetHalfMoveAt(42)); // move 21 black => m21b
     CHECK(m21b->comment ==
diff --git a/tests/valid.cpp b/tests/valid.cpp
index 3183114..2cf6102 100644
--- a/tests/valid.cpp
+++ b/tests/valid.cpp
@@ -148,34 +148,34 @@ TEST_CASE("Valid PGN", "[valid/pgn3]") {
   }
 
   SECTION("NAGs") {
-    REQUIRE(m->GetHalfMoveAt(2)->NAG == "$1");
-    REQUIRE(m->GetHalfMoveAt(8)->NAG == "$5");
-    REQUIRE(m->GetHalfMoveAt(8)->variations[0]->NAG == "$14");
-    REQUIRE(m->GetHalfMoveAt(19)->NAG == "$2");
-    REQUIRE(m->GetHalfMoveAt(22)->NAG == "$1");
-    REQUIRE(m->GetHalfMoveAt(23)->variations[0]->NAG == "$4");
-    REQUIRE(m->GetHalfMoveAt(23)->variations[0]->GetHalfMoveAt(3)->NAG == "$1");
+    REQUIRE(m->GetHalfMoveAt(2)->NAG == 1);
+    REQUIRE(m->GetHalfMoveAt(8)->NAG == 5);
+    REQUIRE(m->GetHalfMoveAt(8)->variations[0]->NAG == 14);
+    REQUIRE(m->GetHalfMoveAt(19)->NAG == 2);
+    REQUIRE(m->GetHalfMoveAt(22)->NAG == 1);
+    REQUIRE(m->GetHalfMoveAt(23)->variations[0]->NAG == 4);
+    REQUIRE(m->GetHalfMoveAt(23)->variations[0]->GetHalfMoveAt(3)->NAG == 1);
     REQUIRE(m->GetHalfMoveAt(23)->variations[0]->GetHalfMoveAt(9)->NAG ==
-            "$18");
-    REQUIRE(m->GetHalfMoveAt(24)->NAG == "$1");
+            18);
+    REQUIRE(m->GetHalfMoveAt(24)->NAG == 1);
     REQUIRE(m->GetHalfMoveAt(24)->variations[0]->GetHalfMoveAt(5)->NAG ==
-            "$13");
-    REQUIRE(m->GetHalfMoveAt(30)->NAG == "$1");
-    REQUIRE(m->GetHalfMoveAt(31)->variations[0]->NAG == "$2");
+            13);
+    REQUIRE(m->GetHalfMoveAt(30)->NAG == 1);
+    REQUIRE(m->GetHalfMoveAt(31)->variations[0]->NAG == 2);
     REQUIRE(m->GetHalfMoveAt(31)->variations[0]->GetHalfMoveAt(3)->NAG ==
-            "$18");
-    REQUIRE(m->GetHalfMoveAt(32)->NAG == "$1");
+            18);
+    REQUIRE(m->GetHalfMoveAt(32)->NAG == 1);
     REQUIRE(m->GetHalfMoveAt(37)->variations[0]->GetHalfMoveAt(3)->NAG ==
-            "$18");
-    REQUIRE(m->GetHalfMoveAt(38)->NAG == "$1");
+            18);
+    REQUIRE(m->GetHalfMoveAt(38)->NAG == 1);
     REQUIRE(m->GetHalfMoveAt(41)->variations[0]->GetHalfMoveAt(1)->NAG ==
-            "$18");
-    REQUIRE(m->GetHalfMoveAt(44)->NAG == "$1");
-    REQUIRE(m->GetHalfMoveAt(44)->variations[0]->NAG == "$4");
-    REQUIRE(m->GetHalfMoveAt(44)->variations[0]->MainLine->NAG == "$13");
+            18);
+    REQUIRE(m->GetHalfMoveAt(44)->NAG == 1);
+    REQUIRE(m->GetHalfMoveAt(44)->variations[0]->NAG == 4);
+    REQUIRE(m->GetHalfMoveAt(44)->variations[0]->MainLine->NAG == 13);
     REQUIRE(m->GetHalfMoveAt(45)->variations[0]->GetHalfMoveAt(3)->NAG ==
-            "$18");
-    REQUIRE(m->GetHalfMoveAt(52)->variations[0]->MainLine->variations[0]->MainLine->NAG == "$18");
+            18);
+    REQUIRE(m->GetHalfMoveAt(52)->variations[0]->MainLine->variations[0]->MainLine->NAG == 18);
   }
 }
 
-- 
cgit v1.2.3