[Compiler] Generate error message for recursive preprocessor command

Author: RobertvanderHulst

src/Common/XbasePPCmd.xh

@@ -20,16 +20,21 @@
 #xcommand REQUEST  <id1> [,<idn> ]   =>
 #xcommand ANNOUNCE <id1> [,<idn> ]   =>
 
-#xcommand ENDSEQUENCE  [<*any*>]  => ENDSEQUENCE
+#xcommand ENDSEQUENCE  [<*any*>]  => END SEQUENCE
 // Do not map next token to END CLASS
 // Otherwise simple classes may be picked up by the normal class rule.
 // ENDCLASS is then the only distinguishing factor
 #xcommand ENDCLASS <*any*>        => ENDCLASS
 #xcommand ENDFOR [<*any*>]        => ENDFOR
 
+// Map BREAK() function to _Break()
+#xtranslate BREAK ([<*any*>] )	  => _Break([<any>])
+
 // Override COMMIT for Xbase++ compatibility
 #command COMMIT                 => DbCommitAll()
 
+
+
 #endif
 
 // EOF

src/Compiler/src/Compiler/XSharpCodeAnalysis/Preprocessor/XSharpPreprocessor.cs

@@ -2626,6 +2626,8 @@ private bool doProcessTranslates(IList<XSharpToken> line, out IList<XSharpToken>
                     {
                         // the replacement did not change the tokens, so stop to prevent an endless loop
                         result.AddRange(temp);
+                        var errdata = new ParseErrorData(temp[0], ErrorCode.ERR_PreProcessorError, "Recursive Preprocessor command");
+                        _parseErrors.Add(errdata);
                         temp.Clear();
                         break;
                     }
@@ -2699,6 +2701,8 @@ private bool doProcessCommands(IList<XSharpToken> line, out IList<XSharpToken> r
                 if (isResultUnchanged(prevResult, result))
                 {
                     // the replacement did not change the tokens, so stop to prevent an endless loop
+                    var errdata = new ParseErrorData(result[0], ErrorCode.ERR_PreProcessorError, "Recursive Preprocessor command");
+                    _parseErrors.Add(errdata);
                     break;
                 }
                 if (usedRules.HasRecursion(rule, result))
@@ -2813,6 +2817,8 @@ private List<XSharpToken> doReplace(IList<XSharpToken> line, PPRule rule, PPMatc
 
         private static bool isResultUnchanged(IList<XSharpToken> input, IList<XSharpToken> output)
         {
+            input = input.Where(t => t.Channel == XSharpLexer.DefaultTokenChannel).ToList();
+            output = output.Where(t => t.Channel == XSharpLexer.DefaultTokenChannel).ToList();
             if (input.Count != output.Count)
                 return false;
             for (int i = 0; i < input.Count; i++)