normalize line endings for test & masters as git interferes otherwise.

erikeidt · Mar 8, 2019 · 2194e01 · 2194e01
1 parent e9dc404
commit 2194e01
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/src/1. Token Scanner/Token Scanner Library/ScanIt.cs b/src/1. Token Scanner/Token Scanner Library/ScanIt.cs
@@ -205,6 +205,9 @@ public void Advance ()
 
 		public bool IsEOF ()
 		{
+			if ( _identifierPushedBack.HasValue )
+				return false;
+
 			Trim ();
 			return _curr.AtEOF ();
 		}
@@ -216,6 +219,9 @@ public bool WhiteSpace ()
 
 		private bool Trim ()
 		{
+			if ( _identifierPushedBack.HasValue )
+				return false;
+
 			var ans = false;
 			for ( ; ; )
 			{
@@ -569,6 +575,9 @@ public ByteString GetStringLiteral ()
 
 		public bool IfTokenNoAdvance ( char what )
 		{
+			if ( _identifierPushedBack.HasValue )
+				return false;
+
 			Trim ();
 			if ( _curr.Value != what )
 				return false;
@@ -589,6 +598,9 @@ public bool IfTokenNoAdvance ( char what )
 		/// </returns>
 		public bool IfToken ( char what )
 		{
+			if ( _identifierPushedBack.HasValue )
+				return false;
+
 			Trim ();
 			if ( _curr.Value != what )
 				return false;
@@ -610,6 +622,9 @@ public bool IfToken ( char what )
 		/// </returns>
 		public bool IfCharacter ( char what )   // 
 		{
+			if ( _identifierPushedBack.HasValue )
+				return false;
+
 			if ( _curr.Value != what )
 				return false;
 			Advance ();
@@ -625,6 +640,9 @@ public bool IfCharacter ( char what )   //
 		public void ExpectToken ( char what )
 		{
 			Trim ();
+			if ( _identifierPushedBack.HasValue )
+				Error ( "Expected character: '" + what + "' instead of identifier" );
+
 			if ( _curr.Value != what ) {
 				var val = unchecked((char) _curr.Value);
 				Error ( "Expected character: '" + what + "' instead of: '" + val + "'" );

diff --git a/src/3. Expression Parser/Expression Parser Library/AbstractSyntaxTree.cs b/src/3. Expression Parser/Expression Parser Library/AbstractSyntaxTree.cs
@@ -64,7 +64,7 @@ public StringTreeNode ( UnicodeUtf8.ByteString stringLiteral )
 
 		public override void PrettyPrintHeader ( string prolog = "" )
 		{
-			WriteLine ( string.Format ( "string: \"{0}\"", Value ), prolog );
+			WriteLine ( string.Format ( "string: \"{0}\"", Value.ToString().Replace("\n", "\r\n" ) ), prolog );
 		}
 	}
 

diff --git a/src/3. Expression Parser/Program.cs b/src/3. Expression Parser/Program.cs
@@ -99,7 +99,7 @@ void Test ( int testNum, string exprToParse, int terminatingChar = -1 )
 			var testName = string.Format ( "results-test-{0}.txt", testNum );
 			using ( var tw = File.CreateText ( _testDir + testName ) ) {
 				string tc = terminatingChar >= 0 ? ((char) terminatingChar).ToString () : "";
-				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse );
+				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse.Replace ("\n", "\r\n") );
 				tw.WriteLine ();
 				var utf8Stream = CodePointStream.FromString ( exprToParse );
 				var scanner = new ScanIt ( utf8Stream, testName, tw );

diff --git a/src/4. Statement Parser/Program.cs b/src/4. Statement Parser/Program.cs
@@ -77,7 +77,7 @@ void Test ( int testNum, string exprToParse, int terminatingChar = -1 )
 			var testName = string.Format ( "results-test-{0}.txt", testNum );
 			using ( var tw = File.CreateText ( _testDir + testName ) ) {
 				string tc = terminatingChar >= 0 ? ((char) terminatingChar).ToString () : "";
-				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse );
+				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse.Replace("\n", "\r\n" ) );
 				tw.WriteLine ();
 				var utf8Stream = CodePointStream.FromString ( exprToParse );
 				var scanner = new ScanIt ( utf8Stream, testName, tw );

diff --git a/src/6. Code Generator/Program.cs b/src/6. Code Generator/Program.cs
@@ -138,7 +138,7 @@ void Test ( int testNum, string exprToParse, int terminatingChar = -1 )
 			var testName = string.Format ( "results-test-{0}.txt", testNum );
 			using ( var tw = File.CreateText ( _testDir + testName ) ) {
 				string tc = terminatingChar >= 0 ? ((char) terminatingChar).ToString () : "";
-				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse );
+				tw.WriteLine ( "------ Test: {0} ------\t{1}\t{2}", testNum, tc, exprToParse.Replace("\n", "\r\n" ) );
 				tw.WriteLine ();
 				var utf8Stream = CodePointStream.FromString ( exprToParse );
 				var scanner = new ScanIt ( utf8Stream, testName, tw );
-Original file line number
+Diff line change
@@ Expand Up @@
     		public override void PrettyPrintHeader ( string prolog = "" )
     		{
-    			WriteLine ( string.Format ( "string: \"{0}\"", Value ), prolog );
+    			WriteLine ( string.Format ( "string: \"{0}\"", Value.ToString().Replace("\n", "\r\n" ) ), prolog );
     		}
     	}
@@ Expand Down @@