Use ArgListParser in HandlePutBasic

mungre · Oct 16, 2022 · 2192975 · 2192975
1 parent 4492a69
commit 2192975
Showing 1 changed file with 4 additions and 23 deletions.
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -1598,29 +1598,10 @@ void LineParser::HandlePutFileCommon( bool bText )
 /*************************************************************************************************/
 void LineParser::HandlePutBasic()
 {
-	string hostFilename = EvaluateExpressionAsString();
-	string beebFilename = hostFilename;
-
-	if ( AdvanceAndCheckEndOfStatement() )
-	{
-		// see if there's a second parameter
-
-		if ( m_line[ m_column ] != ',' )
-		{
-			throw AsmException_SyntaxError_MissingComma( m_line, m_column );
-		}
-
-		m_column++;
-
-		beebFilename = EvaluateExpressionAsString();
-	}
-
-	// check this is now the end
-
-	if ( AdvanceAndCheckEndOfStatement() )
-	{
-		throw AsmException_SyntaxError_InvalidCharacter( m_line, m_column );
-	}
+	ArgListParser args(*this);
+	string hostFilename = args.ParseString();
+	string beebFilename = args.ParseString().Default(hostFilename);
+	args.CheckComplete();
 
 	if ( GlobalData::Instance().IsSecondPass() &&
 		 GlobalData::Instance().UsesDiscImage() )