#22 Support different line endings

WojciechRynczuk · May 30, 2017 · b7a554d · b7a554d
1 parent 6799031
commit b7a554d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/sources/common/inc/EventSignalCreator.h b/sources/common/inc/EventSignalCreator.h
@@ -38,7 +38,7 @@ namespace PARSER
 
             /// The event signal creator constructor.
             EventSignalCreator() :
-                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) e")
+                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) e .*")
             {
             }
 

diff --git a/sources/common/inc/FSignalCreator.h b/sources/common/inc/FSignalCreator.h
@@ -40,7 +40,7 @@ namespace PARSER
 
             /// The real signal creator constructor.
             FSignalCreator() :
-                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) ([[:d:][:punct:]]+) f.*$")
+                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) ([[:d:][:punct:]]+) f .*")
             {
             }
 

diff --git a/sources/common/inc/ISignalCreator.h b/sources/common/inc/ISignalCreator.h
@@ -38,7 +38,7 @@ namespace PARSER
         public:
             /// The integer signal creator constructor.
             ISignalCreator() :
-                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) ([[:d:]]+) ([[:d:]]+).*$")
+                SignalCreator("^#([[:d:]]+) ([[:graph:]]+) ([[:d:]]+) ([[:d:]]+) .*")
             {
             }
 

diff --git a/sources/common/inc/SignalCreator.h b/sources/common/inc/SignalCreator.h
@@ -49,7 +49,7 @@ namespace PARSER
             /// which will be matched against the log line.
             /// @param signalRegEx The regular expression to be matech against the log line.
             SignalCreator(const std::string &signalRegEx) :
-                m_SignalRegEx(signalRegEx)
+                m_SignalRegEx(signalRegEx + "\r?\n")
             {
             }