diff --git a/sourcepawn/compiler/sc.h b/sourcepawn/compiler/sc.h index 1c02741f..91a2ff1c 100644 --- a/sourcepawn/compiler/sc.h +++ b/sourcepawn/compiler/sc.h @@ -271,7 +271,6 @@ typedef struct svalue_s { #define DECLFLAG_DYNAMIC_ARRAYS 0x20 // Dynamic arrays are allowed. #define DECLFLAG_OLD 0x40 // Known old-style declaration. #define DECLFLAG_FIELD 0x80 // Struct field. -#define DECLFLAG_NEW 0x100 // Known new-style declaration. #define DECLMASK_NAMED_DECL (DECLFLAG_ARGUMENT | DECLFLAG_VARIABLE | DECLFLAG_MAYBE_FUNCTION | DECLFLAG_FIELD) typedef struct { @@ -470,7 +469,6 @@ enum TokenKind { tENDLESS, /* endless loop, for assigment to "lastst" only */ tEMPTYBLOCK, /* empty blocks for AM bug 4825 */ tEOL, /* newline, only returned by peek_new_line() */ - tNEWDECL, /* for declloc() */ tLAST_TOKEN_ID }; diff --git a/sourcepawn/compiler/sc1.cpp b/sourcepawn/compiler/sc1.cpp index 796226ff..959fb02d 100644 --- a/sourcepawn/compiler/sc1.cpp +++ b/sourcepawn/compiler/sc1.cpp @@ -2096,8 +2096,6 @@ static void declloc(int tokid) int declflags = DECLFLAG_VARIABLE | DECLFLAG_ENUMROOT | DECLFLAG_DYNAMIC_ARRAYS; if (tokid == tNEW || tokid == tDECL) declflags |= DECLFLAG_OLD; - else if (tokid == tNEWDECL) - declflags |= DECLFLAG_NEW; parse_decl(&decl, declflags); @@ -3501,8 +3499,6 @@ int parse_decl(declinfo_t *decl, int flags) // example, if preceded by tNEW or tDECL. if (flags & DECLFLAG_OLD) return parse_old_decl(decl, flags); - if (flags & DECLFLAG_NEW) - return parse_new_decl(decl, NULL, flags); // If parsing an argument, there are two simple checks for whether this is a // new or old-style declaration. @@ -6795,7 +6791,7 @@ static void statement(int *lastindent,int allow_decl) lexpush(); autozero = TRUE; lastst = tNEW; - declloc(tNEWDECL); + declloc(tok); return; } } diff --git a/sourcepawn/compiler/tests/ok-local-dynamic-bool.sp b/sourcepawn/compiler/tests/ok-local-dynamic-bool.sp deleted file mode 100644 index 454d68b0..00000000 --- a/sourcepawn/compiler/tests/ok-local-dynamic-bool.sp +++ /dev/null @@ -1,5 +0,0 @@ -public int main() -{ - bool[] egg = new bool[10]; -} -