Eliminated references to obsolete trivia attributes

qwertie · Dec 3, 2016 · 75c78dc · 75c78dc
1 parent 32b19b7
commit 75c78dc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/Core/Loyc.Syntax/LES/Les2Printer.cs b/Core/Loyc.Syntax/LES/Les2Printer.cs
@@ -347,7 +347,7 @@ private bool MaybePrintTrivia(ILNode attr, bool needSpace, bool testOnly = false
 		{
 			var name = attr.Name;
 			if (S.IsTriviaSymbol(name)) {
-				if ((name == S.TriviaRawText || name == S.TriviaRawTextBefore) && _o.ObeyRawText) {
+				if ((name == S.TriviaRawText) && _o.ObeyRawText) {
 					if (!testOnly)
 						_out.Write(GetRawText(attr), true);
 					return true;
@@ -358,11 +358,11 @@ private bool MaybePrintTrivia(ILNode attr, bool needSpace, bool testOnly = false
 						if (!testOnly && !_o.OmitSpaceTrivia)
 							_out.Newline();
 						return true;
-					} else if ((name == S.TriviaSpaces || name == S.TriviaSpaceBefore)) {
+					} else if ((name == S.TriviaSpaces)) {
 						if (!testOnly && !_o.OmitSpaceTrivia)
 							PrintSpaces(GetRawText(attr));
 						return true;
-					} else if (name == S.TriviaSLComment || name == S.TriviaSLCommentBefore) {
+					} else if (name == S.TriviaSLComment) {
 						if (!testOnly && !_o.OmitComments) {
 							if (needSpace && !_out.LastCharWritten.IsOneOf(' ', '\t'))
 								_out.Write('\t', true);
@@ -371,7 +371,7 @@ private bool MaybePrintTrivia(ILNode attr, bool needSpace, bool testOnly = false
 							_out.Newline(pending: true);
 						}
 						return true;
-					} else if (name == S.TriviaMLComment || name == S.TriviaMLCommentBefore) {
+					} else if (name == S.TriviaMLComment) {
 						if (!testOnly && !_o.OmitComments) {
 							if (needSpace && !_out.LastCharWritten.IsOneOf(' ', '\t', '\n'))
 								_out.Space();

diff --git a/Core/Loyc.Syntax/LES/Les3LanguageService.cs b/Core/Loyc.Syntax/LES/Les3LanguageService.cs
@@ -19,11 +19,11 @@ public override string ToString()
 		static readonly string[] _fileExtensions = new[] { "les3", "was" };
 		public IEnumerable<string> FileExtensions { get { return _fileExtensions; } }
 
-		void ILNodePrinter.Print(LNode node, StringBuilder target, IMessageSink sink = null, ParsingMode mode = null, ILNodePrinterOptions options = null)
+		void ILNodePrinter.Print(LNode node, StringBuilder target, IMessageSink sink, ParsingMode mode, ILNodePrinterOptions options)
 		{
 			Print((ILNode)node, target, sink, mode, options);
 		}
-		void ILNodePrinter.Print(IEnumerable<LNode> nodes, StringBuilder target, IMessageSink sink = null, ParsingMode mode = null, ILNodePrinterOptions options = null)
+		void ILNodePrinter.Print(IEnumerable<LNode> nodes, StringBuilder target, IMessageSink sink, ParsingMode mode, ILNodePrinterOptions options)
 		{
 			Print(nodes.Upcast<ILNode, LNode>(), target, sink, mode, options);
 		}

diff --git a/Core/Loyc.Syntax/LES/Les3Printer.cs b/Core/Loyc.Syntax/LES/Les3Printer.cs
@@ -1047,7 +1047,7 @@ private bool MaybePrintTrivia(ILNode attr, bool trailing, bool newlineSafePoint
 			if (!S.IsTriviaSymbol(name))
 				return false;
 
-			if ((name == S.TriviaRawText || name == S.TriviaRawTextBefore) && _o.ObeyRawText)
+			if ((name == S.TriviaRawText) && _o.ObeyRawText)
 			{
 				if (!testOnly)
 					WriteToken(GetRawText(attr), LesColorCode.Unknown, 0);
@@ -1063,13 +1063,13 @@ private bool MaybePrintTrivia(ILNode attr, bool trailing, bool newlineSafePoint
 					PrintNewlineTriviaIfPossible(newlineSafePoint, false);
 				return true;
 			}
-			else if ((name == S.TriviaSpaces || name == S.TriviaSpaceBefore))
+			else if ((name == S.TriviaSpaces))
 			{
 				if (!testOnly && !_o.OmitSpaceTrivia)
 					PrintSpaces(GetRawText(attr));
 				return true;
 			}
-			else if (name == S.TriviaSLComment || name == S.TriviaSLCommentBefore)
+			else if (name == S.TriviaSLComment)
 			{
 				if (!testOnly && !_o.OmitComments) {
 					if (trailing && !SB.TryGet(SB.Length-1, ' ').IsOneOf(' ', '\t'))
@@ -1089,7 +1089,7 @@ private bool MaybePrintTrivia(ILNode attr, bool trailing, bool newlineSafePoint
 				}
 				return true;
 			}
-			else if (name == S.TriviaMLComment || name == S.TriviaMLCommentBefore)
+			else if (name == S.TriviaMLComment)
 			{
 				if (!testOnly && !_o.OmitComments) {
 					Space(trailing);

diff --git a/Main/Ecs/Printer/EcsNodePrinter.cs b/Main/Ecs/Printer/EcsNodePrinter.cs
@@ -498,9 +498,8 @@ static D OpenDelegate<D>(string name)
 		static readonly HashSet<Symbol> KnownTrivia = new HashSet<Symbol> {
 			S.TriviaInParens, S.TriviaTrailing,
 			S.TriviaNewline, S.TriviaAppendStatement, S.TriviaSpaces,
-			S.TriviaSLComment, S.TriviaSLCommentBefore, 
-			S.TriviaMLComment, S.TriviaMLCommentBefore, 
-			S.TriviaRawText, S.TriviaCsRawText, S.TriviaRawTextBefore,
+			S.TriviaSLComment, S.TriviaMLComment, 
+			S.TriviaRawText, S.TriviaCsRawText,
 			S.TriviaUseOperatorKeyword, S.TriviaForwardedProperty,
 		};
 
@@ -766,7 +765,7 @@ bool DetectAndMaybePrintTrivia(LNode attr, bool trailingMode, ref int parenCount
 			if (!KnownTrivia.Contains(name))
 				return _o.OmitUnknownTrivia && S.IsTriviaSymbol(name);
 
-			if (name == S.TriviaRawText || name == S.TriviaCsRawText || name == S.TriviaRawTextBefore) {
+			if (name == S.TriviaRawText || name == S.TriviaCsRawText) {
 				if (!_o.ObeyRawText)
 					return _o.OmitUnknownTrivia;
 				_out.Write(GetRawText(attr), true);
@@ -784,18 +783,18 @@ bool DetectAndMaybePrintTrivia(LNode attr, bool trailingMode, ref int parenCount
 				}
 			} else if (name == S.TriviaNewline) {
 				_out.Newline();
-			} else if (name == S.TriviaSpaces || name == S.TriviaSpaceBefore) {
+			} else if (name == S.TriviaSpaces) {
 				if (!_o.OmitSpaceTrivia)
 					PrintSpaces(GetRawText(attr));
-			} else if (name == S.TriviaSLComment || name == S.TriviaSLCommentBefore) {
+			} else if (name == S.TriviaSLComment) {
 				if (!_o.OmitComments) {
 					if (trailingMode && !_out.LastCharWritten.IsOneOf(' ', '\t') && (_o.SpaceOptions & SpaceOpt.BeforeCommentOnSameLine) != 0)
 						_out.Write('\t', true);
 					_out.Write("//", false);
 					_out.Write(GetRawText(attr), false);
 					_out.Newline(true);
 				}
-			} else if (name == S.TriviaMLComment || name == S.TriviaMLCommentBefore) {
+			} else if (name == S.TriviaMLComment) {
 				if (!_o.OmitComments) {
 					if (trailingMode && !_out.LastCharWritten.IsOneOf(' ', '\t', '\n'))
 						Space(SpaceOpt.BeforeCommentOnSameLine);

diff --git a/Main/LLLPG/CoreEngine/GenerateCodeVisitor.cs b/Main/LLLPG/CoreEngine/GenerateCodeVisitor.cs
@@ -118,7 +118,7 @@ private void AddUserAction(LNode action)
 						if (line > 1)
 							_target.Add(F.Trivia(S.CsPPRawText, "#line default"));
 					} else {
-						_target[i] = _target[i].PlusAttr(F.Trivia(S.TriviaSLCommentBefore,
+						_target[i] = _target[i].PlusAttr(F.Trivia(S.TriviaSLComment,
 							string.Format(" line {0}", _target[i].Range.Start.Line)));
 					}
 				}