1 files changed, 20 insertions, 24 deletions

diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 87eb91c..e3d014e 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -93,7 +93,7 @@ const char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
   if (this->FileLine >= 0 && strcmp(var, "CMAKE_CURRENT_LIST_LINE") == 0) {
     return this->AddString(std::to_string(this->FileLine));
   }
-  const char* value = this->Makefile->GetDefinition(var);
+  cmProp value = this->Makefile->GetDefinition(var);
   if (!value) {
     this->Makefile->MaybeWarnUninitialized(var, this->FileName);
     if (!this->RemoveEmpty) {
@@ -101,9 +101,9 @@ const char* cmCommandArgumentParserHelper::ExpandVariable(const char* var)
     }
   }
   if (this->EscapeQuotes && value) {
-    return this->AddString(cmEscapeQuotes(value));
+    return this->AddString(cmEscapeQuotes(*value));
   }
-  return this->AddString(value ? value : "");
+  return this->AddString(cmToCStrSafe(value));
 }
 
 const char* cmCommandArgumentParserHelper::ExpandVariableForAt(const char* var)
@@ -205,23 +205,24 @@ bool cmCommandArgumentParserHelper::HandleEscapeSymbol(
 
 void cmCommandArgument_SetupEscapes(yyscan_t yyscanner, bool noEscapes);
 
-int cmCommandArgumentParserHelper::ParseString(const char* str, int verb)
+int cmCommandArgumentParserHelper::ParseString(std::string const& str,
+                                               int verb)
 {
-  if (!str) {
+  if (str.empty()) {
     return 0;
   }
+  this->InputSize = str.size();
   this->Verbose = verb;
-  this->InputBuffer = str;
-  this->InputBufferPos = 0;
-  this->CurrentLine = 0;
 
   this->Result.clear();
 
   yyscan_t yyscanner;
   cmCommandArgument_yylex_init(&yyscanner);
+  auto scanBuf = cmCommandArgument_yy_scan_string(str.c_str(), yyscanner);
   cmCommandArgument_yyset_extra(this, yyscanner);
   cmCommandArgument_SetupEscapes(yyscanner, this->NoEscapeMode);
   int res = cmCommandArgument_yyparse(yyscanner);
+  cmCommandArgument_yy_delete_buffer(scanBuf, yyscanner);
   cmCommandArgument_yylex_destroy(yyscanner);
   if (res != 0) {
     return 0;
@@ -241,25 +242,14 @@ void cmCommandArgumentParserHelper::CleanupParser()
   this->Variables.clear();
 }
 
-int cmCommandArgumentParserHelper::LexInput(char* buf, int maxlen)
+void cmCommandArgumentParserHelper::Error(const char* str)
 {
-  if (maxlen < 1) {
-    return 0;
+  auto pos = this->InputBufferPos;
+  auto const isEof = (this->InputSize < this->InputBufferPos);
+  if (!isEof) {
+    pos -= this->LastTokenLength;
   }
-  if (this->InputBufferPos < this->InputBuffer.size()) {
-    buf[0] = this->InputBuffer[this->InputBufferPos++];
-    if (buf[0] == '\n') {
-      this->CurrentLine++;
-    }
-    return (1);
-  }
-  buf[0] = '\n';
-  return (0);
-}
 
-void cmCommandArgumentParserHelper::Error(const char* str)
-{
-  unsigned long pos = static_cast<unsigned long>(this->InputBufferPos);
   std::ostringstream ostr;
   ostr << str << " (" << pos << ")";
   this->SetError(ostr.str());
@@ -286,3 +276,9 @@ void cmCommandArgumentParserHelper::SetError(std::string const& msg)
     this->ErrorString = msg;
   }
 }
+
+void cmCommandArgumentParserHelper::UpdateInputPosition(int const tokenLength)
+{
+  this->InputBufferPos += tokenLength;
+  this->LastTokenLength = tokenLength;
+}