2003-10-08 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>

	* output.c, skelton, skelton.cs : Renamed yyName[] to yyNames[]
	to make output CLS-compliant.

svn path=/trunk/mcs/; revision=18759

diff --git a/mcs/jay/ChangeLog b/mcs/jay/ChangeLog
index 8f1050553c1cb36b193ac57398019ff9092d080a..3dd94231aba8325bc9b50ae0aa6f5d3c926c0c98 100755 (executable)
--- a/mcs/jay/ChangeLog
+++ b/mcs/jay/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-08  Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
+
+       * output.c, skelton, skelton.cs : Renamed yyName[] to yyNames[]
+       to make output CLS-compliant.
+
 2003-05-16  Peter Williams  <peterw@ximian.com>
 
        * main.c (print_skel_dir): New function called when jay is

diff --git a/mcs/jay/output.c b/mcs/jay/output.c
index f1e038e4921ff44ba93dae915b6f49abd98fb58d..37a60671cb08cf0b7b523c3c1dc535880b80abd1 100644 (file)
--- a/mcs/jay/output.c
+++ b/mcs/jay/output.c
@@ -911,9 +911,9 @@ output_debug()
        if (symbol_value[i] > max)
            max = symbol_value[i];
 
-       /* need yyName for yyExpecting() */
+       /* need yyNames for yyExpecting() */
 
-      printf("  protected static %s string [] yyName = {", csharp ? "" : "final");
+      printf("  protected static %s string [] yyNames = {", csharp ? "" : "final");
       symnam = (char **) MALLOC((max+1)*sizeof(char *));
       if (symnam == 0) no_space();
   

diff --git a/mcs/jay/skeleton b/mcs/jay/skeleton
index 07135c082f2b3ee1b76347c3b6928c5e82065712..b9a0f3eb691249869d6960f086956cd03162789c 100644 (file)
--- a/mcs/jay/skeleton
+++ b/mcs/jay/skeleton
@@ -71,14 +71,14 @@ t  protected jay.yydebug.yyDebug yydebug;
 .
  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 final 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  }
 .
@@ -88,26 +88,26 @@ t  }
 .    */
 .  protected String[] yyExpecting (int state) {
 .    int token, n, len = 0;
-.    boolean[] ok = new boolean[yyName.length];
+.    boolean[] ok = new boolean[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;
 .  }
 .

diff --git a/mcs/jay/skeleton.cs b/mcs/jay/skeleton.cs
index 87a846529d89e8a82c0e6d76ce9525d01fe8b4bf..79553fc39ead4c2c9c7a1e5e8741eb7926fd33d9 100644 (file)
--- a/mcs/jay/skeleton.cs
+++ b/mcs/jay/skeleton.cs
@@ -40,14 +40,14 @@ t  protected 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 +57,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;
 .  }
 .