From cfa0d9341eac93dd521404d26684841e6997ccde Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 9 Nov 2014 18:12:30 -0800
Subject: [PATCH] Remove handling of class pseudokeyword since there is no C++
 API to use it.

---
 sourcepawn/compiler/sc1.cpp                                     | 2 ++
 .../tests/{ => disabled}/fail-mix-methodmap-and-class-1.sp      | 0
 .../tests/{ => disabled}/fail-mix-methodmap-and-class-1.txt     | 0
 .../tests/{ => disabled}/fail-mix-methodmap-and-class-2.sp      | 0
 .../tests/{ => disabled}/fail-mix-methodmap-and-class-2.txt     | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-none-to-obj.sp    | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-none-to-obj.txt   | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-any.sp     | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-any.txt    | 0
 .../compiler/tests/{ => disabled}/fail-obj-to-multitag.sp       | 0
 .../compiler/tests/{ => disabled}/fail-obj-to-multitag.txt      | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-none.sp    | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-none.txt   | 0
 sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-varargs.sp | 0
 .../compiler/tests/{ => disabled}/fail-obj-to-varargs.txt       | 0
 .../tests/{ => disabled}/fail-object-keyword-as-name.sp         | 0
 .../tests/{ => disabled}/fail-object-keyword-as-name.txt        | 0
 .../compiler/tests/{ => disabled}/fail-relabel-int-to-obj.sp    | 0
 .../compiler/tests/{ => disabled}/fail-relabel-int-to-obj.txt   | 0
 .../compiler/tests/{ => disabled}/fail-relabel-obj-to-int.sp    | 0
 .../compiler/tests/{ => disabled}/fail-relabel-obj-to-int.txt   | 0
 21 files changed, 2 insertions(+)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-mix-methodmap-and-class-1.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-mix-methodmap-and-class-1.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-mix-methodmap-and-class-2.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-mix-methodmap-and-class-2.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-none-to-obj.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-none-to-obj.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-any.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-any.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-multitag.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-multitag.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-none.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-none.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-varargs.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-obj-to-varargs.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-object-keyword-as-name.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-object-keyword-as-name.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-relabel-int-to-obj.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-relabel-int-to-obj.txt (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-relabel-obj-to-int.sp (100%)
 rename sourcepawn/compiler/tests/{ => disabled}/fail-relabel-obj-to-int.txt (100%)

diff --git a/sourcepawn/compiler/sc1.cpp b/sourcepawn/compiler/sc1.cpp
index edeb8daf..23d002c4 100644
--- a/sourcepawn/compiler/sc1.cpp
+++ b/sourcepawn/compiler/sc1.cpp
@@ -1496,10 +1496,12 @@ static void parse(void)
       /* ignore zero's */
       break;
     case tSYMBOL:
+#if 0
       if (strcmp(tok.str, "class") == 0) {
         domethodmap(Layout_Class);
         break;
       }
+#endif
       // Fallthrough.
     case tINT:
     case tOBJECT:
diff --git a/sourcepawn/compiler/tests/fail-mix-methodmap-and-class-1.sp b/sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-1.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-mix-methodmap-and-class-1.sp
rename to sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-1.sp
diff --git a/sourcepawn/compiler/tests/fail-mix-methodmap-and-class-1.txt b/sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-1.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-mix-methodmap-and-class-1.txt
rename to sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-1.txt
diff --git a/sourcepawn/compiler/tests/fail-mix-methodmap-and-class-2.sp b/sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-2.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-mix-methodmap-and-class-2.sp
rename to sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-2.sp
diff --git a/sourcepawn/compiler/tests/fail-mix-methodmap-and-class-2.txt b/sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-2.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-mix-methodmap-and-class-2.txt
rename to sourcepawn/compiler/tests/disabled/fail-mix-methodmap-and-class-2.txt
diff --git a/sourcepawn/compiler/tests/fail-none-to-obj.sp b/sourcepawn/compiler/tests/disabled/fail-none-to-obj.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-none-to-obj.sp
rename to sourcepawn/compiler/tests/disabled/fail-none-to-obj.sp
diff --git a/sourcepawn/compiler/tests/fail-none-to-obj.txt b/sourcepawn/compiler/tests/disabled/fail-none-to-obj.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-none-to-obj.txt
rename to sourcepawn/compiler/tests/disabled/fail-none-to-obj.txt
diff --git a/sourcepawn/compiler/tests/fail-obj-to-any.sp b/sourcepawn/compiler/tests/disabled/fail-obj-to-any.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-any.sp
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-any.sp
diff --git a/sourcepawn/compiler/tests/fail-obj-to-any.txt b/sourcepawn/compiler/tests/disabled/fail-obj-to-any.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-any.txt
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-any.txt
diff --git a/sourcepawn/compiler/tests/fail-obj-to-multitag.sp b/sourcepawn/compiler/tests/disabled/fail-obj-to-multitag.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-multitag.sp
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-multitag.sp
diff --git a/sourcepawn/compiler/tests/fail-obj-to-multitag.txt b/sourcepawn/compiler/tests/disabled/fail-obj-to-multitag.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-multitag.txt
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-multitag.txt
diff --git a/sourcepawn/compiler/tests/fail-obj-to-none.sp b/sourcepawn/compiler/tests/disabled/fail-obj-to-none.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-none.sp
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-none.sp
diff --git a/sourcepawn/compiler/tests/fail-obj-to-none.txt b/sourcepawn/compiler/tests/disabled/fail-obj-to-none.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-none.txt
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-none.txt
diff --git a/sourcepawn/compiler/tests/fail-obj-to-varargs.sp b/sourcepawn/compiler/tests/disabled/fail-obj-to-varargs.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-varargs.sp
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-varargs.sp
diff --git a/sourcepawn/compiler/tests/fail-obj-to-varargs.txt b/sourcepawn/compiler/tests/disabled/fail-obj-to-varargs.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-obj-to-varargs.txt
rename to sourcepawn/compiler/tests/disabled/fail-obj-to-varargs.txt
diff --git a/sourcepawn/compiler/tests/fail-object-keyword-as-name.sp b/sourcepawn/compiler/tests/disabled/fail-object-keyword-as-name.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-object-keyword-as-name.sp
rename to sourcepawn/compiler/tests/disabled/fail-object-keyword-as-name.sp
diff --git a/sourcepawn/compiler/tests/fail-object-keyword-as-name.txt b/sourcepawn/compiler/tests/disabled/fail-object-keyword-as-name.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-object-keyword-as-name.txt
rename to sourcepawn/compiler/tests/disabled/fail-object-keyword-as-name.txt
diff --git a/sourcepawn/compiler/tests/fail-relabel-int-to-obj.sp b/sourcepawn/compiler/tests/disabled/fail-relabel-int-to-obj.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-relabel-int-to-obj.sp
rename to sourcepawn/compiler/tests/disabled/fail-relabel-int-to-obj.sp
diff --git a/sourcepawn/compiler/tests/fail-relabel-int-to-obj.txt b/sourcepawn/compiler/tests/disabled/fail-relabel-int-to-obj.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-relabel-int-to-obj.txt
rename to sourcepawn/compiler/tests/disabled/fail-relabel-int-to-obj.txt
diff --git a/sourcepawn/compiler/tests/fail-relabel-obj-to-int.sp b/sourcepawn/compiler/tests/disabled/fail-relabel-obj-to-int.sp
similarity index 100%
rename from sourcepawn/compiler/tests/fail-relabel-obj-to-int.sp
rename to sourcepawn/compiler/tests/disabled/fail-relabel-obj-to-int.sp
diff --git a/sourcepawn/compiler/tests/fail-relabel-obj-to-int.txt b/sourcepawn/compiler/tests/disabled/fail-relabel-obj-to-int.txt
similarity index 100%
rename from sourcepawn/compiler/tests/fail-relabel-obj-to-int.txt
rename to sourcepawn/compiler/tests/disabled/fail-relabel-obj-to-int.txt