Merge pull request #77 from benvenutti/feature/fix-coverity-scan-issues

Feature/fix coverity scan issues

Author: benvenutti

app-command-line/src/main.cpp

@@ -12,9 +12,18 @@ struct RequestVisitor
 {
     bool operator()( const Utilities::CommandLineParser::Config& config ) const
     {
-        const Hasm::AssemblerEngine assembler{ []( const auto& log ) { std::cout << log << std::endl; } };
-
-        return assembler.run( { config.inputFile, config.exportSymbols } );
+        try
+        {
+            const Hasm::AssemblerEngine assembler{ []( const auto& log ) { std::cout << log << std::endl; } };
+
+            return assembler.run( { config.inputFile, config.exportSymbols } );
+        }
+        catch ( const std::exception& exception )
+        {
+            std::cerr << exception.what() << std::endl;
+
+            return false;
+        }
     }
 
     bool operator()( const Utilities::CommandLineParser::RequestToPrintHelp& help ) const

hasm/include/hasm/Assembler.hpp

@@ -34,7 +34,6 @@ class Assembler
     Hack::word computeValue( const std::string& symbol );
     bool       isValidValue( Hack::word value ) const;
     void       output( Hack::word word );
-    void       displayInvalidACommandMessage();
 
     std::ostream& m_out;
     Parser        m_parser;

hasm/src/hasm/Assembler.cpp

@@ -92,26 +92,17 @@ bool Assembler::assembleAddressingInstruction()
 {
     const auto symbol  = m_parser.symbol();
     const auto value   = computeValue( symbol );
-    const auto isValid = isValidValue( value );
 
-    if ( isValid )
+    if ( isValidValue( value ) )
     {
         output( value );
-    }
-    else
-    {
-        displayInvalidACommandMessage();
-    }
 
-    return isValid;
-}
+        return true;
+    }
 
-void Assembler::displayInvalidACommandMessage()
-{
-    const auto cmd        = m_parser.getInstruction();
-    const auto lineNumber = m_parser.getCurrentLineNumber();
+    m_logger( ErrorMessage::invalidLoadValue( m_parser.getInstruction(), m_parser.getCurrentLineNumber() ) );
 
-    m_logger( ErrorMessage::invalidLoadValue( cmd, lineNumber ) );
+    return false;
 }
 
 bool Assembler::assembleComputationInstruction()