Fix VLB parsing/printing and move storage

Author: Belzedar94

src/apiutil.h

@@ -569,7 +569,12 @@ inline Validation check_for_valid_characters(const std::string& firstFenPart, co
         if (isdigit(c) || contains(validSpecialCharactersFirstField, c))
             continue;
         if (c == '+')
-            continue;
+        {
+            if (v && v->shogiStylePromotions)
+                continue;
+            std::cerr << "Invalid piece character: '+'." << std::endl;
+            return NOK;
+        }
         if (Variant::is_piece_id_start(c))
         {
             std::string token(1, c);

src/parser.cpp

@@ -297,6 +297,52 @@ Variant* VariantParser<DoCheck>::parse() {
 
 template <bool DoCheck>
 Variant* VariantParser<DoCheck>::parse(Variant* v) {
+    auto parse_rank_value = [](const std::string& value, int& out) {
+        std::stringstream ss(value);
+        int i;
+        ss >> i;
+        if (ss.fail())
+            return false;
+        out = i;
+        return true;
+    };
+    auto parse_file_value = [](const std::string& value, int& out) {
+        std::string trimmed = trim(value);
+        if (trimmed.empty())
+            return false;
+        std::stringstream ss(trimmed);
+        if (isdigit(ss.peek()))
+        {
+            int i;
+            ss >> i;
+            if (ss.fail())
+                return false;
+            out = i - 1;
+            return true;
+        }
+        char c;
+        ss >> c;
+        if (ss.fail())
+            return false;
+        out = tolower(c) - 'a';
+        return true;
+    };
+    int cfgMaxRank = -1;
+    int cfgMaxFile = -1;
+    auto itRank = config.find("maxRank");
+    if (itRank != config.end())
+        parse_rank_value(itRank->second, cfgMaxRank);
+    auto itFile = config.find("maxFile");
+    if (itFile != config.end())
+        parse_file_value(itFile->second, cfgMaxFile);
+    if (   (cfgMaxRank > 0 && cfgMaxRank - 1 > RANK_MAX)
+        || (cfgMaxFile >= 0 && cfgMaxFile > FILE_MAX))
+    {
+        v->maxRank = static_cast<Rank>(RANK_MAX + 1);
+        v->maxFile = static_cast<File>(FILE_MAX + 1);
+        return v;
+    }
+
     parse_attribute("maxRank", v->maxRank);
     parse_attribute("maxFile", v->maxFile);
     // piece types

src/position.cpp

@@ -347,7 +347,7 @@ Position& Position::set(const Variant* v, const string& fenStr, bool isChess960,
       }
 
       // Promoted shogi pieces
-      else if (token == '+')
+      else if (token == '+' && var->shogiStylePromotions)
       {
           if (Variant::is_piece_id_start(ss.peek()))
           {
@@ -467,33 +467,55 @@ Position& Position::set(const Variant* v, const string& fenStr, bool isChess960,
       // 4. En passant square.
       // Ignore if square is invalid or not on side to move relative rank 6.
       else
-          while (   ((ss >> col) && (col >= 'a' && col <= 'a' + max_file()))
-                 && ((ss >> row) && (row >= '1' && row <= '1' + max_rank())))
+      {
+          std::string epInfo;
+          ss >> std::skipws >> epInfo;
+          ss >> std::noskipws;
+          if (!epInfo.empty() && epInfo != "-")
           {
-              Square epSquare = make_square(File(col - 'a'), Rank(row - '1'));
+              size_t i = 0;
+              while (i < epInfo.size())
+              {
+                  char fileChar = epInfo[i];
+                  if (fileChar < 'a' || fileChar > 'a' + max_file())
+                      break;
+                  ++i;
+                  if (i >= epInfo.size() || !isdigit(epInfo[i]))
+                      break;
+                  int rankNum = 0;
+                  while (i < epInfo.size() && isdigit(epInfo[i]))
+                  {
+                      rankNum = rankNum * 10 + (epInfo[i] - '0');
+                      ++i;
+                  }
+                  if (rankNum < 1 || rankNum > int(max_rank()) + 1)
+                      continue;
+                  Square epSquare = make_square(File(fileChar - 'a'), Rank(rankNum - 1));
 #ifdef LARGEBOARDS
-              // Consider different rank numbering in CECP
-              if (max_rank() == RANK_10 && CurrentProtocol == XBOARD)
-                  epSquare += NORTH;
+                  // Consider different rank numbering in CECP
+                  if (max_rank() == RANK_10 && CurrentProtocol == XBOARD)
+                      epSquare += NORTH;
 #endif
 
-              // En passant square will be considered only if
-              // epSquare is within enPassantRegion and
-              // 1) variant has non-standard rules
-              // or
-              // 2)
-              // a) side to move have a pawn threatening epSquare
-              // b) there is an enemy pawn one or two (for triple steps) squares in front of epSquare
-              // c) there is no (non-wall) piece on epSquare or behind epSquare
-              if (   (var->enPassantRegion[sideToMove] & epSquare)
-                  && (   !var->fastAttacks
-                      || (var->enPassantTypes[sideToMove] & ~piece_set(PAWN))
-                      || (   pawn_attacks_bb(~sideToMove, epSquare) & pieces(sideToMove, PAWN)
-                          && (   (pieces(~sideToMove, PAWN) & (epSquare + pawn_push(~sideToMove)))
-                              || (pieces(~sideToMove, PAWN) & (epSquare + 2 * pawn_push(~sideToMove))))
-                          && !((pieces(WHITE) | pieces(BLACK)) & (epSquare | (epSquare + pawn_push(sideToMove)))))))
-                  st->epSquares |= epSquare;
+                  // En passant square will be considered only if
+                  // epSquare is within enPassantRegion and
+                  // 1) variant has non-standard rules
+                  // or
+                  // 2)
+                  // a) side to move have a pawn threatening epSquare
+                  // b) there is an enemy pawn one or two (for triple steps) squares in front of epSquare
+                  // c) there is no (non-wall) piece on epSquare or behind epSquare
+                  if (   (var->enPassantRegion[sideToMove] & epSquare)
+                      && (   !var->fastAttacks
+                          || (var->enPassantTypes[sideToMove] & ~piece_set(PAWN))
+                          || (   pawn_attacks_bb(~sideToMove, epSquare) & pieces(sideToMove, PAWN)
+                              && (   (pieces(~sideToMove, PAWN) & (epSquare + pawn_push(~sideToMove)))
+                                  || (pieces(~sideToMove, PAWN) & (epSquare + 2 * pawn_push(~sideToMove))))
+                              && !((pieces(WHITE) | pieces(BLACK)) & (epSquare | (epSquare + pawn_push(sideToMove)))))))
+                      st->epSquares |= epSquare;
+              }
           }
+      }
   }
 
   // Check counter for nCheck

src/types.h

@@ -414,7 +414,7 @@ struct Bitboard {
     }
 
     inline Bitboard operator * (const Bitboard x) const {
-#if defined(__GNUC__) || defined(__clang__)
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__SIZEOF_INT128__)
         unsigned __int128 lo = (unsigned __int128)b64[1] * x.b64[1];
         unsigned __int128 cross1 = (unsigned __int128)b64[1] * x.b64[0];
         unsigned __int128 cross2 = (unsigned __int128)b64[0] * x.b64[1];