Merge pull request #5 from TarCV/fixes2

More cross platform compat fixes

src/lexer.cpp

@@ -39,6 +39,20 @@ static Lexer*		MainLexer = null;
 Lexer::Lexer()
 {
 	ASSERT_EQ (MainLexer, null);
+
+	// Dummy token in the beginning to set m_tokenPosition to a pos before the first actual token
+	{
+		assert(m_tokens.isEmpty());
+		TokenInfo nulltok;
+		nulltok.type = Token::Any;
+		nulltok.file = "";
+		nulltok.line = -1;
+		nulltok.column = -1;
+		nulltok.text = "";
+		m_tokens << nulltok;
+	}
+	m_tokenPosition = m_tokens.begin();
+
 	MainLexer = this;
 }
 
@@ -53,26 +67,14 @@ Lexer::~Lexer()
 //
 void Lexer::processFile(String fileName)
 {
-	assert(m_tokens.isEmpty());
-
-	// Dummy token in the beginning to set m_tokenPosition to a pos before the first actual token
-	TokenInfo nulltok;
-	nulltok.type = Token::Any;
-	nulltok.file = fileName;
-	nulltok.line = -1;
-	nulltok.column = -1;
-	nulltok.text = "";
-
-	m_tokens << nulltok;
-
 	processFileInternal(fileName);
 }
 // _________________________________________________________________________________________________
 //
 void Lexer::processFileInternal(String fileName)
 {
 	FileNameStack << fileName;
-	FILE* fp = fopen (fileName, "r");
+	FILE* fp = fopen (fileName, "rb");
 
 	if (fp == null)
 		error ("couldn't open %1 for reading: %2", fileName, strerror (errno));

src/lexer.h

@@ -51,6 +51,12 @@ class Lexer
 	Lexer();
 	~Lexer();
 
+    // Disable copying and moving to keep m_tokenPosition iteration valid
+    Lexer(const Lexer&) = delete;
+    Lexer& operator= (const Lexer&) = delete;
+    Lexer(const Lexer&&) = delete;
+    Lexer& operator=(const Lexer&& other) = delete;
+
 	void	processFile (String fileName);
 	bool	next (Token req = Token::Any);
 	void	mustGetNext (Token tok);