This commit was manufactured by cvs2svn to create branch 'mono-1-0'.

[mono.git] / mcs / jay / skeleton.cs

diff --git a/mcs/jay/skeleton.cs b/mcs/jay/skeleton.cs
index 87a846529d89e8a82c0e6d76ce9525d01fe8b4bf..eb38daaec46167acd6c538d8ae7afe4a65d51856 100644 (file)
--- a/mcs/jay/skeleton.cs
+++ b/mcs/jay/skeleton.cs
@@ -10,6 +10,11 @@
 .
  prolog                ## %{ ... %} prior to the first %%
 
+.
+.  /** error output stream.
+.      It should be changeable.
+.    */
+.  public System.IO.TextWriter ErrorOutput = System.Console.Out;
 .
 .  /** simplified error message.
 .      @see <a href="#yyerror(java.lang.String, java.lang.String[])">yyerror</a>
@@ -25,29 +30,29 @@
 .    */
 .  public void yyerror (string message, string[] expected) {
 .    if ((expected != null) && (expected.Length  > 0)) {
-.      System.Console.Write (message+", expecting");
+.      ErrorOutput.Write (message+", expecting");
 .      for (int n = 0; n < expected.Length; ++ n)
-.        System.Console.Write (" "+expected[n]);
-.        System.Console.WriteLine ();
+.        ErrorOutput.Write (" "+expected[n]);
+.        ErrorOutput.WriteLine ();
 .    } else
-.      System.Console.WriteLine (message);
+.      ErrorOutput.WriteLine (message);
 .  }
 .
 .  /** debugging support, requires the package jay.yydebug.
 .      Set to null to suppress debugging messages.
 .    */
-t  protected yydebug.yyDebug debug;
+t  internal yydebug.yyDebug debug;
 .
  debug                 ## tables for debugging support
 .
-.  /** index-checked interface to yyName[].
+.  /** index-checked interface to yyNames[].
 .      @param token single character or %token value.
 .      @return token name or [illegal] or [unknown].
 .    */
 t  public static string yyname (int token) {
-t    if ((token < 0) || (token > yyName.Length)) return "[illegal]";
+t    if ((token < 0) || (token > yyNames.Length)) return "[illegal]";
 t    string name;
-t    if ((name = yyName[token]) != null) return name;
+t    if ((name = yyNames[token]) != null) return name;
 t    return "[unknown]";
 t  }
 .
@@ -57,26 +62,26 @@ t  }
 .    */
 .  protected string[] yyExpecting (int state) {
 .    int token, n, len = 0;
-.    bool[] ok = new bool[yyName.Length];
+.    bool[] ok = new bool[yyNames.Length];
 .
 .    if ((n = yySindex[state]) != 0)
 .      for (token = n < 0 ? -n : 0;
-.           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
-.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.           (token < yyNames.Length) && (n+token < yyTable.Length); ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyNames[token] != null) {
 .          ++ len;
 .          ok[token] = true;
 .        }
 .    if ((n = yyRindex[state]) != 0)
 .      for (token = n < 0 ? -n : 0;
-.           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
-.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.           (token < yyNames.Length) && (n+token < yyTable.Length); ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyNames[token] != null) {
 .          ++ len;
 .          ok[token] = true;
 .        }
 .
 .    string [] result = new string[len];
 .    for (n = token = 0; n < len;  ++ token)
-.      if (ok[token]) result[n++] = yyName[token];
+.      if (ok[token]) result[n++] = yyNames[token];
 .    return result;
 .  }
 .
@@ -87,7 +92,7 @@ t  }
 .      @return result of the last reduction, if any.
 .      @throws yyException on irrecoverable parse error.
 .    */
-.  public Object yyparse (yyParser.yyInput yyLex, Object yyd)
+.  internal Object yyparse (yyParser.yyInput yyLex, Object yyd)
 .                               {
 t    this.debug = (yydebug.yyDebug)yyd;
 .    return yyparse(yyLex);
@@ -115,7 +120,7 @@ t    this.debug = (yydebug.yyDebug)yyd;
 .      @return result of the last reduction, if any.
 .      @throws yyException on irrecoverable parse error.
 .    */
-.  public Object yyparse (yyParser.yyInput yyLex)
+.  internal Object yyparse (yyParser.yyInput yyLex)
 .                              {
 .    if (yyMax <= 0) yyMax = 256;                      // initial size
 .    int yyState = 0;                                   // state stack ptr
@@ -171,7 +176,7 @@ t              debug.shift(yyState, yyTable[yyN], yyErrorFlag-1);
 .            switch (yyErrorFlag) {
 .  
 .            case 0:
-.              yyerror("syntax error", yyExpecting(yyState));
+.              yyerror(String.Format ("syntax error, got token `{0}'", yyname (yyToken)), yyExpecting(yyState));
 t              if (debug != null) debug.error("syntax error");
 .              goto case 1;
 .            case 1: case 2:
@@ -246,7 +251,7 @@ t        if (debug != null) debug.shift(yyStates[yyTop], yyState);
  epilog                        ## text following second %%
 .namespace yydebug {
 .        using System;
-.       public interface yyDebug {
+.       internal interface yyDebug {
 .               void push (int state, Object value);
 .               void lex (int state, int token, string name, Object value);
 .               void shift (int from, int to, int errorFlag);
@@ -261,7 +266,7 @@ t        if (debug != null) debug.shift(yyStates[yyTop], yyState);
 .       
 .       class yyDebugSimple : yyDebug {
 .               void println (string s){
-.                       Console.WriteLine (s);
+.                       Console.Error.WriteLine (s);
 .               }
 .               
 .               public void push (int state, Object value) {
@@ -326,14 +331,14 @@ t        if (debug != null) debug.shift(yyStates[yyTop], yyState);
 .  using System;
 .  /** thrown for irrecoverable syntax errors and stack overflow.
 .    */
-.  public class yyException : System.Exception {
+.  internal class yyException : System.Exception {
 .    public yyException (string message) : base (message) {
 .    }
 .  }
 .
 .  /** must be implemented by a scanner object to supply input to the parser.
 .    */
-.  public interface yyInput {
+.  internal interface yyInput {
 .    /** move on to next token.
 .        @return false if positioned beyond tokens.
 .        @throws IOException on input error.