Skip to content

Commit c72888d

Browse files
committed
fix bad cherry pick
1 parent 0e77b01 commit c72888d

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

src/common/engine/sc_man_scanner.re

+1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ std2:
177177
/* Other keywords from UnrealScript */
178178
'abstract' { RET(TK_Abstract); }
179179
'foreach' { RET(ParseVersion >= MakeVersion(4, 10, 0)? TK_ForEach : TK_Identifier); }
180+
'unsafe' { RET(ParseVersion >= MakeVersion(4, 14, 2)? TK_Unsafe : TK_Identifier); }
180181
'true' { RET(TK_True); }
181182
'false' { RET(TK_False); }
182183
'none' { RET(TK_None); }

src/common/engine/sc_man_tokens.h

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ xx(TK_Color, "'color'")
8080
xx(TK_Goto, "'goto'")
8181
xx(TK_Abstract, "'abstract'")
8282
xx(TK_ForEach, "'foreach'")
83+
xx(TK_Unsafe, "'unsafe'")
8384
xx(TK_True, "'true'")
8485
xx(TK_False, "'false'")
8586
xx(TK_None, "'none'")

src/common/scripting/frontend/zcc_parser.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ static void InitTokenMap()
251251
TOKENDEF (TK_Do, ZCC_DO);
252252
TOKENDEF (TK_For, ZCC_FOR);
253253
TOKENDEF (TK_ForEach, ZCC_FOREACH);
254+
TOKENDEF (TK_Unsafe, ZCC_UNSAFE);
254255
TOKENDEF (TK_While, ZCC_WHILE);
255256
TOKENDEF (TK_Until, ZCC_UNTIL);
256257
TOKENDEF (TK_If, ZCC_IF);

wadsrc/static/zscript.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version "4.12"
1+
version "4.14.2"
22

33
// Generic engine code
44
#include "zscript/engine/base.zs"

0 commit comments

Comments
 (0)