diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index d32ca3b66137fe..ca7cd7e68063ef 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -73,7 +73,7 @@ jobs: - ${{ each variable in parameters.variables }}: - ${{ variable }} - name: liveRuntimeBuildParams - value: 'libs.sfx+libs.oob /p:RefOnly=true -c Release -ci' + value: 'libs.sfx+libs.oob+clr.iltools /p:RefOnly=true -c Release -ci' - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: diff --git a/src/coreclr/ilasm/asmparse.y b/src/coreclr/ilasm/asmparse.y index db3d82c4baf90e..ed4492404578f6 100644 --- a/src/coreclr/ilasm/asmparse.y +++ b/src/coreclr/ilasm/asmparse.y @@ -68,7 +68,7 @@ %token UINT_ UINT8_ UINT16_ UINT32_ UINT64_ FLAGS_ CALLCONV_ MDTOKEN_ %token OBJECT_ STRING_ NULLREF_ /* misc keywords */ -%token DEFAULT_ CDECL_ VARARG_ STDCALL_ THISCALL_ FASTCALL_ CLASS_ +%token DEFAULT_ CDECL_ VARARG_ STDCALL_ THISCALL_ FASTCALL_ CLASS_ BYREFLIKE_ %token TYPEDREF_ UNMANAGED_ FINALLY_ HANDLER_ CATCH_ FILTER_ FAULT_ %token EXTENDS_ IMPLEMENTS_ TO_ AT_ TLS_ TRUE_ FALSE_ _INTERFACEIMPL @@ -486,7 +486,9 @@ typarAttrib : '+' { $$ = gpCovariant; | '-' { $$ = gpContravariant; } | CLASS_ { $$ = gpReferenceTypeConstraint; } | VALUETYPE_ { $$ = gpNotNullableValueTypeConstraint; } + | BYREFLIKE_ { $$ = gpAcceptByRefLike; } | _CTOR { $$ = gpDefaultConstructorConstraint; } + | FLAGS_ '(' int32 ')' { $$ = (CorGenericParamAttr)$3; } ; typarAttribs : /* EMPTY */ { $$ = 0; } diff --git a/src/coreclr/ilasm/prebuilt/asmparse.cpp b/src/coreclr/ilasm/prebuilt/asmparse.cpp index 6c0aa7477a3211..1518a796d20f27 100644 --- a/src/coreclr/ilasm/prebuilt/asmparse.cpp +++ b/src/coreclr/ilasm/prebuilt/asmparse.cpp @@ -15,7 +15,7 @@ #include "grammar_before.cpp" -#line 16 "asmparse.y" +#line 15 "asmparse.y" #define UNION 1 typedef union { @@ -96,241 +96,243 @@ typedef union { # define THISCALL_ 304 # define FASTCALL_ 305 # define CLASS_ 306 -# define TYPEDREF_ 307 -# define UNMANAGED_ 308 -# define FINALLY_ 309 -# define HANDLER_ 310 -# define CATCH_ 311 -# define FILTER_ 312 -# define FAULT_ 313 -# define EXTENDS_ 314 -# define IMPLEMENTS_ 315 -# define TO_ 316 -# define AT_ 317 -# define TLS_ 318 -# define TRUE_ 319 -# define FALSE_ 320 -# define _INTERFACEIMPL 321 -# define VALUE_ 322 -# define VALUETYPE_ 323 -# define NATIVE_ 324 -# define INSTANCE_ 325 -# define SPECIALNAME_ 326 -# define FORWARDER_ 327 -# define STATIC_ 328 -# define PUBLIC_ 329 -# define PRIVATE_ 330 -# define FAMILY_ 331 -# define FINAL_ 332 -# define SYNCHRONIZED_ 333 -# define INTERFACE_ 334 -# define SEALED_ 335 -# define NESTED_ 336 -# define ABSTRACT_ 337 -# define AUTO_ 338 -# define SEQUENTIAL_ 339 -# define EXPLICIT_ 340 -# define ANSI_ 341 -# define UNICODE_ 342 -# define AUTOCHAR_ 343 -# define IMPORT_ 344 -# define ENUM_ 345 -# define VIRTUAL_ 346 -# define NOINLINING_ 347 -# define AGGRESSIVEINLINING_ 348 -# define NOOPTIMIZATION_ 349 -# define AGGRESSIVEOPTIMIZATION_ 350 -# define UNMANAGEDEXP_ 351 -# define BEFOREFIELDINIT_ 352 -# define STRICT_ 353 -# define RETARGETABLE_ 354 -# define WINDOWSRUNTIME_ 355 -# define NOPLATFORM_ 356 -# define METHOD_ 357 -# define FIELD_ 358 -# define PINNED_ 359 -# define MODREQ_ 360 -# define MODOPT_ 361 -# define SERIALIZABLE_ 362 -# define PROPERTY_ 363 -# define TYPE_ 364 -# define ASSEMBLY_ 365 -# define FAMANDASSEM_ 366 -# define FAMORASSEM_ 367 -# define PRIVATESCOPE_ 368 -# define HIDEBYSIG_ 369 -# define NEWSLOT_ 370 -# define RTSPECIALNAME_ 371 -# define PINVOKEIMPL_ 372 -# define _CTOR 373 -# define _CCTOR 374 -# define LITERAL_ 375 -# define NOTSERIALIZED_ 376 -# define INITONLY_ 377 -# define REQSECOBJ_ 378 -# define CIL_ 379 -# define OPTIL_ 380 -# define MANAGED_ 381 -# define FORWARDREF_ 382 -# define PRESERVESIG_ 383 -# define RUNTIME_ 384 -# define INTERNALCALL_ 385 -# define _IMPORT 386 -# define NOMANGLE_ 387 -# define LASTERR_ 388 -# define WINAPI_ 389 -# define AS_ 390 -# define BESTFIT_ 391 -# define ON_ 392 -# define OFF_ 393 -# define CHARMAPERROR_ 394 -# define INSTR_NONE 395 -# define INSTR_VAR 396 -# define INSTR_I 397 -# define INSTR_I8 398 -# define INSTR_R 399 -# define INSTR_BRTARGET 400 -# define INSTR_METHOD 401 -# define INSTR_FIELD 402 -# define INSTR_TYPE 403 -# define INSTR_STRING 404 -# define INSTR_SIG 405 -# define INSTR_TOK 406 -# define INSTR_SWITCH 407 -# define _CLASS 408 -# define _NAMESPACE 409 -# define _METHOD 410 -# define _FIELD 411 -# define _DATA 412 -# define _THIS 413 -# define _BASE 414 -# define _NESTER 415 -# define _EMITBYTE 416 -# define _TRY 417 -# define _MAXSTACK 418 -# define _LOCALS 419 -# define _ENTRYPOINT 420 -# define _ZEROINIT 421 -# define _EVENT 422 -# define _ADDON 423 -# define _REMOVEON 424 -# define _FIRE 425 -# define _OTHER 426 -# define _PROPERTY 427 -# define _SET 428 -# define _GET 429 -# define _PERMISSION 430 -# define _PERMISSIONSET 431 -# define REQUEST_ 432 -# define DEMAND_ 433 -# define ASSERT_ 434 -# define DENY_ 435 -# define PERMITONLY_ 436 -# define LINKCHECK_ 437 -# define INHERITCHECK_ 438 -# define REQMIN_ 439 -# define REQOPT_ 440 -# define REQREFUSE_ 441 -# define PREJITGRANT_ 442 -# define PREJITDENY_ 443 -# define NONCASDEMAND_ 444 -# define NONCASLINKDEMAND_ 445 -# define NONCASINHERITANCE_ 446 -# define _LINE 447 -# define P_LINE 448 -# define _LANGUAGE 449 -# define _CUSTOM 450 -# define INIT_ 451 -# define _SIZE 452 -# define _PACK 453 -# define _VTABLE 454 -# define _VTFIXUP 455 -# define FROMUNMANAGED_ 456 -# define CALLMOSTDERIVED_ 457 -# define _VTENTRY 458 -# define RETAINAPPDOMAIN_ 459 -# define _FILE 460 -# define NOMETADATA_ 461 -# define _HASH 462 -# define _ASSEMBLY 463 -# define _PUBLICKEY 464 -# define _PUBLICKEYTOKEN 465 -# define ALGORITHM_ 466 -# define _VER 467 -# define _LOCALE 468 -# define EXTERN_ 469 -# define _MRESOURCE 470 -# define _MODULE 471 -# define _EXPORT 472 -# define LEGACY_ 473 -# define LIBRARY_ 474 -# define X86_ 475 -# define AMD64_ 476 -# define ARM_ 477 -# define ARM64_ 478 -# define MARSHAL_ 479 -# define CUSTOM_ 480 -# define SYSSTRING_ 481 -# define FIXED_ 482 -# define VARIANT_ 483 -# define CURRENCY_ 484 -# define SYSCHAR_ 485 -# define DECIMAL_ 486 -# define DATE_ 487 -# define BSTR_ 488 -# define TBSTR_ 489 -# define LPSTR_ 490 -# define LPWSTR_ 491 -# define LPTSTR_ 492 -# define OBJECTREF_ 493 -# define IUNKNOWN_ 494 -# define IDISPATCH_ 495 -# define STRUCT_ 496 -# define SAFEARRAY_ 497 -# define BYVALSTR_ 498 -# define LPVOID_ 499 -# define ANY_ 500 -# define ARRAY_ 501 -# define LPSTRUCT_ 502 -# define IIDPARAM_ 503 -# define IN_ 504 -# define OUT_ 505 -# define OPT_ 506 -# define _PARAM 507 -# define _OVERRIDE 508 -# define WITH_ 509 -# define NULL_ 510 -# define HRESULT_ 511 -# define CARRAY_ 512 -# define USERDEFINED_ 513 -# define RECORD_ 514 -# define FILETIME_ 515 -# define BLOB_ 516 -# define STREAM_ 517 -# define STORAGE_ 518 -# define STREAMED_OBJECT_ 519 -# define STORED_OBJECT_ 520 -# define BLOB_OBJECT_ 521 -# define CF_ 522 -# define CLSID_ 523 -# define VECTOR_ 524 -# define _SUBSYSTEM 525 -# define _CORFLAGS 526 -# define ALIGNMENT_ 527 -# define _IMAGEBASE 528 -# define _STACKRESERVE 529 -# define _TYPEDEF 530 -# define _TEMPLATE 531 -# define _TYPELIST 532 -# define _MSCORLIB 533 -# define P_DEFINE 534 -# define P_UNDEF 535 -# define P_IFDEF 536 -# define P_IFNDEF 537 -# define P_ELSE 538 -# define P_ENDIF 539 -# define P_INCLUDE 540 -# define CONSTRAINT_ 541 +# define BYREFLIKE_ 307 +# define GENCONSTRAINT_ 308 +# define TYPEDREF_ 309 +# define UNMANAGED_ 310 +# define FINALLY_ 311 +# define HANDLER_ 312 +# define CATCH_ 313 +# define FILTER_ 314 +# define FAULT_ 315 +# define EXTENDS_ 316 +# define IMPLEMENTS_ 317 +# define TO_ 318 +# define AT_ 319 +# define TLS_ 320 +# define TRUE_ 321 +# define FALSE_ 322 +# define _INTERFACEIMPL 323 +# define VALUE_ 324 +# define VALUETYPE_ 325 +# define NATIVE_ 326 +# define INSTANCE_ 327 +# define SPECIALNAME_ 328 +# define FORWARDER_ 329 +# define STATIC_ 330 +# define PUBLIC_ 331 +# define PRIVATE_ 332 +# define FAMILY_ 333 +# define FINAL_ 334 +# define SYNCHRONIZED_ 335 +# define INTERFACE_ 336 +# define SEALED_ 337 +# define NESTED_ 338 +# define ABSTRACT_ 339 +# define AUTO_ 340 +# define SEQUENTIAL_ 341 +# define EXPLICIT_ 342 +# define ANSI_ 343 +# define UNICODE_ 344 +# define AUTOCHAR_ 345 +# define IMPORT_ 346 +# define ENUM_ 347 +# define VIRTUAL_ 348 +# define NOINLINING_ 349 +# define AGGRESSIVEINLINING_ 350 +# define NOOPTIMIZATION_ 351 +# define AGGRESSIVEOPTIMIZATION_ 352 +# define UNMANAGEDEXP_ 353 +# define BEFOREFIELDINIT_ 354 +# define STRICT_ 355 +# define RETARGETABLE_ 356 +# define WINDOWSRUNTIME_ 357 +# define NOPLATFORM_ 358 +# define METHOD_ 359 +# define FIELD_ 360 +# define PINNED_ 361 +# define MODREQ_ 362 +# define MODOPT_ 363 +# define SERIALIZABLE_ 364 +# define PROPERTY_ 365 +# define TYPE_ 366 +# define ASSEMBLY_ 367 +# define FAMANDASSEM_ 368 +# define FAMORASSEM_ 369 +# define PRIVATESCOPE_ 370 +# define HIDEBYSIG_ 371 +# define NEWSLOT_ 372 +# define RTSPECIALNAME_ 373 +# define PINVOKEIMPL_ 374 +# define _CTOR 375 +# define _CCTOR 376 +# define LITERAL_ 377 +# define NOTSERIALIZED_ 378 +# define INITONLY_ 379 +# define REQSECOBJ_ 380 +# define CIL_ 381 +# define OPTIL_ 382 +# define MANAGED_ 383 +# define FORWARDREF_ 384 +# define PRESERVESIG_ 385 +# define RUNTIME_ 386 +# define INTERNALCALL_ 387 +# define _IMPORT 388 +# define NOMANGLE_ 389 +# define LASTERR_ 390 +# define WINAPI_ 391 +# define AS_ 392 +# define BESTFIT_ 393 +# define ON_ 394 +# define OFF_ 395 +# define CHARMAPERROR_ 396 +# define INSTR_NONE 397 +# define INSTR_VAR 398 +# define INSTR_I 399 +# define INSTR_I8 400 +# define INSTR_R 401 +# define INSTR_BRTARGET 402 +# define INSTR_METHOD 403 +# define INSTR_FIELD 404 +# define INSTR_TYPE 405 +# define INSTR_STRING 406 +# define INSTR_SIG 407 +# define INSTR_TOK 408 +# define INSTR_SWITCH 409 +# define _CLASS 410 +# define _NAMESPACE 411 +# define _METHOD 412 +# define _FIELD 413 +# define _DATA 414 +# define _THIS 415 +# define _BASE 416 +# define _NESTER 417 +# define _EMITBYTE 418 +# define _TRY 419 +# define _MAXSTACK 420 +# define _LOCALS 421 +# define _ENTRYPOINT 422 +# define _ZEROINIT 423 +# define _EVENT 424 +# define _ADDON 425 +# define _REMOVEON 426 +# define _FIRE 427 +# define _OTHER 428 +# define _PROPERTY 429 +# define _SET 430 +# define _GET 431 +# define _PERMISSION 432 +# define _PERMISSIONSET 433 +# define REQUEST_ 434 +# define DEMAND_ 435 +# define ASSERT_ 436 +# define DENY_ 437 +# define PERMITONLY_ 438 +# define LINKCHECK_ 439 +# define INHERITCHECK_ 440 +# define REQMIN_ 441 +# define REQOPT_ 442 +# define REQREFUSE_ 443 +# define PREJITGRANT_ 444 +# define PREJITDENY_ 445 +# define NONCASDEMAND_ 446 +# define NONCASLINKDEMAND_ 447 +# define NONCASINHERITANCE_ 448 +# define _LINE 449 +# define P_LINE 450 +# define _LANGUAGE 451 +# define _CUSTOM 452 +# define INIT_ 453 +# define _SIZE 454 +# define _PACK 455 +# define _VTABLE 456 +# define _VTFIXUP 457 +# define FROMUNMANAGED_ 458 +# define CALLMOSTDERIVED_ 459 +# define _VTENTRY 460 +# define RETAINAPPDOMAIN_ 461 +# define _FILE 462 +# define NOMETADATA_ 463 +# define _HASH 464 +# define _ASSEMBLY 465 +# define _PUBLICKEY 466 +# define _PUBLICKEYTOKEN 467 +# define ALGORITHM_ 468 +# define _VER 469 +# define _LOCALE 470 +# define EXTERN_ 471 +# define _MRESOURCE 472 +# define _MODULE 473 +# define _EXPORT 474 +# define LEGACY_ 475 +# define LIBRARY_ 476 +# define X86_ 477 +# define AMD64_ 478 +# define ARM_ 479 +# define ARM64_ 480 +# define MARSHAL_ 481 +# define CUSTOM_ 482 +# define SYSSTRING_ 483 +# define FIXED_ 484 +# define VARIANT_ 485 +# define CURRENCY_ 486 +# define SYSCHAR_ 487 +# define DECIMAL_ 488 +# define DATE_ 489 +# define BSTR_ 490 +# define TBSTR_ 491 +# define LPSTR_ 492 +# define LPWSTR_ 493 +# define LPTSTR_ 494 +# define OBJECTREF_ 495 +# define IUNKNOWN_ 496 +# define IDISPATCH_ 497 +# define STRUCT_ 498 +# define SAFEARRAY_ 499 +# define BYVALSTR_ 500 +# define LPVOID_ 501 +# define ANY_ 502 +# define ARRAY_ 503 +# define LPSTRUCT_ 504 +# define IIDPARAM_ 505 +# define IN_ 506 +# define OUT_ 507 +# define OPT_ 508 +# define _PARAM 509 +# define _OVERRIDE 510 +# define WITH_ 511 +# define NULL_ 512 +# define HRESULT_ 513 +# define CARRAY_ 514 +# define USERDEFINED_ 515 +# define RECORD_ 516 +# define FILETIME_ 517 +# define BLOB_ 518 +# define STREAM_ 519 +# define STORAGE_ 520 +# define STREAMED_OBJECT_ 521 +# define STORED_OBJECT_ 522 +# define BLOB_OBJECT_ 523 +# define CF_ 524 +# define CLSID_ 525 +# define VECTOR_ 526 +# define _SUBSYSTEM 527 +# define _CORFLAGS 528 +# define ALIGNMENT_ 529 +# define _IMAGEBASE 530 +# define _STACKRESERVE 531 +# define _TYPEDEF 532 +# define _TEMPLATE 533 +# define _TYPELIST 534 +# define _MSCORLIB 535 +# define P_DEFINE 536 +# define P_UNDEF 537 +# define P_IFDEF 538 +# define P_IFNDEF 539 +# define P_ELSE 540 +# define P_ENDIF 541 +# define P_INCLUDE 542 +# define CONSTRAINT_ 543 #define yyclearin yychar = -1 #define yyerrok yyerrflag = 0 #ifndef YYMAXDEPTH @@ -389,7 +391,7 @@ typedef YYEXIND_T yyexind_t; #endif # define YYERRCODE 256 -#line 2062 "asmparse.y" +#line 2063 "asmparse.y" #include "grammar_after.cpp" @@ -402,100 +404,100 @@ YYSTATIC YYCONST short yyexca[] = { #if !(YYOPTTIME) -1, 452, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) -1, 622, #endif - 274, 555, - 47, 555, - -2, 230, + 274, 557, + 47, 557, + -2, 232, #if !(YYOPTTIME) -1, 643, #endif - 40, 310, - 60, 310, - -2, 555, + 40, 312, + 60, 312, + -2, 557, #if !(YYOPTTIME) -1, 665, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) -1, 690, #endif - 274, 555, - 47, 555, - -2, 516, + 274, 557, + 47, 557, + -2, 518, #if !(YYOPTTIME) --1, 809, +-1, 811, #endif - 123, 235, - -2, 555, + 123, 237, + -2, 557, #if !(YYOPTTIME) --1, 836, +-1, 838, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 961, +-1, 963, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 994, +-1, 997, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 995, +-1, 998, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1323, +-1, 1328, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1324, +-1, 1329, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1331, +-1, 1336, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1339, +-1, 1344, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1465, +-1, 1470, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1497, +-1, 1502, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1564, +-1, 1569, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, #if !(YYOPTTIME) --1, 1581, +-1, 1586, #endif - 41, 538, - -2, 311, + 41, 540, + -2, 313, }; -# define YYNPROD 844 +# define YYNPROD 846 #if YYOPTTIME YYSTATIC YYCONST yyexind_t yyexcaind[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -578,10 +580,10 @@ YYSTATIC YYCONST yyexind_t yyexcaind[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -594,10 +596,10 @@ YYSTATIC YYCONST yyexind_t yyexcaind[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 42, 46, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 42, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -630,8 +632,9 @@ YYSTATIC YYCONST yyexind_t yyexcaind[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 50, 54, 0, 0, 0, 0, 0, - 0, 58, 0, 0, 0, 0, 0, 0, 0, 62, + 0, 0, 0, 0, 0, 0, 0, 0, 50, 54, + 0, 0, 0, 0, 0, 0, 58, 0, 0, 0, + 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -644,412 +647,406 @@ YYSTATIC YYCONST yyexind_t yyexcaind[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, + 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, + 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 78 + 0, 0, 0, 0, 0, 0, 78 }; #endif -# define YYLAST 3922 +# define YYLAST 3872 YYSTATIC YYCONST short YYFARDATA YYACT[] = { - 703, 1484, 414, 1416, 1133, 640, 660, 191, 1482, 1485, - 886, 1036, 971, 1483, 702, 788, 779, 885, 974, 729, - 73, 75, 150, 625, 1521, 536, 1417, 792, 755, 190, - 760, 757, 478, 176, 107, 972, 1146, 110, 106, 694, - 1077, 275, 860, 604, 662, 599, 273, 78, 81, 219, - 44, 24, 780, 262, 516, 214, 204, 7, 301, 188, - 654, 76, 6, 991, 85, 5, 1569, 3, 1206, 1253, - 220, 1125, 18, 1257, 115, 677, 1069, 264, 153, 1254, - 307, 133, 74, 178, 179, 180, 181, 272, 1123, 218, - 136, 10, 221, 300, 26, 137, 1070, 98, 278, 139, - 217, 1124, 17, 202, 203, 581, 269, 74, 719, 716, - 322, 265, 461, 113, 112, 700, 520, 939, 940, 352, - 343, 88, 87, 353, 89, 462, 1255, 452, 1025, 268, - 676, 338, 56, 537, 68, 1243, 1244, 305, 591, 88, - 87, 357, 89, 277, 225, 327, 277, 368, 339, 1031, - 342, 938, 361, 366, 185, 154, 1241, 1242, 98, 360, - 359, 358, 277, 56, 88, 87, 345, 89, 656, 1573, - 192, 782, 351, 783, 348, 365, 1537, 277, 86, 1039, - 369, 310, 312, 314, 316, 318, 374, 277, 362, 198, - 1038, 364, 699, 373, 199, 271, 200, 698, 1432, 84, - 105, 379, 201, 417, 418, 363, 376, 1138, 1139, 450, - 387, 451, 615, 88, 87, 186, 89, 388, 480, 195, - 814, 1071, 663, 1505, 456, 767, 1279, 457, 1578, 999, - 258, 473, 475, 416, 196, 1496, 484, 655, 481, 482, - 470, 491, 468, 472, 471, 501, 346, 216, 495, 1329, - 597, 1214, 192, 493, 441, 24, 833, 476, 479, 375, - 433, 7, 1278, 56, 801, 813, 486, 432, 664, 74, - 428, 492, 429, 483, 541, 436, 18, 641, 642, 487, - 586, 376, 585, 584, 544, 56, 1354, 1355, 1356, 587, - 941, 942, 267, 943, 435, 10, 154, 442, 26, 1337, - 1336, 1335, 1334, 494, 791, 434, 17, 777, 542, 572, - 74, 545, 714, 668, 575, 268, 576, 1249, 577, 1517, - 499, 600, 862, 863, 864, 579, 580, 371, 370, 1009, - 116, 511, 511, 528, 534, 108, 574, 372, 258, 571, - 266, 549, 573, 192, 488, 367, 88, 87, 154, 89, - 321, 1559, 601, 512, 512, 529, 535, 80, 79, 480, - 198, 505, 152, 410, 1435, 199, 74, 200, 613, 1560, - 348, 582, 583, 201, 74, 1130, 480, 46, 498, 481, - 482, 375, 621, 88, 596, 459, 89, 624, 80, 79, - 195, 1563, 607, 608, 609, 610, 481, 482, 1562, 606, - 420, 614, 421, 422, 423, 196, 745, 1368, 612, 474, - 611, 619, 620, 622, 485, 340, 341, 678, 1352, 639, - 644, 74, 1561, 500, 88, 87, 1248, 89, 1128, 955, - 56, 1153, 600, 595, 784, 135, 1154, 759, 649, 650, - 354, 355, 356, 652, 635, 1507, 1536, 348, 884, 182, - 643, 785, 56, 704, 1138, 1139, 666, 1408, 855, 321, - 177, 88, 674, 1140, 89, 74, 669, 1531, 970, 1514, - 685, 682, 951, 347, 566, 88, 1246, 46, 89, 74, - 538, 1506, 1267, 569, 1528, 867, 1362, 747, 88, 87, - 689, 89, 74, 671, 673, 1192, 1358, 1142, 696, 88, - 87, 786, 89, 990, 989, 988, 588, 983, 982, 981, - 980, 758, 978, 979, 105, 706, 987, 986, 985, 984, - 537, 690, 1468, 977, 975, 651, 715, 1001, 1002, 1003, - 1004, 88, 87, 692, 954, 177, 376, 693, 453, 155, - 648, 705, 80, 79, 480, 683, 701, 546, 727, 707, - 805, 61, 62, 47, 63, 709, 803, 710, 713, 1256, - 861, 539, 460, 645, 481, 482, 718, 177, 1520, 647, - 56, 1530, 88, 87, 225, 89, 74, 723, 1191, 659, - 728, 646, 967, 730, 277, 1529, 724, 597, 725, 675, - 976, 720, 80, 79, 1129, 762, 679, 680, 681, 413, - 734, 82, 506, 1526, 56, 768, 769, 49, 50, 51, - 52, 53, 54, 55, 74, 639, 1262, 1258, 1259, 1260, - 1261, 74, 754, 1524, 601, 744, 733, 748, 749, 750, - 1013, 98, 1011, 1012, 787, 543, 502, 72, 49, 50, - 51, 52, 53, 54, 55, 74, 643, 74, 684, 1522, - 477, 61, 62, 47, 63, 88, 87, 542, 89, 807, - 808, 802, 71, 751, 752, 753, 812, 793, 821, 74, - 514, 825, 819, 826, 822, 74, 695, 216, 70, 830, - 1184, 1183, 1182, 1181, 156, 157, 158, 831, 804, 806, - 74, 809, 74, 815, 480, 773, 774, 775, 790, 325, - 841, 842, 823, 797, 69, 800, 818, 80, 79, 67, - 377, 824, 832, 324, 481, 482, 348, 348, 854, 88, - 87, 225, 89, 834, 858, 88, 87, 865, 89, 1153, - 375, 672, 66, 930, 1154, 627, 628, 629, 49, 50, - 51, 52, 53, 54, 55, 192, 944, 945, 868, 56, - 853, 1153, 277, 856, 88, 87, 1154, 89, 74, 857, - 49, 50, 51, 52, 53, 54, 55, 601, 957, 600, - 1457, 630, 631, 632, 950, 1076, 1072, 1073, 1074, 1075, - 1455, 946, 152, 1344, 46, 382, 383, 384, 385, 111, - 177, 80, 79, 852, 74, 88, 87, 993, 89, 859, - 348, 773, 88, 87, 1021, 89, 1022, 1019, 74, 1453, - 362, 963, 956, 960, 966, 1018, 1451, 932, 46, 933, - 934, 935, 936, 937, 216, 823, 74, 1032, 1434, 593, - 1035, 637, 276, 1343, 968, 823, 606, 766, 997, 696, - 696, 496, 1026, 1044, 1020, 1425, 74, 441, 1007, 1016, - 1424, 1422, 1407, 433, 1027, 962, 1049, 829, 1024, 1047, - 432, 1029, 1028, 428, 517, 429, 1051, 1042, 436, 1006, - 1014, 528, 74, 1405, 80, 79, 480, 840, 1045, 1046, - 1395, 145, 973, 519, 1411, 670, 765, 435, 1005, 1015, - 442, 1008, 1017, 529, 823, 1062, 481, 482, 434, 1057, - 88, 87, 337, 89, 1393, 49, 50, 51, 52, 53, - 54, 55, 592, 277, 636, 277, 1391, 326, 323, 56, - 152, 1389, 1067, 1387, 1385, 277, 1383, 49, 50, 51, - 52, 53, 54, 55, 1381, 1379, 1376, 1373, 962, 1371, - 1367, 41, 43, 1351, 1327, 1209, 1208, 1056, 996, 1055, - 1134, 88, 87, 1315, 89, 762, 1079, 1054, 1080, 155, - 776, 63, 722, 46, 1053, 543, 1034, 1033, 1144, 828, - 1150, 1252, 616, 504, 820, 513, 737, 1131, 508, 509, - 618, 1136, 617, 1141, 578, 522, 527, 177, 565, 1065, - 1251, 308, 455, 1313, 109, 63, 1137, 1197, 92, 1145, - 1198, 1195, 1196, 964, 1316, 770, 1037, 520, 1311, 513, - 521, 1349, 508, 509, 1309, 1187, 1143, 695, 695, 992, - 1194, 1193, 145, 1207, 1190, 953, 1210, 1185, 1, 1418, - 1189, 1199, 1200, 1201, 1202, 1179, 1177, 1175, 1066, 589, - 1234, 1203, 1204, 1205, 1314, 49, 50, 51, 52, 53, - 54, 55, 712, 348, 88, 87, 1217, 89, 626, 1312, - 590, 1211, 1245, 1063, 1152, 1310, 1188, 1247, 152, 1218, - 1239, 1173, 1171, 1169, 145, 1238, 1237, 1240, 1186, 49, - 50, 51, 52, 53, 54, 55, 1180, 1178, 1176, 88, - 87, 348, 89, 74, 1167, 1165, 205, 155, 525, 352, - 1250, 711, 708, 353, 156, 157, 158, 1163, 192, 192, - 192, 192, 1135, 634, 277, 1161, 277, 1127, 192, 192, - 192, 357, 1174, 1172, 1170, 177, 591, 412, 378, 1433, - 626, 1263, 192, 46, 1159, 187, 794, 97, 88, 87, - 63, 89, 1157, 1430, 949, 1168, 1166, 1508, 1138, 1139, - 524, 1155, 351, 526, 317, 1266, 527, 1280, 1164, 1284, - 315, 1286, 1288, 1289, 1270, 1292, 1162, 1294, 1295, 1296, - 1297, 1298, 1299, 1300, 1274, 1302, 1303, 1304, 1305, 1306, - 1307, 1308, 1269, 1429, 313, 1160, 1317, 1318, 1291, 1320, - 1293, 1428, 1319, 1158, 1287, 1285, 1290, 152, 1301, 311, - 1419, 1236, 1156, 309, 1282, 308, 1060, 1322, 1212, 306, - 1213, 308, 1059, 844, 1328, 746, 667, 1233, 1333, 352, - 1332, 45, 94, 353, 49, 50, 51, 52, 53, 54, - 55, 454, 328, 329, 330, 308, 415, 88, 87, 277, - 89, 357, 156, 157, 158, 155, 591, 1558, 823, 1345, - 308, 1338, 1347, 1348, 308, 352, 1331, 332, 1330, 353, - 308, 56, 277, 152, 1272, 1353, 1357, 1147, 525, 277, - 140, 1215, 351, 177, 952, 1360, 1283, 357, 948, 1023, - 1359, 277, 827, 1281, 277, 138, 1350, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 1470, 839, 591, 1469, 838, 1361, 351, 817, - 63, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 591, 1346, - 524, 771, 764, 526, 1364, 258, 721, 796, 567, 117, - 1409, 1410, 349, 1414, 1396, 1413, 352, 1571, 1415, 591, - 772, 1043, 591, 591, 56, 1421, 1420, 931, 1583, 591, - 1426, 331, 303, 333, 334, 335, 336, 1574, 357, 1152, - 1572, 1565, 1541, 823, 1504, 1503, 88, 87, 1502, 89, - 1412, 1472, 1467, 134, 155, 1464, 1341, 96, 1423, 1461, - 104, 103, 102, 101, 1460, 99, 100, 105, 1456, 351, - 156, 157, 158, 1454, 49, 50, 51, 52, 53, 54, - 55, 1452, 177, 1450, 1437, 1509, 1431, 1427, 258, 1581, - 697, 1406, 1510, 1404, 1394, 1462, 1392, 1463, 1390, 1388, - 354, 355, 356, 97, 352, 1386, 836, 56, 353, 1473, - 1474, 1475, 88, 87, 1466, 89, 1471, 1384, 531, 1382, - 155, 88, 87, 1380, 89, 1378, 357, 1377, 1375, 1374, - 1488, 350, 1152, 1372, 1370, 1486, 56, 1369, 1366, 1489, - 1494, 1487, 88, 1365, 1566, 89, 1342, 1340, 177, 1476, - 1326, 1325, 1499, 1321, 1271, 46, 1498, 351, 1363, 1268, - 1235, 1516, 56, 1126, 1523, 1525, 1527, 1064, 1523, 1525, - 1527, 258, 1050, 206, 1534, 1525, 1048, 1041, 1040, 1532, - 1538, 1501, 1539, 1535, 1540, 1533, 1519, 1030, 969, 959, - 958, 947, 866, 1515, 1518, 1513, 849, 848, 846, 156, - 157, 158, 449, 843, 193, 1511, 837, 194, 835, 816, - 823, 795, 778, 742, 1523, 1525, 1527, 741, 740, 739, - 354, 355, 356, 738, 736, 88, 735, 688, 89, 638, - 198, 177, 570, 425, 424, 199, 344, 200, 46, 320, - 1564, 1497, 1493, 201, 1492, 1491, 1490, 1570, 1465, 1459, - 1458, 1568, 1449, 1448, 1447, 1446, 354, 355, 356, 1577, - 195, 1575, 1445, 1580, 1579, 156, 157, 158, 1582, 1444, - 1567, 1443, 1442, 1441, 1440, 196, 1439, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 1438, 1436, 823, 1315, 59, 523, 1313, 1576, 208, 259, - 210, 228, 212, 213, 1311, 1309, 1339, 56, 88, 882, - 1187, 89, 41, 43, 56, 1185, 876, 1179, 877, 878, - 879, 46, 1177, 1175, 1173, 1171, 515, 1169, 1167, 61, - 62, 47, 63, 1165, 1163, 1161, 1324, 354, 355, 356, - 223, 1323, 1265, 96, 1264, 56, 104, 103, 102, 101, - 46, 99, 100, 105, 222, 1078, 871, 872, 873, 1068, + 703, 1421, 1136, 640, 660, 1490, 191, 1039, 888, 974, + 1489, 790, 1488, 702, 1487, 1149, 625, 779, 887, 729, + 73, 75, 150, 414, 536, 977, 1422, 1526, 975, 190, + 478, 757, 794, 176, 760, 755, 1080, 110, 106, 107, + 694, 275, 862, 604, 662, 44, 273, 219, 780, 24, + 78, 81, 217, 86, 17, 599, 262, 153, 204, 214, + 301, 7, 6, 654, 85, 5, 76, 3, 188, 1574, + 218, 1210, 10, 1257, 115, 1128, 1072, 264, 461, 74, + 516, 133, 1261, 178, 179, 180, 181, 221, 1258, 26, + 136, 677, 1126, 300, 139, 137, 1073, 278, 1127, 581, + 74, 719, 716, 202, 203, 113, 112, 700, 272, 376, + 322, 265, 520, 1028, 220, 452, 18, 994, 88, 87, + 462, 89, 216, 338, 56, 941, 942, 277, 676, 268, + 68, 56, 537, 1247, 1248, 1259, 352, 305, 1245, 1246, + 353, 343, 591, 88, 87, 327, 89, 368, 339, 277, + 342, 98, 366, 277, 1034, 361, 360, 359, 357, 358, + 225, 940, 656, 352, 1346, 185, 345, 353, 1578, 1042, + 348, 56, 198, 1542, 277, 365, 271, 199, 1041, 200, + 369, 88, 87, 699, 89, 357, 374, 201, 362, 351, + 514, 364, 698, 373, 1141, 1142, 105, 1437, 277, 258, + 84, 379, 417, 418, 195, 816, 748, 749, 750, 450, + 387, 451, 98, 363, 480, 615, 351, 388, 782, 196, + 783, 1510, 664, 1284, 456, 470, 186, 468, 472, 471, + 376, 473, 475, 416, 481, 482, 484, 502, 410, 1074, + 655, 663, 751, 752, 753, 501, 767, 495, 457, 1583, + 815, 493, 441, 24, 1501, 376, 346, 434, 17, 1283, + 476, 479, 491, 597, 433, 7, 486, 432, 269, 74, + 428, 492, 429, 483, 1334, 435, 10, 1218, 307, 487, + 600, 597, 835, 544, 474, 1342, 1341, 1340, 1339, 485, + 803, 793, 442, 26, 777, 541, 641, 642, 500, 668, + 943, 944, 420, 945, 421, 422, 423, 714, 542, 572, + 108, 545, 321, 505, 575, 268, 576, 154, 577, 436, + 18, 864, 865, 866, 1568, 579, 580, 88, 87, 116, + 89, 1567, 192, 80, 79, 480, 499, 571, 46, 574, + 573, 549, 74, 1253, 88, 87, 266, 89, 512, 512, + 529, 535, 601, 459, 1564, 481, 482, 494, 569, 1440, + 627, 628, 629, 177, 88, 87, 267, 89, 613, 80, + 79, 582, 583, 477, 498, 511, 511, 528, 534, 310, + 312, 314, 316, 318, 596, 46, 88, 624, 678, 89, + 371, 370, 607, 608, 609, 610, 630, 631, 632, 606, + 372, 614, 1373, 621, 1357, 519, 1566, 74, 612, 480, + 611, 619, 620, 622, 192, 340, 341, 884, 1131, 352, + 644, 375, 957, 353, 878, 704, 879, 880, 881, 481, + 482, 706, 1157, 586, 74, 585, 584, 1158, 649, 650, + 639, 357, 587, 1512, 635, 600, 1541, 886, 88, 87, + 643, 89, 74, 1141, 1142, 1536, 666, 348, 154, 354, + 355, 356, 674, 600, 652, 669, 873, 874, 875, 788, + 685, 857, 351, 88, 87, 1535, 89, 595, 277, 1511, + 1565, 784, 786, 347, 177, 321, 354, 355, 356, 1522, + 135, 869, 682, 671, 673, 747, 1534, 348, 696, 588, + 785, 546, 1533, 537, 759, 192, 488, 1525, 182, 177, + 154, 689, 872, 876, 877, 1252, 882, 63, 1413, 883, + 506, 690, 1143, 684, 973, 953, 715, 56, 453, 520, + 460, 513, 521, 692, 508, 509, 1133, 693, 1196, 1271, + 543, 705, 566, 375, 41, 43, 701, 74, 727, 707, + 787, 695, 216, 538, 74, 709, 413, 710, 713, 645, + 1531, 683, 999, 1529, 63, 1250, 718, 1527, 745, 88, + 1260, 659, 89, 74, 56, 97, 504, 723, 513, 863, + 728, 508, 509, 730, 675, 1145, 724, 758, 725, 1473, + 225, 1256, 651, 1021, 679, 680, 681, 80, 79, 480, + 734, 49, 50, 51, 52, 53, 54, 55, 49, 50, + 51, 52, 53, 54, 55, 1416, 762, 720, 648, 481, + 482, 1195, 754, 152, 601, 258, 768, 769, 733, 74, + 56, 647, 348, 646, 789, 539, 639, 352, 593, 838, + 1012, 353, 1188, 1187, 1186, 1185, 643, 74, 49, 50, + 51, 52, 53, 54, 55, 88, 87, 542, 89, 357, + 804, 543, 82, 72, 71, 814, 70, 795, 823, 74, + 821, 827, 824, 828, 773, 774, 775, 198, 74, 832, + 809, 810, 199, 69, 200, 98, 377, 833, 806, 808, + 351, 811, 201, 817, 348, 367, 1363, 67, 74, 216, + 843, 844, 825, 80, 79, 799, 820, 792, 802, 195, + 66, 826, 80, 79, 480, 834, 352, 1462, 856, 74, + 353, 592, 1460, 836, 196, 80, 79, 867, 1519, 1349, + 80, 79, 831, 932, 481, 482, 74, 225, 357, 1367, + 325, 46, 354, 355, 356, 860, 946, 947, 870, 277, + 855, 1458, 842, 858, 324, 1132, 969, 56, 193, 859, + 348, 194, 88, 1456, 527, 89, 74, 601, 959, 351, + 952, 111, 854, 350, 1266, 1262, 1263, 1264, 1265, 1348, + 773, 948, 517, 74, 198, 177, 74, 744, 46, 199, + 74, 200, 88, 87, 637, 956, 861, 996, 496, 201, + 155, 1079, 1075, 1076, 1077, 1078, 1024, 1022, 1025, 1255, + 362, 965, 807, 962, 968, 96, 195, 1439, 104, 103, + 102, 101, 958, 99, 100, 105, 1430, 825, 177, 1429, + 970, 196, 88, 87, 964, 89, 74, 825, 606, 1427, + 1000, 696, 696, 1047, 1029, 1412, 1023, 441, 1010, 1019, + 1035, 277, 434, 1038, 1410, 1027, 1030, 1400, 1052, 433, + 1050, 766, 432, 1032, 1031, 428, 1054, 429, 1398, 1045, + 435, 1008, 1018, 382, 383, 384, 385, 636, 525, 976, + 1396, 1048, 1049, 1394, 337, 1392, 74, 442, 1011, 1020, + 529, 1390, 375, 1065, 695, 695, 825, 277, 776, 56, + 1388, 1060, 352, 1359, 1360, 1361, 772, 192, 88, 87, + 765, 89, 805, 1386, 436, 1009, 1017, 528, 1384, 964, + 63, 56, 88, 87, 357, 89, 74, 672, 277, 1070, + 524, 1157, 670, 526, 308, 1381, 1158, 1378, 88, 87, + 1066, 89, 1376, 1016, 722, 1014, 1015, 156, 157, 158, + 1372, 74, 1137, 480, 1082, 351, 1083, 455, 326, 323, + 354, 355, 356, 1356, 61, 62, 47, 63, 1147, 1332, + 1213, 1212, 1154, 481, 482, 616, 88, 87, 762, 89, + 1059, 88, 87, 1139, 89, 1058, 1134, 522, 1057, 1144, + 1056, 1037, 1036, 1153, 1130, 830, 822, 737, 1140, 618, + 1201, 1148, 1199, 1200, 49, 50, 51, 52, 53, 54, + 55, 617, 578, 565, 109, 934, 348, 935, 936, 937, + 938, 939, 92, 1198, 276, 1320, 1068, 1194, 1318, 1197, + 1202, 966, 1316, 1193, 1203, 1204, 1205, 1206, 1314, 354, + 355, 356, 591, 1238, 1207, 1208, 1209, 1211, 1, 1191, + 1214, 49, 50, 51, 52, 53, 54, 55, 1157, 770, + 951, 1040, 1156, 1158, 1215, 1249, 1221, 1354, 1146, 1189, + 1251, 1242, 1222, 145, 1243, 1069, 1321, 995, 1241, 1319, + 1244, 88, 87, 1317, 89, 1183, 1216, 955, 1217, 1315, + 88, 87, 1181, 89, 589, 1237, 88, 87, 1179, 89, + 1192, 88, 87, 1254, 89, 1177, 1175, 49, 50, 51, + 52, 53, 54, 55, 277, 590, 205, 993, 992, 991, + 1190, 986, 985, 984, 983, 712, 981, 982, 105, 1438, + 990, 989, 988, 987, 1267, 46, 1184, 980, 978, 711, + 708, 634, 412, 1182, 187, 97, 277, 1423, 1173, 1180, + 626, 1171, 56, 1169, 796, 1270, 1178, 1176, 527, 1167, + 626, 1285, 1165, 1289, 1273, 1291, 1293, 1294, 1274, 1297, + 1163, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1279, 1307, + 1308, 1309, 1310, 1311, 1312, 1313, 328, 329, 330, 1435, + 1322, 1323, 1290, 1325, 1324, 1296, 1292, 1298, 1295, 1174, + 1161, 56, 1172, 1434, 1170, 1306, 979, 1327, 1287, 1159, + 1168, 332, 317, 1166, 145, 1433, 1424, 1333, 1002, 1240, + 315, 1164, 1337, 1063, 1062, 354, 355, 356, 313, 311, + 94, 309, 846, 746, 49, 50, 51, 52, 53, 54, + 55, 152, 306, 1338, 667, 454, 45, 415, 1150, 1336, + 277, 1162, 825, 1350, 1343, 277, 1352, 1353, 378, 1026, + 1160, 277, 829, 308, 277, 277, 145, 530, 1335, 1358, + 1362, 308, 525, 192, 192, 192, 192, 591, 1563, 308, + 308, 1364, 308, 192, 192, 192, 1475, 1276, 591, 1474, + 1355, 591, 1351, 308, 1219, 140, 138, 192, 56, 1576, + 1365, 591, 1046, 954, 591, 331, 950, 333, 334, 335, + 336, 933, 1366, 591, 63, 841, 1402, 1403, 1404, 1405, + 1406, 1407, 1408, 840, 524, 819, 771, 526, 764, 1369, + 721, 567, 349, 1414, 1415, 591, 303, 1588, 1418, 1579, + 1577, 1420, 1401, 117, 1570, 1546, 1509, 1508, 1507, 1425, + 1426, 1477, 1472, 1469, 1466, 1431, 1465, 1461, 1156, 1419, + 1459, 1457, 258, 1455, 798, 1442, 46, 1436, 825, 1432, + 1411, 1409, 1399, 1397, 1586, 1417, 49, 50, 51, 52, + 53, 54, 55, 1428, 152, 96, 1395, 134, 104, 103, + 102, 101, 56, 99, 100, 105, 1393, 1391, 49, 50, + 51, 52, 53, 54, 55, 1389, 1387, 1385, 1383, 1382, + 88, 87, 348, 89, 74, 46, 1380, 1379, 155, 1377, + 1468, 1375, 1374, 1371, 1370, 1347, 1345, 1331, 1330, 1326, + 1277, 1275, 1272, 1138, 1478, 1479, 1480, 1239, 1471, 1476, + 1129, 1467, 1067, 1053, 1051, 1571, 177, 1513, 1044, 1043, + 1033, 972, 1156, 961, 960, 949, 258, 868, 697, 851, + 1494, 850, 848, 56, 1493, 1492, 1491, 1481, 845, 839, + 837, 1141, 1142, 1569, 1499, 1504, 818, 1503, 797, 778, + 742, 741, 740, 739, 738, 736, 1521, 735, 688, 1528, + 1530, 1532, 638, 1528, 1530, 1532, 570, 152, 425, 88, + 1530, 424, 89, 1543, 1540, 1544, 1506, 1545, 1539, 1538, + 1537, 344, 46, 1518, 1524, 320, 1520, 1523, 1004, 1005, + 1006, 1007, 1502, 152, 1498, 1497, 1496, 1495, 1470, 1001, + 1516, 1464, 1463, 1454, 1453, 825, 1452, 1451, 531, 1528, + 1530, 1532, 61, 62, 47, 63, 1450, 1449, 1448, 1447, + 1446, 1445, 1444, 88, 87, 1443, 89, 56, 1441, 1320, + 1318, 155, 1316, 1314, 523, 156, 157, 158, 1344, 1191, + 1189, 1183, 1575, 1181, 1573, 1179, 1177, 1175, 1173, 1171, + 1169, 1167, 1165, 56, 1329, 1580, 1585, 1584, 1328, 177, + 1269, 1587, 1288, 88, 63, 1572, 89, 1268, 1081, 1286, + 1071, 1064, 1055, 998, 532, 1582, 46, 533, 997, 971, + 963, 853, 852, 849, 847, 732, 731, 825, 717, 691, + 687, 258, 1581, 206, 686, 665, 633, 603, 602, 49, + 50, 51, 52, 53, 54, 55, 245, 246, 247, 248, + 249, 250, 251, 252, 253, 254, 255, 256, 257, 449, + 594, 568, 548, 59, 547, 497, 419, 208, 259, 210, + 228, 212, 213, 411, 386, 319, 88, 87, 304, 89, + 302, 41, 43, 515, 155, 518, 510, 46, 49, 50, + 51, 52, 53, 54, 55, 507, 503, 36, 61, 62, + 47, 63, 88, 87, 56, 89, 184, 93, 33, 223, + 155, 469, 177, 467, 95, 1514, 466, 465, 156, 157, + 158, 464, 1515, 222, 244, 463, 227, 243, 215, 209, + 207, 211, 889, 31, 1013, 1003, 439, 444, 177, 801, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 998, 1061, 1052, 46, 59, 995, 994, - 426, 208, 259, 210, 228, 212, 213, 961, 851, 226, - 224, 1058, 850, 847, 845, 41, 43, 732, 731, 717, - 691, 687, 870, 874, 875, 686, 880, 665, 633, 881, - 603, 530, 61, 62, 47, 63, 49, 50, 51, 52, - 53, 54, 55, 223, 602, 354, 355, 356, 594, 568, - 548, 547, 497, 419, 411, 386, 319, 222, 304, 518, - 302, 510, 507, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 503, 36, 184, 93, - 59, 33, 469, 467, 208, 259, 210, 228, 212, 213, - 466, 465, 226, 224, 95, 464, 244, 463, 41, 43, - 227, 243, 215, 209, 1098, 38, 30, 58, 32, 59, - 207, 211, 887, 31, 1010, 61, 62, 47, 63, 49, - 50, 51, 52, 53, 54, 55, 223, 41, 43, 1000, - 439, 38, 30, 58, 32, 59, 869, 799, 431, 798, - 222, 46, 430, 427, 61, 62, 47, 63, 46, 540, - 270, 60, 35, 41, 43, 83, 29, 21, 57, 34, - 37, 25, 16, 263, 15, 189, 14, 39, 40, 261, - 61, 62, 47, 63, 13, 226, 224, 60, 35, 46, - 260, 12, 11, 21, 9, 8, 37, 4, 2, 444, - 234, 242, 241, 39, 40, 240, 444, 239, 238, 237, - 236, 235, 49, 50, 51, 52, 53, 54, 55, 233, - 232, 231, 230, 229, 114, 77, 42, 756, 658, 657, - 1500, 299, 19, 20, 90, 22, 23, 48, 183, 27, - 28, 49, 50, 51, 52, 53, 54, 55, 1151, 761, - 789, 1273, 965, 1149, 1148, 605, 1479, 1478, 19, 20, - 1477, 22, 23, 48, 1495, 27, 28, 49, 50, 51, - 52, 53, 54, 55, 882, 1481, 1480, 1216, 1132, 598, - 661, 876, 781, 877, 878, 879, 448, 91, 58, 32, - 59, 1081, 743, 448, 65, 58, 32, 59, 64, 197, - 445, 883, 0, 0, 0, 446, 0, 445, 41, 43, - 929, 0, 446, 0, 0, 41, 43, 0, 0, 0, - 0, 871, 872, 873, 0, 61, 62, 47, 63, 1109, - 437, 438, 61, 62, 47, 63, 0, 437, 438, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1085, 1086, - 447, 1093, 1107, 1087, 1088, 1089, 1090, 447, 1091, 1092, - 0, 1108, 1094, 1095, 1096, 1097, 63, 870, 874, 875, - 0, 880, 0, 0, 881, 0, 532, 0, 0, 533, - 0, 0, 0, 0, 0, 443, 440, 0, 0, 0, - 0, 0, 443, 440, 0, 0, 0, 0, 0, 882, - 0, 0, 0, 0, 193, 0, 876, 194, 877, 878, - 879, 0, 49, 50, 51, 52, 53, 54, 55, 49, - 50, 51, 52, 53, 54, 55, 0, 0, 0, 0, - 198, 177, 0, 0, 0, 199, 0, 200, 0, 0, - 0, 0, 0, 201, 901, 0, 871, 872, 873, 0, - 49, 50, 51, 52, 53, 54, 55, 146, 928, 0, - 195, 0, 0, 893, 894, 0, 902, 919, 895, 896, - 897, 898, 0, 899, 900, 196, 920, 903, 904, 905, - 906, 0, 0, 0, 0, 348, 0, 0, 0, 0, - 0, 0, 870, 874, 875, 0, 880, 0, 0, 881, - 1232, 1231, 1226, 0, 1225, 1224, 1223, 1222, 0, 1220, - 1221, 105, 0, 1230, 1229, 1228, 1227, 0, 0, 0, - 0, 917, 1219, 921, 0, 990, 989, 988, 923, 983, - 982, 981, 980, 0, 978, 979, 105, 0, 987, 986, - 985, 984, 0, 0, 925, 977, 975, 0, 1542, 0, - 0, 0, 0, 0, 0, 1083, 1084, 0, 1099, 1100, - 1101, 0, 1102, 1103, 0, 0, 1104, 1105, 0, 1106, - 0, 0, 0, 0, 0, 0, 0, 926, 0, 0, - 0, 0, 1082, 1110, 1111, 1112, 1113, 1114, 1115, 1116, - 1117, 1118, 1119, 1120, 1121, 1122, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 901, - 0, 0, 976, 0, 0, 1512, 0, 0, 0, 0, - 0, 0, 0, 928, 0, 0, 0, 0, 893, 894, - 0, 902, 919, 895, 896, 897, 898, 0, 899, 900, - 0, 920, 903, 904, 905, 906, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 146, 0, 0, 0, 0, 888, 0, 889, - 890, 891, 892, 907, 908, 909, 924, 910, 911, 912, - 913, 914, 915, 916, 918, 922, 917, 0, 921, 927, - 0, 0, 0, 923, 0, 175, 0, 0, 0, 151, - 148, 163, 161, 170, 0, 164, 165, 166, 167, 925, - 168, 169, 0, 0, 171, 172, 173, 174, 564, 1557, - 152, 142, 162, 0, 0, 0, 0, 0, 0, 0, - 141, 147, 0, 1547, 0, 0, 0, 0, 0, 0, - 0, 0, 926, 0, 0, 0, 143, 144, 149, 1543, - 556, 0, 550, 551, 552, 553, 0, 0, 1552, 0, - 0, 146, 0, 0, 0, 0, 352, 0, 0, 0, - 772, 0, 1553, 1554, 1555, 1556, 0, 0, 0, 0, - 0, 160, 0, 0, 0, 0, 0, 0, 357, 558, - 559, 560, 561, 0, 0, 555, 0, 0, 0, 562, - 563, 554, 0, 0, 1544, 1545, 1546, 1548, 1549, 1550, - 1551, 0, 0, 0, 0, 0, 0, 0, 0, 623, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 888, 0, 889, 890, 891, 892, 907, 908, - 909, 924, 910, 911, 912, 913, 914, 915, 916, 918, - 922, 990, 989, 988, 927, 983, 982, 981, 980, 0, - 978, 979, 105, 0, 987, 986, 985, 984, 0, 0, - 0, 977, 975, 0, 0, 0, 0, 0, 0, 0, + 255, 256, 257, 431, 800, 430, 427, 59, 226, 224, + 540, 208, 259, 210, 228, 212, 213, 270, 88, 83, + 29, 89, 57, 56, 34, 41, 43, 25, 16, 263, + 15, 46, 14, 261, 13, 49, 50, 51, 52, 53, + 54, 55, 61, 62, 47, 63, 260, 12, 11, 9, + 8, 4, 2, 223, 234, 242, 241, 46, 240, 239, + 238, 237, 236, 235, 233, 232, 231, 222, 230, 229, + 114, 77, 42, 756, 448, 152, 58, 32, 59, 658, + 657, 156, 157, 158, 1505, 299, 90, 183, 445, 426, + 1155, 761, 791, 446, 1278, 967, 41, 43, 1152, 1151, + 605, 1484, 226, 224, 1483, 1482, 1500, 156, 157, 158, + 1486, 1485, 1220, 61, 62, 47, 63, 1135, 437, 438, + 598, 661, 781, 91, 1084, 743, 65, 64, 197, 49, + 50, 51, 52, 53, 54, 55, 885, 0, 447, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 0, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 46, 0, + 0, 0, 59, 443, 440, 0, 208, 259, 210, 228, + 212, 213, 1547, 0, 0, 0, 0, 0, 0, 0, + 41, 43, 0, 0, 38, 30, 58, 32, 59, 0, + 49, 50, 51, 52, 53, 54, 55, 61, 62, 47, + 63, 0, 0, 1101, 0, 0, 41, 43, 223, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 222, 61, 62, 47, 63, 46, 0, 0, + 60, 35, 0, 0, 88, 87, 21, 89, 0, 37, + 0, 0, 155, 0, 0, 0, 39, 40, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 226, 224, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 177, 0, 0, 0, 0, 0, 0, 444, 0, 0, + 1368, 0, 0, 0, 49, 50, 51, 52, 53, 54, + 55, 0, 0, 0, 0, 38, 30, 58, 32, 59, + 0, 19, 20, 0, 22, 23, 48, 0, 27, 28, + 49, 50, 51, 52, 53, 54, 55, 41, 43, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 61, 62, 47, 63, 0, 0, + 1061, 60, 35, 1562, 0, 0, 0, 21, 0, 931, + 37, 0, 0, 0, 0, 0, 0, 39, 40, 1552, + 0, 0, 0, 0, 448, 0, 58, 32, 59, 0, + 0, 0, 0, 0, 1517, 1548, 0, 0, 445, 0, + 0, 0, 0, 446, 1557, 0, 41, 43, 0, 156, + 157, 158, 0, 0, 0, 0, 0, 0, 1558, 1559, + 1560, 1561, 0, 61, 62, 47, 63, 0, 437, 438, + 0, 0, 19, 20, 0, 22, 23, 48, 1112, 27, + 28, 49, 50, 51, 52, 53, 54, 55, 447, 0, + 1549, 1550, 1551, 1553, 1554, 1555, 1556, 1088, 1089, 0, + 1096, 1110, 1090, 1091, 1092, 1093, 0, 1094, 1095, 0, + 1111, 1097, 1098, 1099, 1100, 0, 0, 0, 0, 0, + 0, 0, 0, 443, 440, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 903, 0, 0, 0, 0, 0, 0, + 49, 50, 51, 52, 53, 54, 55, 930, 0, 0, + 0, 0, 895, 896, 0, 904, 921, 897, 898, 899, + 900, 0, 901, 902, 0, 922, 905, 906, 907, 908, + 903, 0, 0, 0, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 930, 0, 0, 0, 0, 895, + 896, 0, 904, 921, 897, 898, 899, 900, 0, 901, + 902, 348, 922, 905, 906, 907, 908, 0, 0, 0, + 0, 0, 919, 0, 923, 0, 1236, 1235, 1230, 925, + 1229, 1228, 1227, 1226, 0, 1224, 1225, 105, 189, 1234, + 1233, 1232, 1231, 0, 0, 927, 0, 0, 1223, 0, + 0, 871, 0, 884, 0, 0, 0, 0, 0, 919, + 878, 923, 879, 880, 881, 0, 925, 0, 0, 0, + 993, 992, 991, 0, 986, 985, 984, 983, 928, 981, + 982, 105, 927, 990, 989, 988, 987, 0, 0, 0, + 980, 978, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 873, 874, 875, 0, 1086, 1087, 0, 1102, + 1103, 1104, 0, 1105, 1106, 928, 0, 1107, 1108, 0, + 1109, 0, 0, 0, 0, 0, 0, 0, 0, 146, + 0, 0, 0, 1085, 1113, 1114, 1115, 1116, 1117, 1118, + 1119, 1120, 1121, 1122, 1123, 1124, 1125, 0, 872, 876, + 877, 0, 882, 0, 0, 883, 0, 0, 0, 979, + 0, 0, 0, 0, 0, 0, 0, 0, 890, 0, + 891, 892, 893, 894, 909, 910, 911, 926, 912, 913, + 914, 915, 916, 917, 918, 920, 924, 152, 0, 0, + 929, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 890, 0, 891, 892, 893, + 894, 909, 910, 911, 926, 912, 913, 914, 915, 916, + 917, 918, 920, 924, 175, 0, 0, 929, 151, 148, + 163, 161, 170, 146, 164, 165, 166, 167, 352, 168, + 169, 0, 772, 171, 172, 173, 174, 564, 0, 0, + 142, 162, 0, 0, 0, 0, 0, 0, 0, 141, + 357, 0, 147, 0, 0, 0, 0, 193, 0, 0, + 194, 0, 0, 0, 0, 0, 0, 143, 144, 149, + 0, 556, 0, 550, 551, 552, 553, 0, 0, 0, + 0, 623, 146, 198, 177, 0, 0, 352, 199, 0, + 200, 353, 0, 0, 884, 0, 0, 0, 201, 0, + 0, 878, 160, 879, 880, 881, 0, 0, 0, 357, + 558, 559, 560, 561, 0, 195, 555, 0, 0, 0, + 562, 563, 554, 0, 0, 0, 0, 0, 0, 0, + 196, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 623, 0, 0, 873, 874, 875, 88, 87, 0, 89, + 0, 0, 0, 0, 155, 0, 0, 175, 0, 0, + 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, + 167, 0, 168, 169, 0, 0, 171, 172, 173, 174, + 0, 0, 177, 142, 162, 0, 0, 0, 0, 872, + 876, 877, 141, 882, 0, 147, 883, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 143, 144, 149, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 557, 0, 0, 0, 0, 0, + 0, 0, 146, 0, 0, 0, 0, 352, 0, 0, + 0, 353, 0, 0, 0, 160, 159, 0, 0, 0, + 88, 87, 0, 89, 0, 0, 0, 0, 155, 357, + 0, 175, 0, 0, 0, 151, 148, 163, 161, 170, + 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, + 171, 172, 173, 174, 0, 0, 177, 142, 162, 0, + 623, 0, 146, 0, 0, 0, 141, 0, 0, 147, + 0, 156, 157, 158, 0, 0, 0, 0, 0, 88, + 87, 0, 89, 0, 143, 144, 149, 155, 0, 0, + 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, + 164, 165, 166, 167, 0, 168, 169, 0, 63, 171, + 172, 173, 174, 0, 0, 177, 142, 162, 0, 160, + 274, 354, 355, 356, 0, 141, 0, 0, 147, 88, + 87, 0, 89, 0, 0, 641, 642, 0, 0, 0, + 0, 0, 0, 143, 144, 149, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 146, 409, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 156, 157, 158, 160, 0, + 354, 355, 356, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 391, 641, 642, 0, 407, 0, 0, + 389, 390, 0, 0, 0, 393, 394, 405, 395, 396, + 397, 398, 399, 400, 401, 402, 392, 0, 0, 0, + 274, 146, 0, 406, 0, 0, 404, 0, 0, 88, + 87, 0, 89, 403, 156, 157, 158, 155, 0, 0, + 175, 0, 408, 0, 151, 148, 163, 161, 170, 0, + 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, + 172, 173, 174, 0, 0, 177, 142, 162, 0, 0, + 0, 0, 0, 0, 0, 141, 0, 0, 147, 274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, + 87, 0, 89, 143, 144, 149, 0, 155, 0, 0, + 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, + 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, + 172, 173, 174, 146, 0, 177, 142, 162, 160, 0, + 354, 355, 356, 0, 0, 141, 0, 0, 147, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 175, 143, 144, 149, 0, 813, 163, 161, + 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, + 0, 171, 172, 173, 174, 0, 0, 0, 1281, 162, + 0, 274, 146, 0, 156, 157, 158, 0, 160, 88, 87, 0, 89, 0, 0, 0, 0, 155, 0, 0, - 175, 0, 0, 557, 151, 148, 163, 161, 170, 0, + 175, 0, 812, 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, - 172, 173, 174, 146, 0, 177, 142, 162, 352, 0, - 0, 0, 353, 0, 0, 141, 147, 0, 976, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 357, 143, 144, 149, 0, 0, 175, 0, 0, 0, - 0, 0, 163, 161, 170, 0, 164, 165, 166, 167, - 0, 168, 169, 0, 0, 171, 172, 173, 174, 0, - 0, 623, 1276, 162, 0, 0, 160, 159, 88, 87, - 0, 89, 0, 0, 0, 0, 155, 0, 0, 175, + 172, 173, 174, 0, 0, 177, 142, 162, 1282, 0, + 0, 0, 0, 0, 0, 141, 0, 0, 147, 0, + 274, 0, 0, 0, 156, 157, 158, 1280, 88, 87, + 0, 89, 0, 143, 144, 149, 155, 0, 0, 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, 172, - 173, 174, 0, 0, 177, 142, 162, 0, 0, 0, - 1277, 0, 0, 0, 141, 147, 0, 0, 0, 0, - 297, 198, 156, 157, 158, 0, 199, 0, 200, 1275, - 143, 144, 149, 0, 201, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 146, 0, 0, 0, 0, 352, - 0, 195, 284, 353, 279, 280, 281, 282, 283, 63, - 0, 0, 0, 287, 0, 160, 196, 354, 355, 356, - 0, 357, 285, 0, 0, 0, 0, 295, 0, 286, - 0, 641, 642, 0, 0, 0, 0, 0, 0, 0, - 0, 288, 289, 290, 291, 292, 293, 294, 298, 0, - 0, 0, 623, 0, 296, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 156, 157, 158, 0, 0, 0, 0, 0, 0, - 88, 87, 0, 89, 0, 0, 0, 0, 155, 146, + 173, 174, 146, 0, 177, 142, 162, 0, 160, 159, + 0, 0, 0, 0, 141, 0, 0, 147, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 143, 144, 149, 0, 0, 993, 992, 991, + 0, 986, 985, 984, 983, 0, 981, 982, 105, 0, + 990, 989, 988, 987, 0, 0, 0, 980, 978, 0, + 274, 0, 0, 0, 156, 157, 158, 160, 0, 0, + 88, 87, 0, 89, 0, 0, 0, 0, 155, 0, 0, 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, 172, 173, 174, 0, 0, 177, 142, 162, 0, - 0, 0, 0, 0, 0, 0, 141, 147, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 143, 144, 149, 0, 0, 274, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 146, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 160, 0, 354, - 355, 356, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 641, 642, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 274, 0, 0, 0, 0, - 0, 88, 87, 0, 89, 0, 0, 0, 0, 155, - 0, 0, 175, 156, 157, 158, 151, 148, 163, 161, - 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, - 0, 171, 172, 173, 174, 0, 146, 177, 142, 162, - 0, 0, 0, 0, 0, 0, 0, 141, 147, 0, + 0, 0, 0, 0, 0, 0, 763, 146, 0, 147, + 0, 0, 0, 156, 157, 158, 979, 0, 0, 88, + 87, 0, 89, 0, 143, 144, 149, 155, 0, 0, + 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, + 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, + 172, 173, 174, 0, 0, 177, 142, 162, 0, 160, + 0, 0, 0, 0, 146, 141, 0, 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 144, 149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 274, 0, 88, 87, 160, 89, - 354, 355, 356, 0, 155, 146, 0, 175, 0, 0, - 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, - 167, 0, 168, 169, 0, 0, 171, 172, 173, 174, - 0, 0, 177, 142, 162, 0, 0, 0, 0, 0, - 0, 0, 141, 147, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 156, 157, 158, 0, 143, 144, - 149, 0, 811, 274, 88, 87, 0, 89, 0, 0, - 0, 0, 155, 0, 0, 175, 0, 146, 0, 151, - 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, - 168, 169, 0, 160, 171, 172, 173, 174, 0, 0, - 177, 142, 162, 0, 0, 0, 0, 810, 0, 0, - 141, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 143, 144, 149, 0, - 0, 0, 0, 0, 0, 274, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 146, 0, 0, 156, - 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 160, 159, 88, 87, 0, 89, 0, 0, 0, - 0, 155, 0, 0, 175, 0, 0, 0, 151, 148, - 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, - 169, 0, 0, 171, 172, 173, 174, 0, 0, 177, - 142, 162, 0, 0, 274, 0, 0, 0, 0, 141, - 147, 0, 0, 0, 0, 0, 0, 156, 157, 158, - 0, 0, 0, 0, 0, 143, 144, 149, 0, 0, - 0, 0, 88, 87, 0, 89, 0, 0, 0, 0, - 155, 0, 0, 175, 0, 0, 0, 151, 148, 163, - 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, - 160, 0, 171, 172, 173, 174, 0, 0, 177, 142, - 162, 0, 0, 0, 0, 0, 0, 0, 763, 147, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 146, 0, 143, 144, 149, 0, 0, 0, - 0, 0, 0, 0, 88, 87, 0, 89, 0, 0, - 0, 0, 155, 0, 0, 175, 156, 157, 158, 151, - 148, 163, 161, 170, 0, 164, 165, 166, 167, 160, - 168, 169, 0, 0, 171, 172, 173, 174, 0, 0, - 177, 142, 162, 0, 0, 0, 0, 146, 0, 0, - 141, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 143, 144, 149, 0, - 0, 0, 0, 88, 87, 0, 89, 0, 0, 0, - 0, 155, 0, 0, 175, 156, 157, 158, 151, 148, - 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, - 169, 653, 146, 171, 172, 173, 174, 0, 0, 177, - 142, 162, 88, 87, 0, 89, 0, 0, 0, 141, - 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 143, 144, 149, 0, 0, - 0, 0, 0, 0, 0, 0, 409, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 156, 157, 158, - 996, 0, 0, 146, 0, 0, 0, 0, 0, 0, - 458, 0, 0, 0, 391, 0, 0, 0, 407, 0, - 0, 389, 390, 0, 0, 0, 393, 394, 405, 395, - 396, 397, 398, 399, 400, 401, 402, 392, 0, 0, - 0, 0, 0, 0, 406, 0, 0, 404, 0, 0, - 0, 0, 0, 0, 403, 0, 0, 146, 0, 0, - 0, 726, 0, 408, 0, 0, 156, 157, 158, 489, - 175, 490, 0, 0, 151, 148, 163, 161, 170, 0, + 0, 0, 0, 0, 0, 156, 157, 158, 653, 88, + 87, 146, 89, 0, 0, 0, 0, 155, 0, 0, + 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, 172, 173, 174, 0, 0, 177, 142, 162, 0, 0, - 0, 0, 0, 0, 0, 141, 147, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 143, 144, 149, 380, 175, 381, 0, 0, 151, + 0, 297, 198, 0, 0, 141, 0, 199, 147, 200, + 0, 0, 0, 146, 156, 157, 158, 201, 0, 999, + 0, 0, 0, 143, 144, 149, 0, 0, 0, 0, + 0, 0, 0, 0, 195, 284, 0, 279, 280, 281, + 282, 283, 0, 0, 0, 0, 287, 0, 0, 196, + 0, 0, 0, 0, 0, 285, 0, 0, 458, 0, + 295, 0, 286, 0, 0, 146, 0, 0, 0, 0, + 0, 726, 0, 0, 288, 289, 290, 291, 292, 293, + 294, 298, 0, 0, 489, 175, 490, 296, 0, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, 172, 173, 174, 0, 0, - 0, 142, 162, 0, 0, 0, 160, 0, 0, 0, - 141, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 143, 144, 149, 0, - 175, 0, 0, 0, 151, 148, 163, 161, 170, 0, - 164, 165, 166, 167, 0, 168, 169, 0, 0, 171, - 172, 173, 174, 0, 0, 0, 142, 162, 0, 0, - 0, 160, 0, 0, 0, 141, 147, 0, 0, 0, + 177, 142, 162, 0, 156, 157, 158, 0, 0, 0, + 141, 0, 0, 147, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 143, 144, + 149, 380, 175, 381, 0, 0, 151, 148, 163, 161, + 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, + 0, 171, 172, 173, 174, 0, 0, 0, 142, 162, + 0, 0, 0, 160, 0, 0, 0, 141, 0, 0, + 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 143, 144, 149, 0, 175, + 0, 0, 0, 151, 148, 163, 161, 170, 0, 164, + 165, 166, 167, 0, 168, 169, 0, 0, 171, 172, + 173, 174, 0, 0, 0, 142, 162, 0, 0, 0, + 160, 0, 0, 0, 141, 0, 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 143, 144, 149, 0, 0, 0, 0, 0, 0, - 0, 175, 0, 0, 0, 151, 148, 163, 161, 170, + 0, 175, 143, 144, 149, 151, 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, 0, 0, - 171, 172, 173, 174, 0, 0, 160, 142, 162, 0, - 0, 0, 0, 0, 0, 0, 141, 147, 0, 0, + 171, 172, 173, 174, 0, 0, 0, 142, 162, 0, + 0, 0, 0, 0, 0, 0, 141, 160, 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 143, 144, 149, 175, 0, 0, 0, 151, - 148, 163, 161, 170, 0, 164, 165, 166, 167, 0, - 168, 169, 0, 0, 171, 172, 173, 174, 0, 0, - 0, 142, 162, 0, 0, 0, 0, 160, 0, 0, - 141, 147, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 175, 143, 144, 149, 151, 148, 163, + 161, 170, 0, 164, 165, 166, 167, 0, 168, 169, + 0, 0, 171, 172, 173, 174, 0, 0, 0, 142, + 162, 0, 0, 0, 0, 0, 0, 0, 141, 160, + 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 144, 149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1058,187 +1055,187 @@ YYSTATIC YYCONST short YYFARDATA YYACT[] = { }; YYSTATIC YYCONST short YYFARDATA YYPACT[] = { --1000, 1423,-1000, 609, 586,-1000,-1000,-1000,-1000,-1000, --1000,-1000, 581, 555, 539, 514,-1000,-1000,-1000, 102, - 102, -466, 124, 124,-1000,-1000,-1000, 478,-1000, -115, - 535,-1000, 907, 1099, 68, 903, 102, -355, -356,-1000, - -139, 855, 68, 855,-1000,-1000,-1000, 172, 2319, 535, - 535, 535, 535,-1000,-1000, 187,-1000,-1000,-1000, -164, - 1074,-1000,-1000, 1825, 68, 68,-1000,-1000, 1368,-1000, --1000,-1000,-1000,-1000,-1000,-1000, 102, -121,-1000,-1000, --1000,-1000, 691, -120, 2983, 1193,-1000,-1000,-1000,-1000, - 2436,-1000, 102,-1000, 1385,-1000, 1310, 1718, 68, 1169, - 1163, 1159, 1144, 1120, 1114, 1716, 1518, 83,-1000, 102, - 655, 878,-1000,-1000, 86, 1193, 535, 2983,-1000,-1000, +-1000, 1635,-1000, 587, 574,-1000,-1000,-1000,-1000,-1000, +-1000,-1000, 560, 543, 541, 540,-1000,-1000,-1000, 78, + 78, -463, 105, 105,-1000,-1000,-1000, 539,-1000, -116, + 395,-1000, 931, 1107, 43, 923, 78, -365, -366,-1000, + -142, 1445, 43, 1445,-1000,-1000,-1000, 227, 2386, 395, + 395, 395, 395,-1000,-1000, 246,-1000,-1000,-1000, -155, + 1083,-1000,-1000, 2288, 43, 43,-1000,-1000, 1498,-1000, +-1000,-1000,-1000,-1000,-1000,-1000, 78, -117,-1000,-1000, +-1000,-1000, 1432, -141, 2918, 1219,-1000,-1000,-1000,-1000, + 3187,-1000, 78,-1000, 537,-1000, 1294, 1628, 43, 1202, + 1191, 1189, 1188, 1180, 1172, 1625, 1474, 45,-1000, 78, + 696, 830,-1000,-1000, 84, 1219, 395, 2918,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000, 1515, 185, 1288, 1061, -229, -230, -231, - -238, 691,-1000, -101, 691, 1255, 312,-1000,-1000, 48, --1000, 3564, 239, 1081,-1000,-1000,-1000,-1000,-1000, 3394, +-1000,-1000,-1000, 1470, 195, 1288, 381, -233, -235, -236, + -237, 1432,-1000, -93, 1432, 489, 662,-1000,-1000, 111, +-1000, 3512, 213, 1211,-1000,-1000,-1000,-1000,-1000, 3351, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, - 504,-1000,-1000,-1000,-1000,-1000, 1193, 1715, 538, 1193, - 1193, 1193,-1000, 3232, 123,-1000,-1000, 1714, 1066, 2884, --1000, 3564,-1000,-1000,-1000, 65, 65,-1000, 1713,-1000, --1000, 99, 1513, 1512, 1575, 1397,-1000,-1000, 102,-1000, - 102, 87,-1000,-1000,-1000,-1000, 1173,-1000,-1000,-1000, --1000,-1000, 901, 102, 3193,-1000, 21, -69,-1000,-1000, - 201, 102, 124, 610, 68, 201, 1255, 3339, 2983, -88, - 65, 2884, 1712,-1000, 215,-1000,-1000,-1000,-1000,-1000, + 592,-1000,-1000,-1000,-1000,-1000, 1219, 1624, 432, 1219, + 1219, 1219,-1000, 2599, 126,-1000,-1000, 1623, 1081, 2859, +-1000, 3512,-1000,-1000,-1000, 382, 382,-1000, 1616,-1000, +-1000, 1, 1460, 1457, 1704, 1524,-1000,-1000, 78,-1000, + 78, 75,-1000,-1000,-1000,-1000, 1187,-1000,-1000,-1000, +-1000,-1000, 866, 78, 3179,-1000, -13, -86,-1000,-1000, + 309, 78, 105, 333, 43, 309, 489, 3294, 2918, -92, + 382, 2859, 1615,-1000, 502,-1000,-1000,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, - 511, 545, 860, 1606,-1000, 100,-1000, 355, 691,-1000, --1000, 2983,-1000,-1000, 164, 1217, 65, 535,-1000,-1000, + 112, 65, 862, 1142,-1000, 81,-1000, 428, 1432,-1000, +-1000, 2918,-1000,-1000, 67, 125, 382, 395,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000,-1000,-1000,-1000,-1000, 1711, 1710, 2114, - 895, 349, 1284, 1709, 123, 1511, -48,-1000, 102, -48, --1000, 124,-1000, 102,-1000, 102,-1000, 102,-1000,-1000, --1000,-1000, 891,-1000, 102, 102,-1000, 1193,-1000,-1000, --1000, -369,-1000,-1000,-1000,-1000,-1000, 878, -47, 116, --1000,-1000, 1193, 999,-1000, 1299, 789, 1708,-1000, 170, - 535, 157,-1000,-1000,-1000, 1704, 1690, 3564, 535, 535, - 535, 535,-1000, 691,-1000,-1000, 3564, 228,-1000, 1193, --1000, -68,-1000, 1217, 879, 889, 887, 535, 535, 2721, --1000,-1000,-1000,-1000,-1000,-1000, 102, 1299, 1070,-1000, +-1000,-1000,-1000,-1000,-1000,-1000,-1000, 1614, 1612, 2243, + 920, 417, 1287, 1611, 126, 1455, -52,-1000, 78, -52, +-1000, 105,-1000, 78,-1000, 78,-1000, 78,-1000,-1000, +-1000,-1000, 919,-1000, 78, 78,-1000, 1219,-1000,-1000, +-1000, -377,-1000,-1000,-1000,-1000,-1000, 830, 104, 107, +-1000,-1000, 1219, 1054,-1000, 1292, 598, 1610,-1000, 214, + 395, 170,-1000,-1000,-1000, 1588, 1587, 3512, 395, 395, + 395, 395,-1000, 1432,-1000,-1000, 3512, 572,-1000, 1219, +-1000, -65,-1000, 125, 882, 918, 906, 395, 395, 2699, +-1000,-1000,-1000,-1000,-1000,-1000, 78, 1292, 1100,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000,-1000,-1000, 406,-1000,-1000,-1000, 1688, - 1052,-1000, 791, 1508,-1000,-1000, 2580,-1000,-1000, 102, --1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, 458, - 446, 417,-1000,-1000,-1000,-1000,-1000, 102, 102, 402, - 3124,-1000,-1000, -304, -196,-1000,-1000,-1000,-1000,-1000, --1000,-1000, -53, 1687,-1000, 102, 1158, 39, 65, 794, - 640, 102,-1000, -69, 107, 107, 107, 107, 2983, 215, +-1000,-1000,-1000,-1000,-1000, 29,-1000,-1000,-1000, 1586, + 1080,-1000, 754, 1451,-1000,-1000, 2549,-1000,-1000, 78, +-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, 510, + 508, 495,-1000,-1000,-1000,-1000,-1000, 78, 78, 469, + 3079,-1000,-1000, -303, -204,-1000,-1000,-1000,-1000,-1000, +-1000,-1000, -34, 1585,-1000, 78, 1186, 25, 382, 841, + 836, 78,-1000, -86, 76, 76, 76, 76, 2918, 502, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000, 1685, 1681, 1506,-1000,-1000,-1000, 2721,-1000,-1000, --1000,-1000, 1299, 1680, 68, 3564,-1000, 201, 1285,-1000, - -119, -124,-1000,-1000, -351,-1000,-1000, 68, 411, 454, - 68,-1000,-1000, 1041,-1000,-1000, 68,-1000, 68,-1000, - 1040, 991,-1000,-1000, 535, -157, -360, 1679,-1000,-1000, --1000,-1000, 535, -361,-1000,-1000, -346,-1000,-1000,-1000, - 1282,-1000, 869, 535, 3564, 1193, 3510, 102, 108, 1181, --1000,-1000,-1000,-1000,-1000,-1000,-1000, 1678,-1000,-1000, --1000,-1000,-1000,-1000, 1677,-1000,-1000, 1385, 108, 1505, --1000, 1503, 883, 1502, 1498, 1497, 1496, 1492,-1000, 362, - 1157,-1000, 97, 1193,-1000,-1000,-1000, 298, 535, 108, - 388, 175, 3052,-1000,-1000, 1278, 1193,-1000, 793,-1000, --1000, -50, 2983, 2983, 943, 1277, 1217, 1193, 1193, 1193, - 1193,-1000, 2418,-1000, 1193,-1000, 535, 535, 535, 867, - 1193, 33, 1193, 494, 1491,-1000, 128,-1000,-1000,-1000, --1000,-1000,-1000, 102,-1000, 1299,-1000,-1000, 1255, 30, - 1076,-1000,-1000, 1193, 1490, 1202,-1000,-1000,-1000,-1000, --1000,-1000, -10, 65, 465, 459, 2983, 2816, -106, -47, - 1488, 1265,-1000,-1000, 3510, -53, 881, 102, -96, 3564, - 102, 1193, 102, 1238, 876,-1000,-1000,-1000, 201,-1000, --1000,-1000,-1000,-1000,-1000,-1000, 102, 124,-1000, -18, - 1193, 108, 1487, 1386, 1485, 1262, 1259,-1000, 123, 102, - 102, 1482, 1155,-1000,-1000, 1299, 1674, 1477, 1673, 1476, - 1475, 1672, 1668, 1193, 535,-1000, 535, 102, 141, 535, - 68, 2983, 535, 706, 1298, 81, -182, 1471, 95, 1795, - 131, 1877, 102,-1000, 1306,-1000, 900,-1000, 900, 900, - 900, 900, 900, -166,-1000, 102, 102, 535,-1000,-1000, --1000,-1000,-1000,-1000, 1193, 1470, 1234, 1083,-1000,-1000, - 347, 1230, 964, 271, 166,-1000, 46, 102, 1469, 1468, --1000, 3564, 1667, 1081, 1081, 1081, 535, 535,-1000, 941, - 542, 128,-1000,-1000,-1000,-1000,-1000, 1467, 343, 226, - 958, -96, 1659, 1658, 3449,-1000,-1000, 1568, 104, 204, - 690, -96, 3564, 102, 1193, 102, 1235, -322, 535, 1193, --1000,-1000, 3564,-1000,-1000, 1193,-1000, -53, 81, 1466, - -241,-1000,-1000, 1193, 2721, 874, 873, 2983, 945, -126, - -137, 1457, 1456, 535, 1300,-1000, -53,-1000, 201, 201, --1000,-1000,-1000,-1000, 411,-1000,-1000,-1000,-1000,-1000, --1000,-1000, 1081, 1193, 1455, 102, 1193, 1451,-1000, 535, - -96, 1655, 871, 864, 856, 854,-1000, 108, 1670,-1000, +-1000, 1584, 1580, 1447,-1000,-1000,-1000, 2699,-1000,-1000, +-1000,-1000, 1292, 1579, 43, 3512,-1000, 309, 1333,-1000, + -126, -135,-1000,-1000, -361,-1000,-1000, 43, 383, 370, + 43,-1000,-1000, 1079,-1000,-1000, 43,-1000, 43,-1000, + 1078, 1064,-1000,-1000, 395, -164, -369, 1578,-1000,-1000, +-1000,-1000, 395, -370,-1000,-1000, -352,-1000,-1000,-1000, + 1286,-1000, 851, 395, 3512, 1219, 3460, 78, 235, 678, +-1000,-1000,-1000,-1000,-1000,-1000,-1000, 1576,-1000,-1000, +-1000,-1000,-1000,-1000, 1575,-1000,-1000, 537, 235, 1446, +-1000, 1444, 904, 1443, 1442, 1441, 1440, 1439,-1000, 524, + 1175,-1000, 103, 1219,-1000,-1000,-1000, -125, 395, 235, + 464, 242, 3020,-1000,-1000, 1284, 1219,-1000, 817,-1000, +-1000, -29, 2918, 2918, 997, 1282, 125, 1219, 1219, 1219, + 1219,-1000, 2490,-1000, 1219,-1000, 395, 395, 395, 805, + 1219, 20, 1219, 188, 1438,-1000, 175,-1000,-1000,-1000, +-1000,-1000,-1000, 78,-1000, 1292,-1000,-1000, 489, 17, + 1094,-1000,-1000, 1219, 1437, 1239,-1000,-1000,-1000,-1000, +-1000,-1000, 16, 382, 821, 721, 2918, 2759, -123, 104, + 1435, 1281,-1000,-1000, 3460, -34, 903, 78, -79, 3512, + 78, 1219, 78, 1218, 902,-1000,-1000,-1000, 309,-1000, +-1000,-1000,-1000,-1000,-1000,-1000, 78, 105,-1000, 8, + 1219, 235, 1429, 599, 1428, 1279, 1271,-1000, 126, 78, + 78, 1427, 1174,-1000,-1000, 1292, 1574, 1421, 1573, 1420, + 1418, 1572, 1571, 1219, 395,-1000, 395, 78, 152, 395, + 43, 2918, 395, 703, 864, 98, -185, 1416, 99, 2300, + 128, 1976, 78,-1000, 1270,-1000, 843,-1000, 843, 843, + 843, 843, 843, -158,-1000, 78, 78, 395,-1000,-1000, +-1000,-1000,-1000,-1000, 1219, 1414, 1262, 999,-1000,-1000, + 400, 1259, 1026, 532, 159,-1000, 5, 78, 1413, 1412, +-1000, 3512, 1570, 1211, 1211, 1211, 395, 395,-1000, 969, + 716, 175,-1000,-1000,-1000,-1000,-1000,-1000, 1569, 1410, + 399, 840, 1016, -79, 1568, 1563, 3408,-1000,-1000, 1404, + 1093, 515, 468, -79, 3512, 78, 1219, 78, 1215, -339, + 395, 1219,-1000,-1000, 3512,-1000,-1000, 1219,-1000, -34, + 98, 1409, -238,-1000,-1000, 1219, 2699, 899, 898, 2918, + 1000, -140, -149, 1408, 1407, 395, 1261,-1000, -34,-1000, + 309, 309,-1000,-1000,-1000,-1000, 383,-1000,-1000,-1000, +-1000,-1000,-1000,-1000, 1211, 1219, 1403, 78, 1219, 1402, +-1000, 395, -79, 1562, 897, 895, 892, 887,-1000, 235, + 2049,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, +-1000,-1000, 1166, 1165, 1561, 1000, 126, 1401, 984, 43, + 1560, -407, -38,-1000,-1000,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000,-1000, 521,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000,-1000,-1000,-1000, 1558, 1558,-1000, 1558, + 1911,-1000,-1000, -406,-1000, -392,-1000,-1000, -427,-1000, +-1000,-1000, 1399,-1000,-1000,-1000,-1000,-1000,-1000,-1000, + 126,-1000,-1000,-1000,-1000,-1000, 155, 492, 1219,-1000, + 235, 1150, 397,-1000, 3020, 462, 1007,-1000,-1000,-1000, +-1000,-1000, 125, -34, 1211, 1219,-1000, 395, 1204, 2918, +-1000, 78,-1000,-1000, 698,-1000,-1000,-1000, 1169, 1160, + 1130, 1122, 1119, 1113, 1111, 1108, 1066, 1065, 1058, 1052, + 1045, 361, 1029, 1009, 43, 498, 1094, -34, -34, 78, + 968,-1000,-1000,-1000, 489, 489, 489, 489,-1000,-1000, +-1000,-1000,-1000,-1000, 489, 489, 489,-1000,-1000,-1000, +-1000,-1000, -440, 2699, 878, 877, 2918,-1000, 489, 1219, + 678,-1000, 126,-1000, 126, 3,-1000, 1250,-1000,-1000, + 2039, 126, 78,-1000,-1000, 1219,-1000, 1396,-1000,-1000, + 1161,-1000,-1000, -290, 1090, 1976,-1000,-1000,-1000,-1000, + 1292,-1000, -256, -261, 78,-1000,-1000,-1000,-1000, 472, + 218, 235, 718, 500,-1000,-1000,-1000,-1000,-1000,-1000, +-1000, -432,-1000,-1000, 44,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000,-1000,-1000,-1000, 494,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, - 1154, 1148, 1654, 945, 123, 1446, 947, 68, 1639, -405, - -56,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000, 495,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000,-1000, 1635, 1635,-1000, 1635, 1762,-1000, --1000, -408,-1000, -387,-1000,-1000, -429,-1000,-1000,-1000, - 1442,-1000,-1000,-1000,-1000,-1000,-1000,-1000, 123,-1000, --1000,-1000,-1000,-1000, 165, 331, 1193,-1000, 108, 829, - 338,-1000, 3052, 374, 955,-1000,-1000,-1000,-1000,-1000, - 1217, -53, 1081, 1193,-1000, 535, 1223, 2983,-1000,-1000, --1000, 393,-1000,-1000,-1000, 1111, 1102, 1094, 1075, 1067, - 1055, 1054, 1033, 1032, 1031, 997, 996, 995, 399, 987, - 975, 68, 455, 1076, -53, -53, 102, 938,-1000,-1000, --1000, 1255, 1255, 1255, 1255,-1000,-1000,-1000,-1000,-1000, --1000, 1255, 1255, 1255,-1000,-1000,-1000,-1000,-1000, -441, - 2721, 853, 852, 2983,-1000, 1255, 1193, 1181,-1000, 123, --1000, 123, -23,-1000, 1227,-1000,-1000, 1913, 123, 102, --1000,-1000, 1193,-1000, 1439,-1000,-1000, 1143,-1000,-1000, - -287, 998, 1877,-1000,-1000,-1000,-1000, 1299,-1000, -236, - -257, 102,-1000,-1000,-1000,-1000, 383, 192, 108, 899, - 880,-1000,-1000,-1000,-1000,-1000,-1000,-1000, -434,-1000, --1000, 35,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000, 336,-1000,-1000,-1000,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000, 78,-1000,-1000,-1000,-1000, 1557, 1292, + 1550,-1000,-1000,-1000,-1000,-1000, 416, 1391, 1204,-1000, + 175, 1390, 1243,-1000, 1389, 2811,-1000,-1000,-1000, -40, + 78, 1293, 78, 2970, 78, 143, 78, 69, 78, 105, + 78, 78, 78, 78, 78, 78, 78, 105, 78, 78, + 78, 78, 78, 78, 78, 998, 992, 988, 985, 78, + 78, -127, 78, 1388, 1292,-1000,-1000, 1548, 1544, 1387, + 1386, 876,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, + 382, 0,-1000, 1224,-1000, 1209,-1000,-1000, -79, 2918, +-1000,-1000, 1292,-1000, 1542, 1541, 1540, 1539, 1538, 1537, + 4, 1536, 1535, 1533, 1531, 1530, 1529,-1000,-1000,-1000, + 383,-1000, 1528, 1385, 123,-1000,-1000,-1000,-1000, 1384, +-1000, 686, 78,-1000, 1248, 78, 78, 1006, 235, 870, +-1000,-1000,-1000,-1000,-1000,-1000,-1000, 141, 78, 622, + 571,-1000,-1000,-1000,-1000,-1000, 2918,-1000, 648,-1000, +-1000,-1000, 1724, 1383, 1382, 857, 139, 1381, 1380, 849, + 1378, 844, 1376, 1375, 842, 1368, 1367, 825, 1366, 820, + 1365, 807, 1364, 798, 1356, 792, 1355, 790, 1345, 787, + 1332, 775, 1331, 764, 105, 78, 78, 78, 78, 78, + 78, 78, 1330, 761, 1329, 752,-1000, 393, -34, -34, +-1000,-1000, 553, 3512, -79, 2918, -34, 1087,-1000, 1523, + 1522, 1520, 1519, 1158, -34,-1000,-1000,-1000,-1000, 78, + 746, 235, 736, 733, 78, 1292,-1000,-1000, 1328, 1157, + 1145, 1131, 1326,-1000, 72,-1000, 1068, 724, 96,-1000, +-1000,-1000, 1518, 1324,-1000,-1000, 1515,-1000, 1512,-1000, +-1000, 1511,-1000,-1000, 1510,-1000, 1509,-1000, 1508,-1000, + 1507,-1000, 1506,-1000, 1497,-1000, 1496,-1000, 1494,-1000, + 1493, 1322, 670, 1320, 658, 1319, 629, 1316, 624,-1000, + 1492,-1000, 1491,-1000, 1315, 1313,-1000, 2699, 1087,-1000, + 1312, 1488,-1000, 471, 383, 1311, 496,-1000, 1245,-1000, + 2013, 1310,-1000, 78, 78, 78,-1000,-1000, 2970,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, - 102,-1000,-1000,-1000,-1000, 1624, 1299, 1622,-1000,-1000, --1000,-1000,-1000, 359, 1438, 1223,-1000, 128, 1433, 1220, --1000, 2375,-1000,-1000,-1000, -37, 102, 977, 102, 1938, - 102, 110, 102, 93, 102, 124, 102, 102, 102, 102, - 102, 102, 102, 124, 102, 102, 102, 102, 102, 102, - 102, 974, 968, 953, 913, 102, 102, -112, 102, 1432, - 1299,-1000,-1000, 1621, 1616, 1430, 1429, 851,-1000,-1000, --1000,-1000,-1000,-1000,-1000,-1000, 65, -25,-1000, 1214, --1000, 1216,-1000,-1000, -96, 2983,-1000,-1000, 1299,-1000, - 1615, 1614, 1613, 1608, 1607, 1605, 18, 1604, 1603, 1602, - 1597, 1595, 1590,-1000,-1000,-1000, 411,-1000, 1586, 1426, - 1335,-1000,-1000,-1000,-1000, 1425,-1000, 740, 102,-1000, - 1275, 102, 102, 950, 108, 850,-1000,-1000,-1000,-1000, --1000,-1000,-1000, 155, 102, 5, 371,-1000,-1000,-1000, --1000,-1000, 2983, 395,-1000,-1000,-1000, 1172, 1422, 1417, - 847, 144, 1416, 1413, 846, 1412, 844, 1408, 1407, 843, - 1406, 1404, 842, 1402, 841, 1398, 833, 1396, 831, 1384, - 830, 1378, 828, 1377, 823, 1375, 811, 1373, 787, 124, - 102, 102, 102, 102, 102, 102, 102, 1372, 780, 1370, - 759,-1000, 332, -53, -53,-1000,-1000, 822, 3564, -96, - 2983, -53, 969,-1000, 1585, 1584, 1576, 1573, 1142, -53, --1000,-1000,-1000,-1000, 102, 758, 108, 757, 752, 102, - 1299,-1000,-1000, 1366, 1133, 1125, 1085, 1365,-1000, 73, --1000, 1068, 735, 101,-1000,-1000,-1000, 1571, 1363,-1000, --1000, 1570,-1000, 1556,-1000,-1000, 1554,-1000,-1000, 1553, --1000, 1552,-1000, 1551,-1000, 1549,-1000, 1542,-1000, 1535, --1000, 1534,-1000, 1533,-1000, 1532, 1362, 723, 1360, 716, - 1352, 687, 1347, 677,-1000, 1530,-1000, 1529,-1000, 1343, - 1338,-1000, 2721, 969,-1000, 1334, 1528,-1000, 857, 411, - 1331, 429,-1000, 1261,-1000, 2042, 1330,-1000, 102, 102, - 102,-1000,-1000, 1938,-1000,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000,-1000,-1000,-1000, 1487,-1000, 1486,-1000, + 1485,-1000, 1484,-1000,-1000,-1000,-1000, -20, 1482, 1000, + -34,-1000,-1000,-1000, 235,-1000, 984,-1000, 1307, 1306, + 1305,-1000, 180, 1406, 2083, 687, 448, 466, 526, 522, + 519, 461, 455, 434, 414,-1000,-1000,-1000,-1000, 405, + 132, -79, -34,-1000, 1304, 1799, 1234,-1000,-1000,-1000, +-1000,-1000,-1000,-1000,-1000, 91,-1000,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000, 1526,-1000, 1525,-1000, 1524,-1000, 1522,-1000,-1000, --1000,-1000, -39, 1521, 945, -53,-1000,-1000,-1000, 108, --1000, 947,-1000, 1327, 1324, 1323,-1000, 182, 1106, 2264, - 428, 278, 527, 608, 582, 562, 443, 544, 530, 426, --1000,-1000,-1000,-1000, 405, 135, -96, -53,-1000, 1321, - 2115, 1203,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, - 88,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, +-1000,-1000,-1000,-1000,-1000,-1000,-1000, 439, 365, 290, + 283,-1000,-1000,-1000, 1433, 1303,-1000,-1000,-1000,-1000, -1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000, 328, 381, 357, 350,-1000,-1000,-1000, 1520, - 1320,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000, --1000,-1000,-1000,-1000,-1000,-1000,-1000, 1424, 108,-1000, --1000,-1000,-1000,-1000, -53, -443, 102, 1296, 1319, -188, - 1316,-1000,-1000, 65,-1000, 3564, 2721, -46, -96, 969, - 1369, -53, 1307,-1000 +-1000,-1000, 1405, 235,-1000,-1000,-1000,-1000,-1000, -34, + -442, 78, 1258, 1299, -191, 1298,-1000,-1000, 382,-1000, + 3512, 2699, -25, -79, 1087, 1334, -34, 1296,-1000 }; YYSTATIC YYCONST short YYFARDATA YYPGO[] = { - 0, 33, 178, 5, 1991, 78, 39, 7, 1989, 0, - 1988, 1984, 1982, 268, 80, 1981, 1977, 4, 1972, 52, - 40, 3, 26, 32, 24, 6, 1970, 44, 41, 45, - 1969, 38, 34, 10, 17, 11, 31, 1968, 42, 1967, - 35, 18, 1966, 1965, 9, 1, 13, 8, 1954, 1950, - 1947, 1946, 22, 27, 43, 1945, 1944, 1943, 1942, 15, - 1941, 1940, 12, 1939, 30, 1938, 14, 36, 16, 23, - 46, 2, 599, 59, 1236, 29, 106, 1928, 1924, 1921, - 1920, 1919, 1918, 19, 28, 1917, 1329, 1916, 1915, 25, - 789, 131, 1914, 50, 1221, 1913, 1912, 1911, 1910, 1909, - 1901, 1900, 1899, 1898, 1897, 1895, 1892, 1891, 1890, 1028, - 1888, 67, 56, 1887, 65, 134, 62, 55, 1885, 1884, - 89, 1882, 1881, 1880, 1874, 1869, 1866, 53, 1864, 1863, - 1862, 100, 70, 49, 1861, 92, 292, 1859, 1858, 1856, - 1855, 1850, 1849, 1843, 1842, 1839, 1838, 1837, 1830, 832, - 1829, 1814, 1813, 1812, 1811, 1810, 1803, 1802, 75, 1801, - 1800, 125, 1797, 1796, 1795, 130, 1791, 1790, 1783, 1782, - 1781, 1779, 1778, 58, 1760, 63, 1777, 54, 1776, 602, - 1762, 1761, 1759, 1646, 1615, 1438 + 0, 33, 53, 3, 1876, 57, 40, 6, 1868, 0, + 1867, 1866, 1865, 222, 278, 1864, 1863, 2, 1862, 48, + 36, 1, 26, 30, 27, 4, 1861, 44, 41, 55, + 1860, 38, 39, 8, 18, 7, 31, 1857, 42, 1852, + 28, 25, 1851, 1850, 5, 10, 12, 14, 1846, 1845, + 1844, 1841, 22, 32, 43, 1840, 1839, 1838, 1835, 11, + 1834, 1832, 9, 1831, 34, 1830, 13, 15, 17, 16, + 46, 23, 556, 68, 1247, 29, 268, 1827, 1826, 1825, + 1824, 1820, 1819, 19, 35, 1813, 1343, 1812, 1811, 24, + 771, 123, 1810, 45, 1246, 1809, 1808, 1806, 1805, 1804, + 1803, 1802, 1801, 1800, 1799, 1798, 1796, 1795, 1794, 1048, + 1792, 67, 58, 1791, 65, 130, 62, 59, 1790, 1789, + 70, 1788, 1787, 1786, 1774, 1773, 1772, 56, 1770, 1769, + 1768, 52, 114, 47, 1767, 87, 366, 1764, 1762, 1760, + 1759, 1757, 1750, 1746, 1745, 1744, 1743, 1729, 1726, 1024, + 1725, 1724, 1723, 1722, 1721, 1720, 1719, 1718, 91, 1717, + 1716, 120, 1715, 1714, 1711, 128, 1707, 1706, 1703, 1701, + 1698, 1697, 1696, 60, 1670, 117, 1687, 80, 1686, 520, + 1685, 1676, 1675, 1673, 1564, 1538 }; YYSTATIC YYCONST yyr_t YYFARDATA YYR1[]={ @@ -1257,76 +1254,76 @@ YYSTATIC YYCONST yyr_t YYFARDATA YYR1[]={ 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 140, 140, 141, 141, 112, 112, 142, 142, 56, 56, 57, 57, 69, 69, 18, - 18, 18, 18, 18, 19, 19, 68, 68, 67, 67, - 58, 21, 21, 22, 143, 143, 143, 143, 143, 143, + 18, 18, 18, 18, 18, 18, 19, 19, 68, 68, + 67, 67, 58, 21, 21, 22, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 116, 79, 79, 79, 79, + 143, 143, 143, 143, 143, 143, 143, 116, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 4, 4, 35, 35, 16, 16, 75, 75, - 75, 75, 75, 75, 75, 7, 7, 7, 7, 8, - 8, 8, 8, 8, 8, 8, 8, 76, 74, 74, - 74, 74, 74, 74, 144, 144, 81, 81, 81, 145, - 145, 150, 150, 150, 150, 150, 150, 150, 150, 146, - 82, 82, 82, 147, 147, 151, 151, 151, 151, 151, - 151, 151, 152, 38, 38, 34, 34, 153, 114, 78, + 79, 79, 79, 79, 4, 4, 35, 35, 16, 16, + 75, 75, 75, 75, 75, 75, 75, 7, 7, 7, + 7, 8, 8, 8, 8, 8, 8, 8, 8, 76, + 74, 74, 74, 74, 74, 74, 144, 144, 81, 81, + 81, 145, 145, 150, 150, 150, 150, 150, 150, 150, + 150, 146, 82, 82, 82, 147, 147, 151, 151, 151, + 151, 151, 151, 151, 152, 38, 38, 34, 34, 153, + 114, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 3, 3, - 3, 13, 13, 13, 13, 13, 80, 80, 80, 80, + 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 3, 3, 3, 13, 13, 13, 13, 13, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 154, 115, 115, 155, 155, 155, 155, 155, + 80, 80, 80, 80, 154, 115, 115, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 158, 159, 156, 161, 161, 160, 160, 160, 163, - 162, 162, 162, 162, 166, 166, 166, 169, 164, 167, - 168, 165, 165, 165, 117, 170, 170, 172, 172, 172, - 171, 171, 173, 173, 14, 14, 174, 174, 174, 174, + 155, 155, 155, 158, 159, 156, 161, 161, 160, 160, + 160, 163, 162, 162, 162, 162, 166, 166, 166, 169, + 164, 167, 168, 165, 165, 165, 117, 170, 170, 172, + 172, 172, 171, 171, 173, 173, 14, 14, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 41, 41, 41, 41, 41, 41, 41, 41, 41, + 174, 174, 174, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, - 175, 31, 31, 32, 32, 39, 39, 39, 40, 40, + 41, 41, 175, 31, 31, 32, 32, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 42, 42, 42, 43, 43, 43, - 47, 47, 46, 46, 45, 45, 44, 44, 48, 48, - 49, 49, 49, 50, 50, 50, 50, 51, 51, 149, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 157, 157, 157, 157, 157, 157, + 40, 40, 40, 40, 40, 40, 42, 42, 42, 43, + 43, 43, 47, 47, 46, 46, 45, 45, 44, 44, + 48, 48, 49, 49, 49, 50, 50, 50, 50, 51, + 51, 149, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 108, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 6, 6, 6, - 6, 6, 53, 53, 54, 54, 55, 55, 25, 25, - 26, 26, 27, 27, 27, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 5, 5, 71, 71, 71, - 71, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 6, + 6, 6, 6, 6, 53, 53, 54, 54, 55, 55, + 25, 25, 26, 26, 27, 27, 27, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 5, 5, 71, + 71, 71, 71, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 20, 20, 15, 15, + 33, 33, 33, 33, 33, 33, 33, 33, 20, 20, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 28, 28, 28, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 52, 52, 52, 52, 52, 52, 52, 52, 52, - 52, 52, 52, 52, 52, 52, 52, 52, 52, 30, - 30, 29, 29, 29, 29, 29, 131, 131, 131, 131, - 131, 131, 64, 64, 64, 63, 63, 87, 87, 84, - 84, 85, 17, 17, 37, 37, 37, 37, 37, 37, - 37, 37, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 176, 176, 120, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 121, 121, 88, 88, 89, 89, 177, 122, 90, 90, - 90, 90, 90, 90, 90, 90, 90, 90, 123, 123, - 178, 178, 178, 66, 66, 179, 179, 179, 179, 179, - 179, 180, 182, 181, 124, 124, 125, 125, 183, 183, - 183, 183, 126, 148, 91, 91, 91, 91, 91, 91, - 91, 91, 91, 91, 127, 127, 184, 184, 184, 184, - 184, 184, 184, 128, 128, 92, 92, 92, 129, 129, - 185, 185, 185, 185 }; + 28, 28, 28, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 30, 30, 29, 29, 29, 29, 29, 131, 131, + 131, 131, 131, 131, 64, 64, 64, 63, 63, 87, + 87, 84, 84, 85, 17, 17, 37, 37, 37, 37, + 37, 37, 37, 37, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 176, + 176, 120, 120, 120, 120, 120, 120, 120, 120, 120, + 120, 120, 121, 121, 88, 88, 89, 89, 177, 122, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 123, 123, 178, 178, 178, 66, 66, 179, 179, 179, + 179, 179, 179, 180, 182, 181, 124, 124, 125, 125, + 183, 183, 183, 183, 126, 148, 91, 91, 91, 91, + 91, 91, 91, 91, 91, 91, 127, 127, 184, 184, + 184, 184, 184, 184, 184, 128, 128, 92, 92, 92, + 129, 129, 185, 185, 185, 185 }; YYSTATIC YYCONST yyr_t YYFARDATA YYR2[]={ 0, 0, 2, 4, 4, 3, 1, 1, 1, 1, @@ -1344,398 +1341,398 @@ YYSTATIC YYCONST yyr_t YYFARDATA YYR2[]={ 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 2, 2, 2, 5, 0, 2, 0, 2, 0, 2, 3, 1, 0, 1, 1, 3, 0, 3, 1, - 1, 1, 1, 1, 0, 2, 4, 3, 0, 2, - 3, 0, 1, 5, 3, 4, 4, 4, 1, 1, - 1, 1, 1, 2, 2, 4, 13, 22, 1, 1, - 5, 3, 7, 5, 4, 7, 0, 2, 2, 2, - 2, 2, 2, 2, 5, 2, 2, 2, 2, 2, - 2, 5, 0, 2, 0, 2, 0, 3, 9, 9, - 7, 7, 1, 1, 1, 2, 2, 1, 4, 0, - 1, 1, 2, 2, 2, 2, 1, 4, 2, 5, - 3, 2, 2, 1, 4, 3, 0, 2, 2, 0, - 2, 2, 2, 2, 2, 1, 1, 1, 1, 9, - 0, 2, 2, 0, 2, 2, 2, 2, 1, 1, - 1, 1, 1, 0, 4, 1, 3, 1, 13, 0, + 1, 1, 1, 1, 1, 4, 0, 2, 4, 3, + 0, 2, 3, 0, 1, 5, 3, 4, 4, 4, + 1, 1, 1, 1, 1, 2, 2, 4, 13, 22, + 1, 1, 5, 3, 7, 5, 4, 7, 0, 2, + 2, 2, 2, 2, 2, 2, 5, 2, 2, 2, + 2, 2, 2, 5, 0, 2, 0, 2, 0, 3, + 9, 9, 7, 7, 1, 1, 1, 2, 2, 1, + 4, 0, 1, 1, 2, 2, 2, 2, 1, 4, + 2, 5, 3, 2, 2, 1, 4, 3, 0, 2, + 2, 0, 2, 2, 2, 2, 2, 1, 1, 1, + 1, 9, 0, 2, 2, 0, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 0, 4, 1, 3, 1, + 13, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 5, 8, - 6, 5, 0, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 4, 4, 4, 4, 5, 1, 1, - 1, 0, 4, 4, 4, 4, 0, 2, 2, 2, + 5, 8, 6, 5, 0, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 4, 4, 4, 4, 5, + 1, 1, 1, 0, 4, 4, 4, 4, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 5, 1, 0, 2, 2, 1, 2, 4, 5, - 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, - 4, 6, 4, 4, 11, 1, 5, 3, 7, 5, - 5, 3, 1, 2, 2, 1, 2, 4, 4, 1, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, - 1, 1, 4, 4, 2, 4, 2, 0, 1, 1, - 3, 1, 3, 1, 0, 3, 5, 4, 3, 5, - 5, 5, 5, 5, 5, 2, 2, 2, 2, 2, - 2, 4, 4, 4, 4, 4, 4, 4, 4, 5, - 5, 5, 5, 4, 4, 4, 4, 4, 4, 3, - 2, 0, 1, 1, 2, 1, 1, 1, 1, 4, - 4, 5, 4, 4, 4, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 8, 8, 8, 8, 7, - 7, 7, 7, 7, 0, 2, 2, 0, 2, 2, - 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, - 0, 2, 2, 0, 2, 3, 2, 0, 2, 1, + 2, 2, 2, 5, 1, 0, 2, 2, 1, 2, + 4, 5, 1, 1, 1, 1, 2, 1, 1, 1, + 1, 1, 4, 6, 4, 4, 11, 1, 5, 3, + 7, 5, 5, 3, 1, 2, 2, 1, 2, 4, + 4, 1, 2, 2, 2, 2, 2, 2, 2, 1, + 2, 1, 1, 1, 4, 4, 2, 4, 2, 0, + 1, 1, 3, 1, 3, 1, 0, 3, 5, 4, + 3, 5, 5, 5, 5, 5, 5, 2, 2, 2, + 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, + 4, 5, 5, 5, 5, 4, 4, 4, 4, 4, + 4, 3, 2, 0, 1, 1, 2, 1, 1, 1, + 1, 4, 4, 5, 4, 4, 4, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 0, 2, 2, 0, + 2, 2, 0, 2, 0, 2, 0, 2, 0, 2, + 0, 2, 0, 2, 2, 0, 2, 3, 2, 0, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 2, 2, 2, + 2, 2, 2, 3, 2, 2, 2, 5, 3, 2, + 2, 2, 2, 2, 5, 4, 6, 2, 4, 0, + 3, 3, 1, 1, 0, 3, 0, 1, 1, 3, + 0, 1, 1, 3, 1, 3, 4, 4, 4, 4, + 5, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 3, 4, 1, 0, 10, 6, 5, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 1, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 5, 3, 2, 2, 2, - 2, 2, 5, 4, 6, 2, 4, 0, 3, 3, - 1, 1, 0, 3, 0, 1, 1, 3, 0, 1, - 1, 3, 1, 3, 4, 4, 4, 4, 5, 1, - 1, 1, 1, 1, 1, 1, 3, 1, 3, 4, - 1, 0, 10, 6, 5, 6, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 1, 1, 1, 1, 2, 3, 4, 6, - 5, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 1, 2, 2, 4, 1, 2, 1, 2, 1, 2, - 1, 2, 1, 2, 1, 1, 0, 5, 0, 1, + 2, 2, 2, 2, 1, 1, 1, 1, 2, 3, + 4, 6, 5, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 1, 2, 2, 4, 1, 2, 1, 2, + 1, 2, 1, 2, 1, 2, 1, 1, 0, 5, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, + 1, 3, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 1, 3, 2, 3, 4, 2, 2, 2, 5, 5, + 7, 4, 3, 2, 3, 2, 1, 1, 2, 3, + 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, + 1, 1, 3, 0, 1, 1, 3, 2, 6, 7, + 3, 3, 3, 6, 0, 1, 3, 5, 6, 4, + 4, 1, 3, 3, 1, 1, 1, 1, 4, 1, + 6, 6, 6, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 1, 1, 1, 1, 1, 3, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 1, 3, - 2, 3, 4, 2, 2, 2, 5, 5, 7, 4, - 3, 2, 3, 2, 1, 1, 2, 3, 2, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 3, 0, 1, 1, 3, 2, 6, 7, 3, 3, - 3, 6, 0, 1, 3, 5, 6, 4, 4, 1, - 3, 3, 1, 1, 1, 1, 4, 1, 6, 6, - 6, 4, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 2, 5, 4, 7, 6, 7, 6, 9, 8, 3, - 8, 4, 0, 2, 0, 1, 3, 3, 0, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 0, 2, - 3, 1, 1, 1, 1, 3, 8, 2, 3, 1, - 1, 3, 3, 3, 4, 6, 0, 2, 3, 1, - 3, 1, 4, 3, 0, 2, 2, 2, 3, 3, - 3, 3, 3, 3, 0, 2, 2, 3, 3, 4, - 2, 1, 1, 3, 5, 0, 2, 2, 0, 2, - 4, 3, 1, 1 }; + 1, 3, 2, 5, 4, 7, 6, 7, 6, 9, + 8, 3, 8, 4, 0, 2, 0, 1, 3, 3, + 0, 2, 2, 2, 3, 2, 2, 2, 2, 2, + 0, 2, 3, 1, 1, 1, 1, 3, 8, 2, + 3, 1, 1, 3, 3, 3, 4, 6, 0, 2, + 3, 1, 3, 1, 4, 3, 0, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 0, 2, 2, 3, + 3, 4, 2, 1, 1, 3, 5, 0, 2, 2, + 0, 2, 4, 3, 1, 1 }; YYSTATIC YYCONST short YYFARDATA YYCHK[]={ -1000,-109,-110,-111,-113,-114,-116,-117,-118,-119, --120,-121,-122,-124,-126,-128,-130,-131,-132, 525, - 526, 460, 528, 529,-133,-134,-135, 532, 533,-139, - 409,-152, 411,-170,-137, 455,-176, 463, 408, 470, - 471, 430, -87, 431, -93, -94, 273, 449, 530, 534, - 535, 536, 537, 538, 539, 540, 59,-138, 410, 412, - 454, 447, 448, 450, -10, -11, 123, 123,-115, 123, - 123, 123, 123, -9, 264, -9, 527, -88, -24, 265, - 264, -24, 123,-140, 314, -1, -2, 261, 260, 263, +-120,-121,-122,-124,-126,-128,-130,-131,-132, 527, + 528, 462, 530, 531,-133,-134,-135, 534, 535,-139, + 411,-152, 413,-170,-137, 457,-176, 465, 410, 472, + 473, 432, -87, 433, -93, -94, 273, 451, 532, 536, + 537, 538, 539, 540, 541, 542, 59,-138, 412, 414, + 456, 449, 450, 452, -10, -11, 123, 123,-115, 123, + 123, 123, 123, -9, 264, -9, 529, -88, -24, 265, + 264, -24, 123,-140, 316, -1, -2, 261, 260, 263, -78, -16, 91,-171, 123,-174, 278, 38,-175, 286, 287, 284, 283, 282, 281, 288, -31, -32, 267, 91, - -9, -90, 469, 469, -92, -1, 469, -86, 432, 433, - 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, - 444, 445, 446, -31, -86, 263, -28, -70, -74, -93, - -94, 306, 297, 322, 323,-149, 33, 307, 276, 324, - -52, 275, 91, -5, -76, 268, 413, 414, 415, 358, - 357, 278, 298, 277, 281, 282, 283, 284, 286, 287, + -9, -90, 471, 471, -92, -1, 471, -86, 434, 435, + 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, + 446, 447, 448, -31, -86, 263, -28, -70, -74, -93, + -94, 306, 297, 324, 325,-149, 33, 309, 276, 326, + -52, 275, 91, -5, -76, 268, 415, 416, 417, 360, + 359, 278, 298, 277, 281, 282, 283, 284, 286, 287, 279, 290, 291, 292, 293, 271, -1, 296, -1, -1, - -1, -1, 262, -77,-172, 318, 379, 61, -73, 40, - -75, -7, -76, 269, 272, 325, 340, -8, 295, 300, - 302, 308, -31, -31,-112,-109, 125,-155, 416,-156, - 418,-154, 420, 421,-117,-157, -2,-131,-120,-133, --132,-135, 472, 458, 508,-158, 507,-160, 419, -95, + -1, -1, 262, -77,-172, 320, 381, 61, -73, 40, + -75, -7, -76, 269, 272, 327, 342, -8, 295, 300, + 302, 310, -31, -31,-112,-109, 125,-155, 418,-156, + 420,-154, 422, 423,-117,-157, -2,-131,-120,-133, +-132,-135, 474, 460, 510,-158, 509,-160, 421, -95, -96, -97, -98, -99,-108,-100,-101,-102,-103,-104, --105,-106,-107,-159,-163, 395, 396, 397, 398, 399, - 400, 401, 402, 403, 404, 405, 406, 407, 123, 417, --123,-125,-127,-129, -9, -1, 461,-136, -70, -76, --141, 315, -71, -70, 91, -28,-149, 46, -7, 328, - 329, 330, 331, 332, 326, 346, 353, 337, 365, 366, - 367, 368, 369, 370, 371, 351, 378, 294, 372, -79, +-105,-106,-107,-159,-163, 397, 398, 399, 400, 401, + 402, 403, 404, 405, 406, 407, 408, 409, 123, 419, +-123,-125,-127,-129, -9, -1, 463,-136, -70, -76, +-141, 317, -71, -70, 91, -28,-149, 46, -7, 330, + 331, 332, 333, 334, 328, 348, 355, 339, 367, 368, + 369, 370, 371, 372, 373, 353, 380, 294, 374, -79, -9,-173,-174, 42, 40, -31, 40, -14, 91, 40, -14, 40, -14, 40, -14, 40, -14, 40, -14, 40, - 41, 267, -9, 263, 58, 44, 262, -1, 354, 355, - 356, 473, 379, 475, 476, 477, 478, -90, -91, -1, - 329, 330, -1, -71, 41, -36, 61, 288, 262, 44, - 390, 91, 38, 42, 359, 360, 361, 60, 390, 390, - 390, 390, -70, 306, -70, -75, -7, 33, -9, -1, - 280, 279, 289, -28, -1, -76, 42, 471, 47, -28, - 270, 272, 281, 282, 283, 284, 40, -36, -1, 329, - 330, 322, 345, 334, 335, 337, 338, 339, 340, 341, - 342, 343, 344, 362, 355, 336, 352, 326, 371, 294, + 41, 267, -9, 263, 58, 44, 262, -1, 356, 357, + 358, 475, 381, 477, 478, 479, 480, -90, -91, -1, + 331, 332, -1, -71, 41, -36, 61, 288, 262, 44, + 392, 91, 38, 42, 361, 362, 363, 60, 392, 392, + 392, 392, -70, 306, -70, -75, -7, 33, -9, -1, + 280, 279, 289, -28, -1, -76, 42, 473, 47, -28, + 270, 272, 281, 282, 283, 284, 40, -36, -1, 331, + 332, 324, 347, 336, 337, 339, 340, 341, 342, 343, + 344, 345, 346, 364, 357, 338, 354, 328, 373, 294, -2, 40, 61, -72, -71, -74, -28, -7, -7, 40, 301, 303, 304, 305, 41, 41, 125,-143,-114,-111, --144,-146,-116,-117,-131,-120,-132, 452, 453,-148, - 508,-133,-135, 507, 321, 422, 427, 472, 408, 125, - -9, -9, 40, 451, 58, 91, -9, -71, 357, 364, - 541, 91,-161,-162,-164,-166,-167,-168, 311,-169, - 309, 313, 312, -9, -2, -9, -24, 40, -23, -24, +-144,-146,-116,-117,-131,-120,-132, 454, 455,-148, + 510,-133,-135, 509, 323, 424, 429, 474, 410, 125, + -9, -9, 40, 453, 58, 91, -9, -71, 359, 366, + 543, 91,-161,-162,-164,-166,-167,-168, 313,-169, + 311, 315, 314, -9, -2, -9, -24, 40, -23, -24, 266, 286, 287, -31, -9, -2, -75, -28, -76, 270, - 272, -71, -36, 341,-175, -7, -72, 40,-115,-158, - -2, -9, 125,-178, 462,-131,-179,-180, 467, 468, --181,-132,-135, 464, 125,-183,-177,-179,-182, 338, - 462, 465, 125,-184, 460, 408, 463, 296,-132,-135, - 125,-185, 460, 463,-132,-135, -89, 420, 125,-136, --142, -71, -1, 471, -7, -1, -13, 40, 40, -28, - 328, 329, 330, 331, 377, 371, 326, 479, 365, 366, - 367, 368, 375, 376, 294, 93, 125, 44, 40, -2, + 272, -71, -36, 343,-175, -7, -72, 40,-115,-158, + -2, -9, 125,-178, 464,-131,-179,-180, 469, 470, +-181,-132,-135, 466, 125,-183,-177,-179,-182, 340, + 464, 467, 125,-184, 462, 410, 465, 296,-132,-135, + 125,-185, 462, 465,-132,-135, -89, 422, 125,-136, +-142, -71, -1, 473, -7, -1, -13, 40, 40, -28, + 330, 331, 332, 333, 379, 373, 328, 481, 367, 368, + 369, 370, 377, 378, 294, 93, 125, 44, 40, -2, 41, -23, -9, -23, -24, -9, -9, -9, 93, -9, - -9, 474, -1, -1, 330, 329, 327, 336, 390, 40, + -9, 476, -1, -1, 332, 331, 329, 338, 392, 40, 61, 43, 123, 40, 40, 263, -1, 93, -30, -29, 275, -9, 40, 40, -54, -55, -28, -1, -1, -1, -1, -70, -28, -9, -1, 280, 93, 93, 93, -1, - -1, -71, -1, 91, -9, -69, 60, 329, 330, 331, - 365, 366, 367, 40, 61, -36, 123, 40, 41, -71, - -3, 373, 374, -1, -9,-115, 123, 123, 123, -9, - -9, 123, -71, 357, 364, 541, 364, -81, -82, -91, + -1, -71, -1, 91, -9, -69, 60, 331, 332, 333, + 367, 368, 369, 40, 61, -36, 123, 40, 41, -71, + -3, 375, 376, -1, -9,-115, 123, 123, 123, -9, + -9, 123, -71, 359, 366, 543, 366, -81, -82, -91, -25, -26, -27, 275, -13, 40, -9, 58, 274, -7, - 91, -1, 91, -1, -9,-161,-165,-158, 310,-165, + 91, -1, 91, -1, -9,-161,-165,-158, 312,-165, -165,-165, -71,-158, -2, -9, 40, 40, 41, -71, - -1, 40, -31, -28, -6, -2, -9, 125, 316, 316, - 466, -31, -66, -9, 42, -36, 61, -31, 61, -31, - -31, 61, 61, -1, 469, -9, 469, 40, -1, 469, + -1, 40, -31, -28, -6, -2, -9, 125, 318, 318, + 468, -31, -66, -9, 42, -36, 61, -31, 61, -31, + -31, 61, 61, -1, 471, -9, 471, 40, -1, 471, -177, 44, 93, -1, -28, -28, 91, -9, -36, -83, -1, 40, 40,-173, -36, 41, 41, 93, 41, 41, - 41, 41, 41, -12, 263, 44, 58, 390, 329, 330, - 331, 365, 366, 367, -1, -84, -85, -36, 123, 262, + 41, 41, 41, -12, 263, 44, 58, 392, 331, 332, + 333, 367, 368, 369, -1, -84, -85, -36, 123, 262, -64, -63, -71, 306, 44, 93, 44, 275, -71, -71, 62, 44, 42, -5, -5, -5, 93, 274, 41, -68, - -19, -18, 43, 45, 306, 323, 373, -9, -59, -61, - -73, 274, -53, -22, 60, 41, 125,-112,-145,-147, --127, 274, -7, 91, -1, 91, -1, -71, -71, -1, - 371, 326, -7, 371, 326, -1, 41, 44, -28, -25, - 93, -9, -3, -1, -28, -9, -9, 44, 93, -2, - -9, -9, -24, 274, -36, 41, 40, 41, 44, 44, - -2, -9, -9, 41, 58, 40, 41, 40, 41, 41, - 40, 40, -5, -1, -9, 317, -1, -31, -71, 93, - -38, 479, 504, 505, 506, -9, 41, 390, -83, 41, - 387, 341, 342, 343, 388, 389, 301, 303, 304, 305, - 391, 394, 294, -4, 317, -34, -33,-153, 480, 482, - 483, 484, 485, 276, 277, 281, 282, 283, 284, 286, - 287, 257, 279, 290, 291, 292, 293, 486, 487, 488, - 490, 491, 492, 493, 494, 495, 496, 334, 497, 280, - 289, 336, 498, 341, 489, 357, 390, 502, 271, 123, - -9, 41, -14, -14, -14, -14, -14, -14, 317, 283, - 284, 456, 457, 459, -9, -9, -1, 41, 44, 61, - -59, 125, 44, 61, 263, 263, -29, -9, 41, 41, - -28, 40, -5, -1, 62, -58, -1, 40, -19, 41, - 125, -62, -40,-135, -41, 298, 364, 297, 286, 287, - 284, 283, 282, 281, 293, 292, 291, 290, 279, 278, - 277,-175, 61, -3, 40, 40, 91, -54, 125, 125, --150, 423, 424, 425, 426,-120,-132,-133,-135, 125, --151, 428, 429, 426,-132,-120,-133,-135, 125, -3, - -28, -9, -9, 44, -93, 450, -1, -28, -27, -38, - 41, 390, -71, 93, 93, -71, -35, 61, 316, 316, - 41, 41, -1, 41, -25, -6, -6, -66, 41, -9, - 41, -3, 40, 93, 93, 93, 93, -36, 41, 58, - 58, 40, -35, -2, 41, 42, 91, -32, 40, 481, - 501, 277, 281, 282, 283, 284, 280, -20, 40, -20, - -20, -15, 510, 483, 484, 276, 277, 281, 282, 283, - 284, 286, 287, 279, 290, 291, 292, 293, 42, 486, - 487, 488, 490, 491, 494, 495, 497, 280, 289, 257, - 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, - 521, 522, 523, 496, 488, 500, 41, -2, 263, 263, - 44, -84, -37, -17, -9, 283, -36, -70, 319, 320, - 125, -64, 123, 61, -25, -1, -67, 44, -56, -57, - -71, -65,-135, 358, 363, 40, 91, 40, 91, 40, + -19, -18, 43, 45, 306, 325, 307, 375, 294, -9, + -59, -61, -73, 274, -53, -22, 60, 41, 125,-112, +-145,-147,-127, 274, -7, 91, -1, 91, -1, -71, + -71, -1, 373, 328, -7, 373, 328, -1, 41, 44, + -28, -25, 93, -9, -3, -1, -28, -9, -9, 44, + 93, -2, -9, -9, -24, 274, -36, 41, 40, 41, + 44, 44, -2, -9, -9, 41, 58, 40, 41, 40, + 41, 41, 40, 40, -5, -1, -9, 319, -1, -31, + -71, 93, -38, 481, 506, 507, 508, -9, 41, 392, + -83, 41, 389, 343, 344, 345, 390, 391, 301, 303, + 304, 305, 393, 396, 294, -4, 319, -34, -33,-153, + 482, 484, 485, 486, 487, 276, 277, 281, 282, 283, + 284, 286, 287, 257, 279, 290, 291, 292, 293, 488, + 489, 490, 492, 493, 494, 495, 496, 497, 498, 336, + 499, 280, 289, 338, 500, 343, 491, 359, 392, 504, + 271, 123, -9, 41, -14, -14, -14, -14, -14, -14, + 319, 283, 284, 458, 459, 461, -9, -9, -1, 41, + 44, 61, -59, 125, 44, 61, 263, 263, -29, -9, + 41, 41, -28, 40, -5, -1, 62, -58, -1, 40, + -19, 40, 41, 125, -62, -40,-135, -41, 298, 366, + 297, 286, 287, 284, 283, 282, 281, 293, 292, 291, + 290, 279, 278, 277,-175, 61, -3, 40, 40, 91, + -54, 125, 125,-150, 425, 426, 427, 428,-120,-132, +-133,-135, 125,-151, 430, 431, 428,-132,-120,-133, +-135, 125, -3, -28, -9, -9, 44, -93, 452, -1, + -28, -27, -38, 41, 392, -71, 93, 93, -71, -35, + 61, 318, 318, 41, 41, -1, 41, -25, -6, -6, + -66, 41, -9, 41, -3, 40, 93, 93, 93, 93, + -36, 41, 58, 58, 40, -35, -2, 41, 42, 91, + -32, 40, 483, 503, 277, 281, 282, 283, 284, 280, + -20, 40, -20, -20, -15, 512, 485, 486, 276, 277, + 281, 282, 283, 284, 286, 287, 279, 290, 291, 292, + 293, 42, 488, 489, 490, 492, 493, 496, 497, 499, + 280, 289, 257, 513, 514, 515, 516, 517, 518, 519, + 520, 521, 522, 523, 524, 525, 498, 490, 502, 41, + -2, 263, 263, 44, -84, -37, -17, -9, 283, -36, + -70, 321, 322, 125, -64, 123, 61, -25, -1, -67, + 44, -56, -57, -71, -9, -65,-135, 360, 365, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, 91, 40, - 91, 284, 283, 282, 281, 40, 91, 40, 91, -31, - -36, 123, 40, -53, -22, -25, -25, -9, 62, -75, - -75, -75, -75, -75, -75, -75, 509, -71, 93, 93, - -71, -1, -2, -2, 274, 44, -39, -41, -36, 299, - 286, 287, 284, 283, 282, 281, 279, 293, 292, 291, - 290, 278, 277, -2, -9, 41, 58, -89, -69, -34, - -83, 392, 393, 392, 393, -9, 93, -9, 43, 125, - -36, 91, 91, 503, 44, 91, 524, 38, 281, 282, - 283, 284, 280, -9, 40, 40, -62, 123, 41, -67, - -68, 41, 44, -60, -52, 364, 297, 345, 299, 263, - -9, 306, -70, 299, -9, -40, -9, -23, -9, -9, - -23, -24, -9, -24, -9, -9, -9, -9, -9, -9, - -9, -24, -9, -9, -9, -9, -9, -9, -9, 40, - 91, 40, 91, 40, 91, 40, 91, -9, -9, -17, - -9, 41, -59, 40, 40, 41, 41, 93, -7, 274, - 44, 40, -3, -71, 284, 283, 282, 281, -66, 40, - 41, 41, 41, 93, 43, -9, 44, -9, -9, 61, - -36, 93, 263, -9, 281, 282, 283, -9, 125, -62, - -71, -1, 91, 306, -70, 41, 41, 93, 263, 41, - 41, 93, 41, 93, 41, 41, 93, 41, 41, 93, - 41, 93, 41, 93, 41, 93, 41, 93, 41, 93, - 41, 93, 41, 93, 41, 93, -24, -9, -9, -9, - -9, -9, -9, -9, 41, 93, 41, 93, 125, -25, - -25, 62, -28, -3, -71, -25, -21, -22, 60, 58, - -25, -9, 93, -36, 93, 93, -9, 41, 58, 58, - 58, 41, 125, 61, 93, 263, 40, 41, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 41, 93, 41, 93, 41, 93, 41, 93, 40, 40, - 41, 41, -71, -21, 41, 40, -66, 41, 93, 44, - 41, -33, 41, -9, -9, -9, -40, -49, -50, -51, - -42, -43, -47, -46, -45, -44, -47, -46, -45, -44, - 40, 40, 40, 40, -45, -48, 274, 40, -35, -25, - -80, -36, 41, 41, 41, 41, 299, 263, 41, 299, - 306, -70, 41, -40, 41, -23, -9, 41, -23, -24, - 41, -24, 41, -9, 41, -9, 41, -9, 41, 41, - 41, 41, -47, -46, -45, -44, 41, 41, -17, -3, - -25, 41, 123, 324, 379, 380, 381, 308, 382, 383, - 384, 385, 333, 347, 348, 349, 350, 294, 44, 263, - 41, 41, 41, 41, 40, 41, 40, -36, -25, 509, - -9, 41, 41, 357, 41, -7, -28, -71, 274, -3, - -21, 40, -25, 41 }; + 91, 40, 91, 40, 91, 284, 283, 282, 281, 40, + 91, 40, 91, -31, -36, 123, 40, -53, -22, -25, + -25, -9, 62, -75, -75, -75, -75, -75, -75, -75, + 511, -71, 93, 93, -71, -1, -2, -2, 274, 44, + -39, -41, -36, 299, 286, 287, 284, 283, 282, 281, + 279, 293, 292, 291, 290, 278, 277, -2, -9, 41, + 58, -89, -69, -34, -83, 394, 395, 394, 395, -9, + 93, -9, 43, 125, -36, 91, 91, 505, 44, 91, + 526, 38, 281, 282, 283, 284, 280, -9, 40, 40, + -62, 123, 41, -67, -68, 41, 44, 41, -60, -52, + 366, 297, 347, 299, 263, -9, 306, -70, 299, -9, + -40, -9, -23, -9, -9, -23, -24, -9, -24, -9, + -9, -9, -9, -9, -9, -9, -24, -9, -9, -9, + -9, -9, -9, -9, 40, 91, 40, 91, 40, 91, + 40, 91, -9, -9, -17, -9, 41, -59, 40, 40, + 41, 41, 93, -7, 274, 44, 40, -3, -71, 284, + 283, 282, 281, -66, 40, 41, 41, 41, 93, 43, + -9, 44, -9, -9, 61, -36, 93, 263, -9, 281, + 282, 283, -9, 125, -62, -71, -1, 91, 306, -70, + 41, 41, 93, 263, 41, 41, 93, 41, 93, 41, + 41, 93, 41, 41, 93, 41, 93, 41, 93, 41, + 93, 41, 93, 41, 93, 41, 93, 41, 93, 41, + 93, -24, -9, -9, -9, -9, -9, -9, -9, 41, + 93, 41, 93, 125, -25, -25, 62, -28, -3, -71, + -25, -21, -22, 60, 58, -25, -9, 93, -36, 93, + 93, -9, 41, 58, 58, 58, 41, 125, 61, 93, + 263, 40, 41, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 41, 93, 41, 93, 41, + 93, 41, 93, 40, 40, 41, 41, -71, -21, 41, + 40, -66, 41, 93, 44, 41, -33, 41, -9, -9, + -9, -40, -49, -50, -51, -42, -43, -47, -46, -45, + -44, -47, -46, -45, -44, 40, 40, 40, 40, -45, + -48, 274, 40, -35, -25, -80, -36, 41, 41, 41, + 41, 299, 263, 41, 299, 306, -70, 41, -40, 41, + -23, -9, 41, -23, -24, 41, -24, 41, -9, 41, + -9, 41, -9, 41, 41, 41, 41, -47, -46, -45, + -44, 41, 41, -17, -3, -25, 41, 123, 326, 381, + 382, 383, 310, 384, 385, 386, 387, 335, 349, 350, + 351, 352, 294, 44, 263, 41, 41, 41, 41, 40, + 41, 40, -36, -25, 511, -9, 41, 41, 359, 41, + -7, -28, -71, 274, -3, -21, 40, -25, 41 }; YYSTATIC YYCONST short YYFARDATA YYDEF[]={ - 1, -2, 2, 0, 0, 333, 6, 7, 8, 9, + 1, -2, 2, 0, 0, 335, 6, 7, 8, 9, 10, 11, 0, 0, 0, 0, 16, 17, 18, 0, - 0, 772, 0, 0, 24, 25, 26, 0, 28, 135, - 0, 269, 206, 0, 431, 0, 0, 778, 105, 835, - 92, 0, 431, 0, 83, 84, 85, 0, 0, 0, - 0, 0, 0, 57, 58, 0, 60, 108, 262, 387, - 0, 757, 758, 219, 431, 431, 139, 1, 0, 788, - 806, 824, 838, 19, 41, 20, 0, 0, 22, 42, + 0, 774, 0, 0, 24, 25, 26, 0, 28, 135, + 0, 271, 208, 0, 433, 0, 0, 780, 105, 837, + 92, 0, 433, 0, 83, 84, 85, 0, 0, 0, + 0, 0, 0, 57, 58, 0, 60, 108, 264, 389, + 0, 759, 760, 221, 433, 433, 139, 1, 0, 790, + 808, 826, 840, 19, 41, 20, 0, 0, 22, 42, 43, 23, 29, 137, 0, 104, 38, 39, 36, 37, - 219, 186, 0, 384, 0, 391, 0, 0, 431, 394, - 394, 394, 394, 394, 394, 0, 0, 432, 433, 0, - 760, 0, 778, 814, 0, 93, 0, 0, 742, 743, - 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, - 754, 755, 756, 0, 0, 33, 0, 0, 0, 0, - 0, 0, 668, 0, 0, 219, 0, 684, 685, 0, - 689, 0, 0, 549, 233, 551, 552, 553, 554, 0, - 489, 691, 692, 693, 694, 695, 696, 697, 698, 699, - 0, 704, 705, 706, 707, 708, 555, 0, 52, 54, - 55, 56, 59, 0, 386, 388, 389, 0, 61, 0, - 71, 0, 212, 213, 214, 219, 219, 217, 0, 220, - 221, 226, 0, 0, 0, 0, 5, 334, 0, 336, - 0, 0, 340, 341, 342, 343, 0, 345, 346, 347, - 348, 349, 0, 0, 0, 355, 0, 0, 332, 504, - 0, 0, 0, 0, 431, 0, 219, 0, 0, 0, - 219, 0, 0, 333, 0, 490, 491, 492, 493, 494, - 495, 496, 497, 498, 499, 500, 501, 502, 362, 369, - 0, 0, 0, 0, 21, 774, 773, 0, 29, 550, - 107, 0, 136, 557, 0, 560, 219, 0, 311, 270, - 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, - 281, 282, 283, 284, 285, 286, 287, 0, 0, 0, - 0, 0, 393, 0, 0, 0, 0, 405, 0, 0, - 406, 0, 407, 0, 408, 0, 409, 0, 410, 430, - 102, 434, 0, 759, 0, 0, 769, 777, 779, 780, - 781, 0, 783, 784, 785, 786, 787, 0, 0, 833, - 836, 837, 94, 718, 719, 720, 0, 0, 31, 0, - 0, 711, 673, 674, 675, 0, 0, 534, 0, 0, - 0, 0, 667, 0, 670, 228, 0, 0, 681, 683, - 686, 0, 688, 690, 0, 0, 0, 0, 0, 0, - 231, 232, 700, 701, 702, 703, 0, 53, 147, 109, + 221, 188, 0, 386, 0, 393, 0, 0, 433, 396, + 396, 396, 396, 396, 396, 0, 0, 434, 435, 0, + 762, 0, 780, 816, 0, 93, 0, 0, 744, 745, + 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, + 756, 757, 758, 0, 0, 33, 0, 0, 0, 0, + 0, 0, 670, 0, 0, 221, 0, 686, 687, 0, + 691, 0, 0, 551, 235, 553, 554, 555, 556, 0, + 491, 693, 694, 695, 696, 697, 698, 699, 700, 701, + 0, 706, 707, 708, 709, 710, 557, 0, 52, 54, + 55, 56, 59, 0, 388, 390, 391, 0, 61, 0, + 71, 0, 214, 215, 216, 221, 221, 219, 0, 222, + 223, 228, 0, 0, 0, 0, 5, 336, 0, 338, + 0, 0, 342, 343, 344, 345, 0, 347, 348, 349, + 350, 351, 0, 0, 0, 357, 0, 0, 334, 506, + 0, 0, 0, 0, 433, 0, 221, 0, 0, 0, + 221, 0, 0, 335, 0, 492, 493, 494, 495, 496, + 497, 498, 499, 500, 501, 502, 503, 504, 364, 371, + 0, 0, 0, 0, 21, 776, 775, 0, 29, 552, + 107, 0, 136, 559, 0, 562, 221, 0, 313, 272, + 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, + 283, 284, 285, 286, 287, 288, 289, 0, 0, 0, + 0, 0, 395, 0, 0, 0, 0, 407, 0, 0, + 408, 0, 409, 0, 410, 0, 411, 0, 412, 432, + 102, 436, 0, 761, 0, 0, 771, 779, 781, 782, + 783, 0, 785, 786, 787, 788, 789, 0, 0, 835, + 838, 839, 94, 720, 721, 722, 0, 0, 31, 0, + 0, 713, 675, 676, 677, 0, 0, 536, 0, 0, + 0, 0, 669, 0, 672, 230, 0, 0, 683, 685, + 688, 0, 690, 692, 0, 0, 0, 0, 0, 0, + 233, 234, 702, 703, 704, 705, 0, 53, 147, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 0, 131, 132, 133, 0, - 0, 103, 0, 0, 72, 73, 0, 215, 216, 0, - 222, 223, 224, 225, 64, 68, 3, 140, 333, 0, - 0, 0, 168, 169, 170, 171, 172, 0, 0, 0, - 0, 178, 179, 0, 0, 236, 250, 814, 105, 4, - 335, 337, -2, 0, 344, 0, 0, 0, 219, 0, - 0, 0, 363, 365, 0, 0, 0, 0, 0, 0, - 379, 380, 377, 505, 506, 507, 508, 503, 509, 510, - 44, 0, 0, 0, 512, 513, 514, 0, 517, 518, - 519, 520, 521, 0, 431, 0, 525, 527, 0, 366, - 0, 0, 12, 789, 0, 791, 792, 431, 0, 0, - 431, 799, 800, 0, 13, 807, 431, 809, 431, 811, - 0, 0, 14, 825, 0, 0, 0, 0, 831, 832, - 15, 839, 0, 0, 842, 843, 771, 775, 27, 30, - 138, 142, 0, 0, 0, 40, 0, 0, 292, 0, - 187, 188, 189, 190, 191, 192, 193, 0, 195, 196, - 197, 198, 199, 200, 0, 207, 390, 0, 0, 0, - 398, 0, 0, 0, 0, 0, 0, 0, 96, 762, - 0, 782, 804, 812, 815, 816, 817, 0, 0, 0, - 0, 0, 722, 727, 728, 34, 47, 671, 0, 709, - 712, 713, 0, 0, 0, 535, 536, 48, 49, 50, - 51, 669, 0, 680, 682, 687, 0, 0, 0, 0, - 556, 0, -2, 711, 0, 106, 154, 125, 126, 127, - 128, 129, 130, 0, 385, 62, 75, 69, 219, 0, - 532, 308, 309, -2, 0, 0, 139, 239, 253, 173, - 174, 824, 0, 219, 0, 0, 0, 0, 219, 0, - 0, 539, 540, 542, 0, -2, 0, 0, 0, 0, - 0, 357, 0, 0, 0, 364, 370, 381, 0, 371, - 372, 373, 378, 374, 375, 376, 0, 0, 511, 0, - -2, 0, 0, 0, 0, 530, 531, 361, 0, 0, - 0, 0, 0, 793, 794, 797, 0, 0, 0, 0, - 0, 0, 0, 826, 0, 830, 0, 0, 0, 0, - 431, 0, 558, 0, 0, 263, 0, 0, 292, 0, - 202, 561, 0, 392, 0, 397, 394, 395, 394, 394, - 394, 394, 394, 0, 761, 0, 0, 0, 818, 819, - 820, 821, 822, 823, 834, 0, 729, 0, 75, 32, - 0, 723, 0, 0, 0, 672, 711, 715, 0, 0, - 679, 0, 674, 545, 546, 547, 0, 0, 227, 0, - 0, 154, 149, 150, 151, 152, 153, 0, 0, 78, - 65, 0, 0, 0, 534, 218, 164, 0, 0, 0, - 0, 0, 0, 0, 181, 0, 0, 0, 0, -2, - 237, 238, 0, 251, 252, 813, 338, 311, 263, 0, - 350, 352, 353, 310, 0, 0, 0, 0, 204, 0, - 0, 0, 0, 0, 0, 523, -2, 526, 527, 527, - 367, 368, 790, 795, 0, 803, 798, 801, 808, 810, - 776, 802, 827, 828, 0, 0, 841, 0, 141, 559, - 0, 0, 0, 0, 0, 0, 288, 0, 0, 291, - 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, - 0, 0, 0, 204, 0, 0, 265, 0, 0, 0, - 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, - 576, 577, 0, 582, 583, 584, 585, 591, 592, 593, - 594, 595, 596, 597, 616, 616, 600, 616, 618, 604, - 606, 0, 608, 0, 610, 612, 0, 614, 615, 267, - 0, 396, 399, 400, 401, 402, 403, 404, 0, 97, - 98, 99, 100, 101, 764, 766, 805, 716, 0, 0, - 0, 721, 722, 0, 37, 35, 710, 714, 676, 677, - 537, -2, 548, 229, 148, 0, 158, 143, 155, 134, - 63, 74, 76, 77, 438, 0, 0, 0, 0, 0, + 0, 103, 0, 0, 72, 73, 0, 217, 218, 0, + 224, 225, 226, 227, 64, 68, 3, 140, 335, 0, + 0, 0, 170, 171, 172, 173, 174, 0, 0, 0, + 0, 180, 181, 0, 0, 238, 252, 816, 105, 4, + 337, 339, -2, 0, 346, 0, 0, 0, 221, 0, + 0, 0, 365, 367, 0, 0, 0, 0, 0, 0, + 381, 382, 379, 507, 508, 509, 510, 505, 511, 512, + 44, 0, 0, 0, 514, 515, 516, 0, 519, 520, + 521, 522, 523, 0, 433, 0, 527, 529, 0, 368, + 0, 0, 12, 791, 0, 793, 794, 433, 0, 0, + 433, 801, 802, 0, 13, 809, 433, 811, 433, 813, + 0, 0, 14, 827, 0, 0, 0, 0, 833, 834, + 15, 841, 0, 0, 844, 845, 773, 777, 27, 30, + 138, 142, 0, 0, 0, 40, 0, 0, 294, 0, + 189, 190, 191, 192, 193, 194, 195, 0, 197, 198, + 199, 200, 201, 202, 0, 209, 392, 0, 0, 0, + 400, 0, 0, 0, 0, 0, 0, 0, 96, 764, + 0, 784, 806, 814, 817, 818, 819, 0, 0, 0, + 0, 0, 724, 729, 730, 34, 47, 673, 0, 711, + 714, 715, 0, 0, 0, 537, 538, 48, 49, 50, + 51, 671, 0, 682, 684, 689, 0, 0, 0, 0, + 558, 0, -2, 713, 0, 106, 156, 125, 126, 127, + 128, 129, 130, 0, 387, 62, 75, 69, 221, 0, + 534, 310, 311, -2, 0, 0, 139, 241, 255, 175, + 176, 826, 0, 221, 0, 0, 0, 0, 221, 0, + 0, 541, 542, 544, 0, -2, 0, 0, 0, 0, + 0, 359, 0, 0, 0, 366, 372, 383, 0, 373, + 374, 375, 380, 376, 377, 378, 0, 0, 513, 0, + -2, 0, 0, 0, 0, 532, 533, 363, 0, 0, + 0, 0, 0, 795, 796, 799, 0, 0, 0, 0, + 0, 0, 0, 828, 0, 832, 0, 0, 0, 0, + 433, 0, 560, 0, 0, 265, 0, 0, 294, 0, + 204, 563, 0, 394, 0, 399, 396, 397, 396, 396, + 396, 396, 396, 0, 763, 0, 0, 0, 820, 821, + 822, 823, 824, 825, 836, 0, 731, 0, 75, 32, + 0, 725, 0, 0, 0, 674, 713, 717, 0, 0, + 681, 0, 676, 547, 548, 549, 0, 0, 229, 0, + 0, 156, 149, 150, 151, 152, 153, 154, 0, 0, + 0, 78, 65, 0, 0, 0, 536, 220, 166, 0, + 0, 0, 0, 0, 0, 0, 183, 0, 0, 0, + 0, -2, 239, 240, 0, 253, 254, 815, 340, 313, + 265, 0, 352, 354, 355, 312, 0, 0, 0, 0, + 206, 0, 0, 0, 0, 0, 0, 525, -2, 528, + 529, 529, 369, 370, 792, 797, 0, 805, 800, 803, + 810, 812, 778, 804, 829, 830, 0, 0, 843, 0, + 141, 561, 0, 0, 0, 0, 0, 0, 290, 0, + 0, 293, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 0, 0, 0, 206, 0, 0, 267, 0, + 0, 0, 568, 569, 570, 571, 572, 573, 574, 575, + 576, 577, 578, 579, 0, 584, 585, 586, 587, 593, + 594, 595, 596, 597, 598, 599, 618, 618, 602, 618, + 620, 606, 608, 0, 610, 0, 612, 614, 0, 616, + 617, 269, 0, 398, 401, 402, 403, 404, 405, 406, + 0, 97, 98, 99, 100, 101, 766, 768, 807, 718, + 0, 0, 0, 723, 724, 0, 37, 35, 712, 716, + 678, 679, 539, -2, 550, 231, 148, 0, 160, 143, + 157, 0, 134, 63, 74, 76, 77, 440, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 431, 0, 532, -2, -2, 0, 0, 165, 166, - 240, 219, 219, 219, 219, 245, 246, 247, 248, 167, - 254, 219, 219, 219, 258, 259, 260, 261, 175, 0, - 0, 0, 0, 0, 184, 219, 234, 0, 541, 543, - 339, 0, 0, 356, 0, 359, 360, 0, 0, 0, - 45, 46, 515, 522, 0, 528, 529, 0, 829, 840, - 774, 147, 561, 312, 313, 314, 315, 292, 290, 0, - 0, 0, 185, 203, 194, 586, 0, 0, 0, 0, - 0, 611, 578, 579, 580, 581, 605, 598, 0, 599, - 601, 602, 619, 620, 621, 622, 623, 624, 625, 626, - 627, 628, 629, 0, 634, 635, 636, 637, 638, 642, - 643, 644, 645, 646, 647, 648, 649, 650, 652, 653, - 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, - 664, 665, 666, 607, 609, 613, 201, 95, 763, 765, - 0, 730, 731, 734, 735, 0, 737, 0, 732, 733, - 717, 724, 78, 0, 0, 158, 157, 154, 0, 144, - 145, 0, 80, 81, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 433, 0, 534, -2, -2, 0, + 0, 167, 168, 242, 221, 221, 221, 221, 247, 248, + 249, 250, 169, 256, 221, 221, 221, 260, 261, 262, + 263, 177, 0, 0, 0, 0, 0, 186, 221, 236, + 0, 543, 545, 341, 0, 0, 358, 0, 361, 362, + 0, 0, 0, 45, 46, 517, 524, 0, 530, 531, + 0, 831, 842, 776, 147, 563, 314, 315, 316, 317, + 294, 292, 0, 0, 0, 187, 205, 196, 588, 0, + 0, 0, 0, 0, 613, 580, 581, 582, 583, 607, + 600, 0, 601, 603, 604, 621, 622, 623, 624, 625, + 626, 627, 628, 629, 630, 631, 0, 636, 637, 638, + 639, 640, 644, 645, 646, 647, 648, 649, 650, 651, + 652, 654, 655, 656, 657, 658, 659, 660, 661, 662, + 663, 664, 665, 666, 667, 668, 609, 611, 615, 203, + 95, 765, 767, 0, 732, 733, 736, 737, 0, 739, + 0, 734, 735, 719, 726, 78, 0, 0, 160, 159, + 156, 0, 144, 145, 0, 0, 80, 81, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 66, 75, 70, 0, 0, 0, 0, 0, 533, 241, - 242, 243, 244, 255, 256, 257, 219, 0, 180, 0, - 183, 0, 544, 351, 0, 0, 205, 435, 436, 437, + 0, 0, 0, 0, 66, 75, 70, 0, 0, 0, + 0, 0, 535, 243, 244, 245, 246, 257, 258, 259, + 221, 0, 182, 0, 185, 0, 546, 353, 0, 0, + 207, 437, 438, 439, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 384, 385, 526, + 0, 772, 0, 0, 0, 305, 306, 307, 308, 0, + 589, 0, 0, 268, 0, 0, 0, 0, 0, 0, + 642, 643, 632, 633, 634, 635, 653, 770, 0, 0, + 0, 78, 680, 158, 161, 162, 0, 155, 0, 86, + 87, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 382, 383, 524, 0, 770, 0, 0, - 0, 303, 304, 305, 306, 0, 587, 0, 0, 266, - 0, 0, 0, 0, 0, 0, 640, 641, 630, 631, - 632, 633, 651, 768, 0, 0, 0, 78, 678, 156, - 159, 160, 0, 0, 86, 87, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 429, 0, -2, -2, 210, 211, 0, 0, 0, - 0, -2, 161, 358, 0, 0, 0, 0, 0, -2, - 264, 289, 307, 588, 0, 0, 0, 0, 0, 0, - 603, 639, 767, 0, 0, 0, 0, 0, 725, 0, - 146, 0, 0, 0, 90, 439, 440, 0, 0, 442, - 443, 0, 444, 0, 411, 413, 0, 412, 414, 0, - 415, 0, 416, 0, 417, 0, 418, 0, 423, 0, - 424, 0, 425, 0, 426, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 427, 0, 428, 0, 67, 0, - 0, 163, 0, 161, 182, 0, 0, 162, 0, 0, - 0, 0, 590, 0, 564, 561, 0, 736, 0, 0, - 0, 741, 726, 0, 91, 89, 480, 441, 483, 487, - 464, 467, 470, 472, 474, 476, 470, 472, 474, 476, - 419, 0, 420, 0, 421, 0, 422, 0, 474, 478, - 208, 209, 0, 0, 204, -2, 796, 316, 589, 0, - 563, 565, 617, 0, 0, 0, 79, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 470, 472, 474, 476, 0, 0, 0, -2, 249, 0, - 0, 0, 738, 739, 740, 461, 481, 482, 462, 484, - 0, 486, 463, 488, 445, 465, 466, 446, 468, 469, - 447, 471, 448, 473, 449, 475, 450, 477, 451, 452, - 453, 454, 0, 0, 0, 0, 459, 460, 479, 0, - 0, 354, 268, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 0, 0, 485, - 455, 456, 457, 458, -2, 0, 0, 0, 0, 0, - 0, 562, 176, 219, 331, 0, 0, 0, 0, 161, - 0, -2, 0, 177 }; + 0, 0, 0, 0, 0, 0, 431, 0, -2, -2, + 212, 213, 0, 0, 0, 0, -2, 163, 360, 0, + 0, 0, 0, 0, -2, 266, 291, 309, 590, 0, + 0, 0, 0, 0, 0, 605, 641, 769, 0, 0, + 0, 0, 0, 727, 0, 146, 0, 0, 0, 90, + 441, 442, 0, 0, 444, 445, 0, 446, 0, 413, + 415, 0, 414, 416, 0, 417, 0, 418, 0, 419, + 0, 420, 0, 425, 0, 426, 0, 427, 0, 428, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 429, + 0, 430, 0, 67, 0, 0, 165, 0, 163, 184, + 0, 0, 164, 0, 0, 0, 0, 592, 0, 566, + 563, 0, 738, 0, 0, 0, 743, 728, 0, 91, + 89, 482, 443, 485, 489, 466, 469, 472, 474, 476, + 478, 472, 474, 476, 478, 421, 0, 422, 0, 423, + 0, 424, 0, 476, 480, 210, 211, 0, 0, 206, + -2, 798, 318, 591, 0, 565, 567, 619, 0, 0, + 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 472, 474, 476, 478, 0, + 0, 0, -2, 251, 0, 0, 0, 740, 741, 742, + 463, 483, 484, 464, 486, 0, 488, 465, 490, 447, + 467, 468, 448, 470, 471, 449, 473, 450, 475, 451, + 477, 452, 479, 453, 454, 455, 456, 0, 0, 0, + 0, 461, 462, 481, 0, 0, 356, 270, 319, 320, + 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 0, 0, 487, 457, 458, 459, 460, -2, + 0, 0, 0, 0, 0, 0, 564, 178, 221, 333, + 0, 0, 0, 0, 163, 0, -2, 0, 179 }; #ifdef YYRECOVER YYSTATIC YYCONST short yyrecover[] = { -1000 @@ -1998,9 +1995,9 @@ YYLOCAL YYNEAR YYPASCAL YYPARSER() ** we were supposed to get is the one when j > 0. for example, ** for(+) {;} error recovery with yyerrflag always set, stops ** after inserting one ; before the +. at the point of the +, - ** we're pretty sure the caller wants a 'for' loop. without + ** we're pretty sure the guy wants a 'for' loop. without ** setting the flag, when we're almost absolutely sure, we'll - ** give them one, since the only thing we can shift on this + ** give him one, since the only thing we can shift on this ** error is after finding an expression followed by a + */ yyerrflag++; @@ -2020,7 +2017,6 @@ YYLOCAL YYNEAR YYPASCAL YYPARSER() yyerrlab: ++yynerrs; FALLTHROUGH; - case 1: case 2: /* incompletely recovered error ... try again */ @@ -2082,31 +2078,31 @@ YYLOCAL YYNEAR YYPASCAL YYPARSER() switch(yym){ case 3: -#line 194 "asmparse.y" +#line 193 "asmparse.y" { PASM->EndClass(); } break; case 4: -#line 195 "asmparse.y" +#line 194 "asmparse.y" { PASM->EndNameSpace(); } break; case 5: -#line 196 "asmparse.y" +#line 195 "asmparse.y" { if(PASM->m_pCurMethod->m_ulLines[1] ==0) { PASM->m_pCurMethod->m_ulLines[1] = PASM->m_ulCurLine; PASM->m_pCurMethod->m_ulColumns[1]=PASM->m_ulCurColumn;} PASM->EndMethod(); } break; case 12: -#line 206 "asmparse.y" +#line 205 "asmparse.y" { PASMM->EndAssembly(); } break; case 13: -#line 207 "asmparse.y" +#line 206 "asmparse.y" { PASMM->EndAssembly(); } break; case 14: -#line 208 "asmparse.y" +#line 207 "asmparse.y" { PASMM->EndComType(); } break; case 15: -#line 209 "asmparse.y" +#line 208 "asmparse.y" { PASMM->EndManifestRes(); } break; case 19: -#line 213 "asmparse.y" +#line 212 "asmparse.y" { #ifdef _PREFAST_ #pragma warning(push) @@ -2118,211 +2114,211 @@ case 19: #endif } break; case 20: -#line 223 "asmparse.y" +#line 222 "asmparse.y" { PASM->m_dwComImageFlags = yypvt[-0].int32; } break; case 21: -#line 224 "asmparse.y" +#line 223 "asmparse.y" { PASM->m_dwFileAlignment = yypvt[-0].int32; if((yypvt[-0].int32 & (yypvt[-0].int32 - 1))||(yypvt[-0].int32 < 0x200)||(yypvt[-0].int32 > 0x10000)) PASM->report->error("Invalid file alignment, must be power of 2 from 0x200 to 0x10000\n");} break; case 22: -#line 227 "asmparse.y" +#line 226 "asmparse.y" { PASM->m_stBaseAddress = (ULONGLONG)(*(yypvt[-0].int64)); delete yypvt[-0].int64; if(PASM->m_stBaseAddress & 0xFFFF) PASM->report->error("Invalid image base, must be 0x10000-aligned\n");} break; case 23: -#line 230 "asmparse.y" +#line 229 "asmparse.y" { PASM->m_stSizeOfStackReserve = (size_t)(*(yypvt[-0].int64)); delete yypvt[-0].int64; } break; case 28: -#line 235 "asmparse.y" +#line 234 "asmparse.y" { PASM->m_fIsMscorlib = TRUE; } break; case 31: -#line 242 "asmparse.y" +#line 241 "asmparse.y" { yyval.binstr = yypvt[-0].binstr; } break; case 32: -#line 243 "asmparse.y" +#line 242 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; case 33: -#line 246 "asmparse.y" +#line 245 "asmparse.y" { LPCSTRToGuid(yypvt[-0].string,&(PASM->m_guidLang)); } break; case 34: -#line 247 "asmparse.y" +#line 246 "asmparse.y" { LPCSTRToGuid(yypvt[-2].string,&(PASM->m_guidLang)); LPCSTRToGuid(yypvt[-0].string,&(PASM->m_guidLangVendor));} break; case 35: -#line 249 "asmparse.y" +#line 248 "asmparse.y" { LPCSTRToGuid(yypvt[-4].string,&(PASM->m_guidLang)); LPCSTRToGuid(yypvt[-2].string,&(PASM->m_guidLangVendor)); LPCSTRToGuid(yypvt[-2].string,&(PASM->m_guidDoc));} break; case 36: -#line 254 "asmparse.y" +#line 253 "asmparse.y" { yyval.string = yypvt[-0].string; } break; case 37: -#line 255 "asmparse.y" +#line 254 "asmparse.y" { yyval.string = yypvt[-0].string; } break; case 38: -#line 258 "asmparse.y" +#line 257 "asmparse.y" { yyval.string = yypvt[-0].string; } break; case 39: -#line 259 "asmparse.y" +#line 258 "asmparse.y" { yyval.string = yypvt[-0].string; } break; case 40: -#line 260 "asmparse.y" +#line 259 "asmparse.y" { yyval.string = newStringWDel(yypvt[-2].string, '.', yypvt[-0].string); } break; case 41: -#line 263 "asmparse.y" +#line 262 "asmparse.y" { yyval.int32 = yypvt[-0].int32; } break; case 42: -#line 266 "asmparse.y" +#line 265 "asmparse.y" { yyval.int64 = yypvt[-0].int64; } break; case 43: -#line 267 "asmparse.y" +#line 266 "asmparse.y" { yyval.int64 = neg ? new __int64(yypvt[-0].int32) : new __int64((unsigned)yypvt[-0].int32); } break; case 44: -#line 270 "asmparse.y" +#line 269 "asmparse.y" { yyval.float64 = yypvt[-0].float64; } break; case 45: -#line 271 "asmparse.y" +#line 270 "asmparse.y" { float f; *((__int32*) (&f)) = yypvt[-1].int32; yyval.float64 = new double(f); } break; case 46: -#line 272 "asmparse.y" +#line 271 "asmparse.y" { yyval.float64 = (double*) yypvt[-1].int64; } break; case 47: -#line 276 "asmparse.y" +#line 275 "asmparse.y" { PASM->AddTypeDef(yypvt[-2].binstr,yypvt[-0].string); } break; case 48: -#line 277 "asmparse.y" +#line 276 "asmparse.y" { PASM->AddTypeDef(yypvt[-2].token,yypvt[-0].string); } break; case 49: -#line 278 "asmparse.y" +#line 277 "asmparse.y" { PASM->AddTypeDef(yypvt[-2].token,yypvt[-0].string); } break; case 50: -#line 279 "asmparse.y" +#line 278 "asmparse.y" { yypvt[-2].cad->tkOwner = 0; PASM->AddTypeDef(yypvt[-2].cad,yypvt[-0].string); } break; case 51: -#line 280 "asmparse.y" +#line 279 "asmparse.y" { PASM->AddTypeDef(yypvt[-2].cad,yypvt[-0].string); } break; case 52: -#line 285 "asmparse.y" +#line 284 "asmparse.y" { DefineVar(yypvt[-0].string, NULL); } break; case 53: -#line 286 "asmparse.y" +#line 285 "asmparse.y" { DefineVar(yypvt[-1].string, yypvt[-0].binstr); } break; case 54: -#line 287 "asmparse.y" +#line 286 "asmparse.y" { UndefVar(yypvt[-0].string); } break; case 55: -#line 288 "asmparse.y" +#line 287 "asmparse.y" { SkipToken = !IsVarDefined(yypvt[-0].string); IfEndif++; } break; case 56: -#line 291 "asmparse.y" +#line 290 "asmparse.y" { SkipToken = IsVarDefined(yypvt[-0].string); IfEndif++; } break; case 57: -#line 294 "asmparse.y" +#line 293 "asmparse.y" { if(IfEndif == 1) SkipToken = !SkipToken;} break; case 58: -#line 295 "asmparse.y" +#line 294 "asmparse.y" { if(IfEndif == 0) PASM->report->error("Unmatched #endif\n"); else IfEndif--; } break; case 59: -#line 299 "asmparse.y" +#line 298 "asmparse.y" { _ASSERTE(!"yylex should have dealt with this"); } break; case 60: -#line 300 "asmparse.y" +#line 299 "asmparse.y" { } break; case 61: -#line 304 "asmparse.y" +#line 303 "asmparse.y" { yyval.cad = new CustomDescr(PASM->m_tkCurrentCVOwner, yypvt[-0].token, NULL); } break; case 62: -#line 305 "asmparse.y" +#line 304 "asmparse.y" { yyval.cad = new CustomDescr(PASM->m_tkCurrentCVOwner, yypvt[-2].token, yypvt[-0].binstr); } break; case 63: -#line 306 "asmparse.y" +#line 305 "asmparse.y" { yyval.cad = new CustomDescr(PASM->m_tkCurrentCVOwner, yypvt[-4].token, yypvt[-1].binstr); } break; case 64: -#line 307 "asmparse.y" +#line 306 "asmparse.y" { yyval.cad = new CustomDescr(PASM->m_tkCurrentCVOwner, yypvt[-2].int32, yypvt[-1].binstr); } break; case 65: -#line 310 "asmparse.y" +#line 309 "asmparse.y" { yyval.cad = new CustomDescr(yypvt[-2].token, yypvt[-0].token, NULL); } break; case 66: -#line 311 "asmparse.y" +#line 310 "asmparse.y" { yyval.cad = new CustomDescr(yypvt[-4].token, yypvt[-2].token, yypvt[-0].binstr); } break; case 67: -#line 313 "asmparse.y" +#line 312 "asmparse.y" { yyval.cad = new CustomDescr(yypvt[-6].token, yypvt[-4].token, yypvt[-1].binstr); } break; case 68: -#line 314 "asmparse.y" +#line 313 "asmparse.y" { yyval.cad = new CustomDescr(PASM->m_tkCurrentCVOwner, yypvt[-2].int32, yypvt[-1].binstr); } break; case 69: -#line 317 "asmparse.y" +#line 316 "asmparse.y" { yyval.int32 = yypvt[-2].token; bParsingByteArray = TRUE; } break; case 70: -#line 321 "asmparse.y" +#line 320 "asmparse.y" { PASM->m_pCustomDescrList = NULL; PASM->m_tkCurrentCVOwner = yypvt[-4].token; yyval.int32 = yypvt[-2].token; bParsingByteArray = TRUE; } break; case 71: -#line 326 "asmparse.y" +#line 325 "asmparse.y" { yyval.token = yypvt[-0].token; } break; case 72: -#line 329 "asmparse.y" +#line 328 "asmparse.y" { yyval.token = yypvt[-0].token; } break; case 73: -#line 330 "asmparse.y" +#line 329 "asmparse.y" { yyval.token = yypvt[-0].token; } break; case 74: -#line 334 "asmparse.y" +#line 333 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt16(VAL16(nCustomBlobNVPairs)); yyval.binstr->append(yypvt[-0].binstr); nCustomBlobNVPairs = 0; } break; case 75: -#line 340 "asmparse.y" +#line 339 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt16(VAL16(0x0001)); } break; case 76: -#line 341 "asmparse.y" +#line 340 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; AppendFieldToCustomBlob(yyval.binstr,yypvt[-0].binstr); } break; case 77: -#line 343 "asmparse.y" +#line 342 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; } break; case 78: -#line 346 "asmparse.y" +#line 345 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 79: -#line 348 "asmparse.y" +#line 347 "asmparse.y" { yyval.binstr = yypvt[-5].binstr; yyval.binstr->appendInt8(yypvt[-4].int32); yyval.binstr->append(yypvt[-3].binstr); AppendStringWithLength(yyval.binstr,yypvt[-2].string); AppendFieldToCustomBlob(yyval.binstr,yypvt[-0].binstr); nCustomBlobNVPairs++; } break; case 80: -#line 353 "asmparse.y" +#line 352 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; } break; case 81: -#line 356 "asmparse.y" +#line 355 "asmparse.y" { yyval.int32 = SERIALIZATION_TYPE_FIELD; } break; case 82: -#line 357 "asmparse.y" +#line 356 "asmparse.y" { yyval.int32 = SERIALIZATION_TYPE_PROPERTY; } break; case 83: -#line 360 "asmparse.y" +#line 359 "asmparse.y" { if(yypvt[-0].cad->tkOwner && !yypvt[-0].cad->tkInterfacePair) PASM->DefineCV(yypvt[-0].cad); else if(PASM->m_pCustomDescrList) PASM->m_pCustomDescrList->PUSH(yypvt[-0].cad); } break; case 84: -#line 364 "asmparse.y" +#line 363 "asmparse.y" { PASM->DefineCV(yypvt[-0].cad); } break; case 85: -#line 365 "asmparse.y" +#line 364 "asmparse.y" { CustomDescr* pNew = new CustomDescr(yypvt[-0].tdd->m_pCA); if(pNew->tkOwner == 0) pNew->tkOwner = PASM->m_tkCurrentCVOwner; if(pNew->tkOwner) @@ -2330,267 +2326,273 @@ case 85: else if(PASM->m_pCustomDescrList) PASM->m_pCustomDescrList->PUSH(pNew); } break; case 86: -#line 373 "asmparse.y" +#line 372 "asmparse.y" { yyval.binstr = yypvt[-0].binstr; } break; case 87: -#line 374 "asmparse.y" +#line 373 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TYPE); } break; case 88: -#line 375 "asmparse.y" +#line 374 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TAGGED_OBJECT); } break; case 89: -#line 376 "asmparse.y" +#line 375 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); AppendStringWithLength(yyval.binstr,yypvt[-0].string); } break; case 90: -#line 378 "asmparse.y" +#line 377 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); AppendStringWithLength(yyval.binstr,PASM->ReflectionNotation(yypvt[-0].token)); } break; case 91: -#line 380 "asmparse.y" +#line 379 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; case 92: -#line 385 "asmparse.y" +#line 384 "asmparse.y" { PASMM->SetModuleName(NULL); PASM->m_tkCurrentCVOwner=1; } break; case 93: -#line 386 "asmparse.y" +#line 385 "asmparse.y" { PASMM->SetModuleName(yypvt[-0].string); PASM->m_tkCurrentCVOwner=1; } break; case 94: -#line 387 "asmparse.y" +#line 386 "asmparse.y" { BinStr* pbs = new BinStr(); unsigned L = (unsigned)strlen(yypvt[-0].string); memcpy((char*)(pbs->getBuff(L)),yypvt[-0].string,L); PASM->EmitImport(pbs); delete pbs;} break; case 95: -#line 394 "asmparse.y" +#line 393 "asmparse.y" { /*PASM->SetDataSection(); PASM->EmitDataLabel($7);*/ PASM->m_VTFList.PUSH(new VTFEntry((USHORT)yypvt[-4].int32, (USHORT)yypvt[-2].int32, yypvt[-0].string)); } break; case 96: -#line 398 "asmparse.y" +#line 397 "asmparse.y" { yyval.int32 = 0; } break; case 97: -#line 399 "asmparse.y" +#line 398 "asmparse.y" { yyval.int32 = yypvt[-1].int32 | COR_VTABLE_32BIT; } break; case 98: -#line 400 "asmparse.y" +#line 399 "asmparse.y" { yyval.int32 = yypvt[-1].int32 | COR_VTABLE_64BIT; } break; case 99: -#line 401 "asmparse.y" +#line 400 "asmparse.y" { yyval.int32 = yypvt[-1].int32 | COR_VTABLE_FROM_UNMANAGED; } break; case 100: -#line 402 "asmparse.y" +#line 401 "asmparse.y" { yyval.int32 = yypvt[-1].int32 | COR_VTABLE_CALL_MOST_DERIVED; } break; case 101: -#line 403 "asmparse.y" +#line 402 "asmparse.y" { yyval.int32 = yypvt[-1].int32 | COR_VTABLE_FROM_UNMANAGED_RETAIN_APPDOMAIN; } break; case 102: -#line 406 "asmparse.y" +#line 405 "asmparse.y" { PASM->m_pVTable = yypvt[-1].binstr; } break; case 103: -#line 409 "asmparse.y" +#line 408 "asmparse.y" { bParsingByteArray = TRUE; } break; case 104: -#line 413 "asmparse.y" +#line 412 "asmparse.y" { PASM->StartNameSpace(yypvt[-0].string); } break; case 105: -#line 416 "asmparse.y" +#line 415 "asmparse.y" { newclass = TRUE; } break; case 106: -#line 419 "asmparse.y" +#line 418 "asmparse.y" { if(yypvt[-0].typarlist) FixupConstraints(); PASM->StartClass(yypvt[-1].string, yypvt[-2].classAttr, yypvt[-0].typarlist); TyParFixupList.RESET(false); newclass = FALSE; } break; case 107: -#line 425 "asmparse.y" +#line 424 "asmparse.y" { PASM->AddClass(); } break; case 108: -#line 428 "asmparse.y" +#line 427 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) 0; } break; case 109: -#line 429 "asmparse.y" +#line 428 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdVisibilityMask) | tdPublic); } break; case 110: -#line 430 "asmparse.y" +#line 429 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdVisibilityMask) | tdNotPublic); } break; case 111: -#line 431 "asmparse.y" +#line 430 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | 0x80000000 | tdSealed); } break; case 112: -#line 432 "asmparse.y" +#line 431 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | 0x40000000); } break; case 113: -#line 433 "asmparse.y" +#line 432 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdInterface | tdAbstract); } break; case 114: -#line 434 "asmparse.y" +#line 433 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdSealed); } break; case 115: -#line 435 "asmparse.y" +#line 434 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdAbstract); } break; case 116: -#line 436 "asmparse.y" +#line 435 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdLayoutMask) | tdAutoLayout); } break; case 117: -#line 437 "asmparse.y" +#line 436 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdLayoutMask) | tdSequentialLayout); } break; case 118: -#line 438 "asmparse.y" +#line 437 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdLayoutMask) | tdExplicitLayout); } break; case 119: -#line 439 "asmparse.y" +#line 438 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdStringFormatMask) | tdAnsiClass); } break; case 120: -#line 440 "asmparse.y" +#line 439 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdStringFormatMask) | tdUnicodeClass); } break; case 121: -#line 441 "asmparse.y" +#line 440 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-1].classAttr & ~tdStringFormatMask) | tdAutoClass); } break; case 122: -#line 442 "asmparse.y" +#line 441 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdImport); } break; case 123: -#line 443 "asmparse.y" +#line 442 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdSerializable); } break; case 124: -#line 444 "asmparse.y" +#line 443 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdWindowsRuntime); } break; case 125: -#line 445 "asmparse.y" +#line 444 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedPublic); } break; case 126: -#line 446 "asmparse.y" +#line 445 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedPrivate); } break; case 127: -#line 447 "asmparse.y" +#line 446 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedFamily); } break; case 128: -#line 448 "asmparse.y" +#line 447 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedAssembly); } break; case 129: -#line 449 "asmparse.y" +#line 448 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedFamANDAssem); } break; case 130: -#line 450 "asmparse.y" +#line 449 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) ((yypvt[-2].classAttr & ~tdVisibilityMask) | tdNestedFamORAssem); } break; case 131: -#line 451 "asmparse.y" +#line 450 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdBeforeFieldInit); } break; case 132: -#line 452 "asmparse.y" +#line 451 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr | tdSpecialName); } break; case 133: -#line 453 "asmparse.y" +#line 452 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].classAttr); } break; case 134: -#line 454 "asmparse.y" +#line 453 "asmparse.y" { yyval.classAttr = (CorRegTypeAttr) (yypvt[-1].int32); } break; case 136: -#line 458 "asmparse.y" +#line 457 "asmparse.y" { PASM->m_crExtends = yypvt[-0].token; } break; case 141: -#line 469 "asmparse.y" +#line 468 "asmparse.y" { PASM->AddToImplList(yypvt[-0].token); } break; case 142: -#line 470 "asmparse.y" +#line 469 "asmparse.y" { PASM->AddToImplList(yypvt[-0].token); } break; case 143: -#line 474 "asmparse.y" +#line 473 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 144: -#line 475 "asmparse.y" +#line 474 "asmparse.y" { yyval.binstr = yypvt[-0].binstr; } break; case 145: -#line 478 "asmparse.y" +#line 477 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt32(yypvt[-0].token); } break; case 146: -#line 479 "asmparse.y" +#line 478 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; yyval.binstr->appendInt32(yypvt[-0].token); } break; case 147: -#line 482 "asmparse.y" +#line 481 "asmparse.y" { yyval.typarlist = NULL; PASM->m_TyParList = NULL;} break; case 148: -#line 483 "asmparse.y" +#line 482 "asmparse.y" { yyval.typarlist = yypvt[-1].typarlist; PASM->m_TyParList = yypvt[-1].typarlist;} break; case 149: -#line 486 "asmparse.y" +#line 485 "asmparse.y" { yyval.int32 = gpCovariant; } break; case 150: -#line 487 "asmparse.y" +#line 486 "asmparse.y" { yyval.int32 = gpContravariant; } break; case 151: -#line 488 "asmparse.y" +#line 487 "asmparse.y" { yyval.int32 = gpReferenceTypeConstraint; } break; case 152: -#line 489 "asmparse.y" +#line 488 "asmparse.y" { yyval.int32 = gpNotNullableValueTypeConstraint; } break; case 153: +#line 489 "asmparse.y" +{ yyval.int32 = gpAcceptByRefLike; } break; +case 154: #line 490 "asmparse.y" { yyval.int32 = gpDefaultConstructorConstraint; } break; -case 154: -#line 493 "asmparse.y" -{ yyval.int32 = 0; } break; case 155: -#line 494 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32 | yypvt[-0].int32; } break; +#line 491 "asmparse.y" +{ yyval.int32 = (CorGenericParamAttr)yypvt[-1].int32; } break; case 156: -#line 497 "asmparse.y" -{yyval.typarlist = new TyParList(yypvt[-3].int32, yypvt[-2].binstr, yypvt[-1].string, yypvt[-0].typarlist);} break; +#line 494 "asmparse.y" +{ yyval.int32 = 0; } break; case 157: -#line 498 "asmparse.y" -{yyval.typarlist = new TyParList(yypvt[-2].int32, NULL, yypvt[-1].string, yypvt[-0].typarlist);} break; +#line 495 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32 | yypvt[-0].int32; } break; case 158: -#line 501 "asmparse.y" -{ yyval.typarlist = NULL; } break; +#line 498 "asmparse.y" +{yyval.typarlist = new TyParList(yypvt[-3].int32, yypvt[-2].binstr, yypvt[-1].string, yypvt[-0].typarlist);} break; case 159: -#line 502 "asmparse.y" -{ yyval.typarlist = yypvt[-0].typarlist; } break; +#line 499 "asmparse.y" +{yyval.typarlist = new TyParList(yypvt[-2].int32, NULL, yypvt[-1].string, yypvt[-0].typarlist);} break; case 160: -#line 505 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; } break; +#line 502 "asmparse.y" +{ yyval.typarlist = NULL; } break; case 161: -#line 508 "asmparse.y" -{ yyval.int32= 0; } break; +#line 503 "asmparse.y" +{ yyval.typarlist = yypvt[-0].typarlist; } break; case 162: +#line 506 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; } break; +case 163: #line 509 "asmparse.y" +{ yyval.int32= 0; } break; +case 164: +#line 510 "asmparse.y" { yyval.int32 = yypvt[-0].int32; } break; -case 163: -#line 512 "asmparse.y" +case 165: +#line 513 "asmparse.y" { yyval.int32 = yypvt[-2].int32; } break; -case 164: -#line 516 "asmparse.y" +case 166: +#line 517 "asmparse.y" { if(PASM->m_pCurMethod->m_ulLines[1] ==0) { PASM->m_pCurMethod->m_ulLines[1] = PASM->m_ulCurLine; PASM->m_pCurMethod->m_ulColumns[1]=PASM->m_ulCurColumn;} PASM->EndMethod(); } break; -case 165: -#line 520 "asmparse.y" -{ PASM->EndClass(); } break; -case 166: -#line 521 "asmparse.y" -{ PASM->EndEvent(); } break; case 167: +#line 521 "asmparse.y" +{ PASM->EndClass(); } break; +case 168: #line 522 "asmparse.y" +{ PASM->EndEvent(); } break; +case 169: +#line 523 "asmparse.y" { PASM->EndProp(); } break; -case 173: -#line 528 "asmparse.y" -{ PASM->m_pCurClass->m_ulSize = yypvt[-0].int32; } break; -case 174: -#line 529 "asmparse.y" -{ PASM->m_pCurClass->m_ulPack = yypvt[-0].int32; } break; case 175: +#line 529 "asmparse.y" +{ PASM->m_pCurClass->m_ulSize = yypvt[-0].int32; } break; +case 176: #line 530 "asmparse.y" +{ PASM->m_pCurClass->m_ulPack = yypvt[-0].int32; } break; +case 177: +#line 531 "asmparse.y" { PASMM->EndComType(); } break; -case 176: -#line 532 "asmparse.y" +case 178: +#line 533 "asmparse.y" { BinStr *sig1 = parser->MakeSig(yypvt[-7].int32, yypvt[-6].binstr, yypvt[-1].binstr); BinStr *sig2 = new BinStr(); sig2->append(sig1); PASM->AddMethodImpl(yypvt[-11].token,yypvt[-9].string,sig1,yypvt[-5].token,yypvt[-3].string,sig2); PASM->ResetArgNameList(); } break; -case 177: -#line 538 "asmparse.y" +case 179: +#line 539 "asmparse.y" { PASM->AddMethodImpl(yypvt[-17].token,yypvt[-15].string, (yypvt[-14].int32==0 ? parser->MakeSig(yypvt[-19].int32,yypvt[-18].binstr,yypvt[-12].binstr) : parser->MakeSig(yypvt[-19].int32| IMAGE_CEE_CS_CALLCONV_GENERIC,yypvt[-18].binstr,yypvt[-12].binstr,yypvt[-14].int32)), @@ -2599,105 +2601,105 @@ case 177: parser->MakeSig(yypvt[-8].int32| IMAGE_CEE_CS_CALLCONV_GENERIC,yypvt[-7].binstr,yypvt[-1].binstr,yypvt[-3].int32))); PASM->ResetArgNameList(); } break; -case 180: -#line 548 "asmparse.y" +case 182: +#line 549 "asmparse.y" { if((yypvt[-1].int32 > 0) && (yypvt[-1].int32 <= (int)PASM->m_pCurClass->m_NumTyPars)) PASM->m_pCustomDescrList = PASM->m_pCurClass->m_TyPars[yypvt[-1].int32-1].CAList(); else PASM->report->error("Type parameter index out of range\n"); } break; -case 181: -#line 553 "asmparse.y" +case 183: +#line 554 "asmparse.y" { int n = PASM->m_pCurClass->FindTyPar(yypvt[-0].string); if(n >= 0) PASM->m_pCustomDescrList = PASM->m_pCurClass->m_TyPars[n].CAList(); else PASM->report->error("Type parameter '%s' undefined\n",yypvt[-0].string); } break; -case 182: -#line 559 "asmparse.y" -{ PASM->AddGenericParamConstraint(yypvt[-3].int32, 0, yypvt[-0].token); } break; -case 183: -#line 560 "asmparse.y" -{ PASM->AddGenericParamConstraint(0, yypvt[-2].string, yypvt[-0].token); } break; case 184: +#line 560 "asmparse.y" +{ PASM->AddGenericParamConstraint(yypvt[-3].int32, 0, yypvt[-0].token); } break; +case 185: #line 561 "asmparse.y" +{ PASM->AddGenericParamConstraint(0, yypvt[-2].string, yypvt[-0].token); } break; +case 186: +#line 562 "asmparse.y" { yypvt[-0].cad->tkInterfacePair = yypvt[-1].token; if(PASM->m_pCustomDescrList) PASM->m_pCustomDescrList->PUSH(yypvt[-0].cad); } break; -case 185: -#line 569 "asmparse.y" +case 187: +#line 570 "asmparse.y" { yypvt[-3].binstr->insertInt8(IMAGE_CEE_CS_CALLCONV_FIELD); PASM->AddField(yypvt[-2].string, yypvt[-3].binstr, yypvt[-4].fieldAttr, yypvt[-1].string, yypvt[-0].binstr, yypvt[-5].int32); } break; -case 186: -#line 573 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) 0; } break; -case 187: -#line 574 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdStatic); } break; case 188: -#line 575 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPublic); } break; +#line 574 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) 0; } break; case 189: -#line 576 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPrivate); } break; +#line 575 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdStatic); } break; case 190: -#line 577 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamily); } break; +#line 576 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPublic); } break; case 191: -#line 578 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdInitOnly); } break; +#line 577 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPrivate); } break; case 192: -#line 579 "asmparse.y" -{ yyval.fieldAttr = yypvt[-1].fieldAttr; } break; +#line 578 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamily); } break; case 193: -#line 580 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdSpecialName); } break; +#line 579 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdInitOnly); } break; case 194: -#line 593 "asmparse.y" -{ PASM->m_pMarshal = yypvt[-1].binstr; } break; +#line 580 "asmparse.y" +{ yyval.fieldAttr = yypvt[-1].fieldAttr; } break; case 195: -#line 594 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdAssembly); } break; +#line 581 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdSpecialName); } break; case 196: -#line 595 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamANDAssem); } break; +#line 594 "asmparse.y" +{ PASM->m_pMarshal = yypvt[-1].binstr; } break; case 197: -#line 596 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamORAssem); } break; +#line 595 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdAssembly); } break; case 198: -#line 597 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPrivateScope); } break; +#line 596 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamANDAssem); } break; case 199: -#line 598 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdLiteral); } break; +#line 597 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdFamORAssem); } break; case 200: -#line 599 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdNotSerialized); } break; +#line 598 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) ((yypvt[-1].fieldAttr & ~mdMemberAccessMask) | fdPrivateScope); } break; case 201: -#line 600 "asmparse.y" -{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].int32); } break; +#line 599 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdLiteral); } break; case 202: -#line 603 "asmparse.y" -{ yyval.string = 0; } break; +#line 600 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].fieldAttr | fdNotSerialized); } break; case 203: -#line 604 "asmparse.y" -{ yyval.string = yypvt[-0].string; } break; +#line 601 "asmparse.y" +{ yyval.fieldAttr = (CorFieldAttr) (yypvt[-1].int32); } break; case 204: -#line 607 "asmparse.y" -{ yyval.binstr = NULL; } break; +#line 604 "asmparse.y" +{ yyval.string = 0; } break; case 205: -#line 608 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 605 "asmparse.y" +{ yyval.string = yypvt[-0].string; } break; case 206: -#line 611 "asmparse.y" -{ yyval.int32 = 0xFFFFFFFF; } break; +#line 608 "asmparse.y" +{ yyval.binstr = NULL; } break; case 207: +#line 609 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; +case 208: #line 612 "asmparse.y" +{ yyval.int32 = 0xFFFFFFFF; } break; +case 209: +#line 613 "asmparse.y" { yyval.int32 = yypvt[-1].int32; } break; -case 208: -#line 617 "asmparse.y" +case 210: +#line 618 "asmparse.y" { PASM->ResetArgNameList(); if (yypvt[-3].binstr == NULL) { @@ -2714,15 +2716,15 @@ case 208: parser->MakeSig(IMAGE_CEE_CS_CALLCONV_INSTANTIATION, 0, yypvt[-3].binstr)); } } break; -case 209: -#line 634 "asmparse.y" +case 211: +#line 635 "asmparse.y" { PASM->ResetArgNameList(); if((iCallConv)&&((yypvt[-8].int32 & iCallConv) != iCallConv)) parser->warn("'instance' added to method's calling convention\n"); yyval.token = PASM->MakeMemberRef(yypvt[-6].token, yypvt[-4].string, parser->MakeSig(yypvt[-8].int32 | IMAGE_CEE_CS_CALLCONV_GENERIC|iCallConv, yypvt[-7].binstr, yypvt[-1].binstr, yypvt[-3].int32)); } break; -case 210: -#line 640 "asmparse.y" +case 212: +#line 641 "asmparse.y" { PASM->ResetArgNameList(); if (yypvt[-3].binstr == NULL) { @@ -2738,162 +2740,162 @@ case 210: parser->MakeSig(IMAGE_CEE_CS_CALLCONV_INSTANTIATION, 0, yypvt[-3].binstr)); } } break; -case 211: -#line 656 "asmparse.y" +case 213: +#line 657 "asmparse.y" { PASM->ResetArgNameList(); if((iCallConv)&&((yypvt[-6].int32 & iCallConv) != iCallConv)) parser->warn("'instance' added to method's calling convention\n"); yyval.token = PASM->MakeMemberRef(mdTokenNil, yypvt[-4].string, parser->MakeSig(yypvt[-6].int32 | IMAGE_CEE_CS_CALLCONV_GENERIC|iCallConv, yypvt[-5].binstr, yypvt[-1].binstr, yypvt[-3].int32)); } break; -case 212: -#line 660 "asmparse.y" -{ yyval.token = yypvt[-0].token; } break; -case 213: -#line 661 "asmparse.y" -{ yyval.token = yypvt[-0].tdd->m_tkTypeSpec; } break; case 214: +#line 661 "asmparse.y" +{ yyval.token = yypvt[-0].token; } break; +case 215: #line 662 "asmparse.y" { yyval.token = yypvt[-0].tdd->m_tkTypeSpec; } break; -case 215: -#line 665 "asmparse.y" -{ yyval.int32 = (yypvt[-0].int32 | IMAGE_CEE_CS_CALLCONV_HASTHIS); } break; case 216: -#line 666 "asmparse.y" -{ yyval.int32 = (yypvt[-0].int32 | IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS); } break; +#line 663 "asmparse.y" +{ yyval.token = yypvt[-0].tdd->m_tkTypeSpec; } break; case 217: -#line 667 "asmparse.y" -{ yyval.int32 = yypvt[-0].int32; } break; +#line 666 "asmparse.y" +{ yyval.int32 = (yypvt[-0].int32 | IMAGE_CEE_CS_CALLCONV_HASTHIS); } break; case 218: -#line 668 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32; } break; +#line 667 "asmparse.y" +{ yyval.int32 = (yypvt[-0].int32 | IMAGE_CEE_CS_CALLCONV_EXPLICITTHIS); } break; case 219: -#line 671 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_DEFAULT; } break; +#line 668 "asmparse.y" +{ yyval.int32 = yypvt[-0].int32; } break; case 220: +#line 669 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32; } break; +case 221: #line 672 "asmparse.y" { yyval.int32 = IMAGE_CEE_CS_CALLCONV_DEFAULT; } break; -case 221: -#line 673 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_VARARG; } break; case 222: -#line 674 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_C; } break; +#line 673 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_DEFAULT; } break; case 223: -#line 675 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_STDCALL; } break; +#line 674 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_VARARG; } break; case 224: -#line 676 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_THISCALL; } break; +#line 675 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_C; } break; case 225: -#line 677 "asmparse.y" -{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_FASTCALL; } break; +#line 676 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_STDCALL; } break; case 226: +#line 677 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_THISCALL; } break; +case 227: #line 678 "asmparse.y" +{ yyval.int32 = IMAGE_CEE_CS_CALLCONV_FASTCALL; } break; +case 228: +#line 679 "asmparse.y" { yyval.int32 = IMAGE_CEE_CS_CALLCONV_UNMANAGED; } break; -case 227: -#line 681 "asmparse.y" +case 229: +#line 682 "asmparse.y" { yyval.token = yypvt[-1].int32; } break; -case 228: -#line 684 "asmparse.y" +case 230: +#line 685 "asmparse.y" { yyval.token = yypvt[-0].token; PASM->delArgNameList(PASM->m_firstArgName); PASM->m_firstArgName = parser->m_ANSFirst.POP(); PASM->m_lastArgName = parser->m_ANSLast.POP(); PASM->SetMemberRefFixup(yypvt[-0].token,iOpcodeLen); } break; -case 229: -#line 690 "asmparse.y" +case 231: +#line 691 "asmparse.y" { yypvt[-3].binstr->insertInt8(IMAGE_CEE_CS_CALLCONV_FIELD); yyval.token = PASM->MakeMemberRef(yypvt[-2].token, yypvt[-0].string, yypvt[-3].binstr); PASM->SetMemberRefFixup(yyval.token,iOpcodeLen); } break; -case 230: -#line 694 "asmparse.y" +case 232: +#line 695 "asmparse.y" { yypvt[-1].binstr->insertInt8(IMAGE_CEE_CS_CALLCONV_FIELD); yyval.token = PASM->MakeMemberRef(NULL, yypvt[-0].string, yypvt[-1].binstr); PASM->SetMemberRefFixup(yyval.token,iOpcodeLen); } break; -case 231: -#line 697 "asmparse.y" +case 233: +#line 698 "asmparse.y" { yyval.token = yypvt[-0].tdd->m_tkTypeSpec; PASM->SetMemberRefFixup(yyval.token,iOpcodeLen); } break; -case 232: -#line 699 "asmparse.y" +case 234: +#line 700 "asmparse.y" { yyval.token = yypvt[-0].tdd->m_tkTypeSpec; PASM->SetMemberRefFixup(yyval.token,iOpcodeLen); } break; -case 233: -#line 701 "asmparse.y" +case 235: +#line 702 "asmparse.y" { yyval.token = yypvt[-0].token; PASM->SetMemberRefFixup(yyval.token,iOpcodeLen); } break; -case 234: -#line 706 "asmparse.y" -{ PASM->ResetEvent(yypvt[-0].string, yypvt[-1].token, yypvt[-2].eventAttr); } break; -case 235: -#line 707 "asmparse.y" -{ PASM->ResetEvent(yypvt[-0].string, mdTypeRefNil, yypvt[-1].eventAttr); } break; case 236: -#line 711 "asmparse.y" -{ yyval.eventAttr = (CorEventAttr) 0; } break; +#line 707 "asmparse.y" +{ PASM->ResetEvent(yypvt[-0].string, yypvt[-1].token, yypvt[-2].eventAttr); } break; case 237: -#line 712 "asmparse.y" -{ yyval.eventAttr = yypvt[-1].eventAttr; } break; +#line 708 "asmparse.y" +{ PASM->ResetEvent(yypvt[-0].string, mdTypeRefNil, yypvt[-1].eventAttr); } break; case 238: +#line 712 "asmparse.y" +{ yyval.eventAttr = (CorEventAttr) 0; } break; +case 239: #line 713 "asmparse.y" +{ yyval.eventAttr = yypvt[-1].eventAttr; } break; +case 240: +#line 714 "asmparse.y" { yyval.eventAttr = (CorEventAttr) (yypvt[-1].eventAttr | evSpecialName); } break; -case 241: -#line 720 "asmparse.y" -{ PASM->SetEventMethod(0, yypvt[-0].token); } break; -case 242: -#line 721 "asmparse.y" -{ PASM->SetEventMethod(1, yypvt[-0].token); } break; case 243: -#line 722 "asmparse.y" -{ PASM->SetEventMethod(2, yypvt[-0].token); } break; +#line 721 "asmparse.y" +{ PASM->SetEventMethod(0, yypvt[-0].token); } break; case 244: +#line 722 "asmparse.y" +{ PASM->SetEventMethod(1, yypvt[-0].token); } break; +case 245: #line 723 "asmparse.y" +{ PASM->SetEventMethod(2, yypvt[-0].token); } break; +case 246: +#line 724 "asmparse.y" { PASM->SetEventMethod(3, yypvt[-0].token); } break; -case 249: -#line 732 "asmparse.y" +case 251: +#line 733 "asmparse.y" { PASM->ResetProp(yypvt[-4].string, parser->MakeSig((IMAGE_CEE_CS_CALLCONV_PROPERTY | (yypvt[-6].int32 & IMAGE_CEE_CS_CALLCONV_HASTHIS)),yypvt[-5].binstr,yypvt[-2].binstr), yypvt[-7].propAttr, yypvt[-0].binstr);} break; -case 250: -#line 737 "asmparse.y" -{ yyval.propAttr = (CorPropertyAttr) 0; } break; -case 251: -#line 738 "asmparse.y" -{ yyval.propAttr = yypvt[-1].propAttr; } break; case 252: +#line 738 "asmparse.y" +{ yyval.propAttr = (CorPropertyAttr) 0; } break; +case 253: #line 739 "asmparse.y" +{ yyval.propAttr = yypvt[-1].propAttr; } break; +case 254: +#line 740 "asmparse.y" { yyval.propAttr = (CorPropertyAttr) (yypvt[-1].propAttr | prSpecialName); } break; -case 255: -#line 747 "asmparse.y" -{ PASM->SetPropMethod(0, yypvt[-0].token); } break; -case 256: -#line 748 "asmparse.y" -{ PASM->SetPropMethod(1, yypvt[-0].token); } break; case 257: +#line 748 "asmparse.y" +{ PASM->SetPropMethod(0, yypvt[-0].token); } break; +case 258: #line 749 "asmparse.y" +{ PASM->SetPropMethod(1, yypvt[-0].token); } break; +case 259: +#line 750 "asmparse.y" { PASM->SetPropMethod(2, yypvt[-0].token); } break; -case 262: -#line 757 "asmparse.y" +case 264: +#line 758 "asmparse.y" { PASM->ResetForNextMethod(); uMethodBeginLine = PASM->m_ulCurLine; uMethodBeginColumn=PASM->m_ulCurColumn; } break; -case 263: -#line 763 "asmparse.y" -{ yyval.binstr = NULL; } break; -case 264: -#line 764 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; } break; case 265: -#line 767 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 764 "asmparse.y" +{ yyval.binstr = NULL; } break; case 266: -#line 768 "asmparse.y" +#line 765 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; } break; case 267: -#line 771 "asmparse.y" -{ bParsingByteArray = TRUE; } break; +#line 768 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 268: -#line 775 "asmparse.y" +#line 769 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; } break; +case 269: +#line 772 "asmparse.y" +{ bParsingByteArray = TRUE; } break; +case 270: +#line 776 "asmparse.y" { BinStr* sig; if (yypvt[-5].typarlist == NULL) sig = parser->MakeSig(yypvt[-10].int32, yypvt[-8].binstr, yypvt[-3].binstr); else { @@ -2907,231 +2909,231 @@ case 268: PASM->m_pCurMethod->m_ulLines[0] = uMethodBeginLine; PASM->m_pCurMethod->m_ulColumns[0]=uMethodBeginColumn; } break; -case 269: -#line 790 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) 0; } break; -case 270: -#line 791 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdStatic); } break; case 271: -#line 792 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPublic); } break; +#line 791 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) 0; } break; case 272: -#line 793 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPrivate); } break; +#line 792 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdStatic); } break; case 273: -#line 794 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamily); } break; +#line 793 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPublic); } break; case 274: -#line 795 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdFinal); } break; +#line 794 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPrivate); } break; case 275: -#line 796 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdSpecialName); } break; +#line 795 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamily); } break; case 276: -#line 797 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdVirtual); } break; +#line 796 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdFinal); } break; case 277: -#line 798 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdCheckAccessOnOverride); } break; +#line 797 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdSpecialName); } break; case 278: -#line 799 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdAbstract); } break; +#line 798 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdVirtual); } break; case 279: -#line 800 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdAssem); } break; +#line 799 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdCheckAccessOnOverride); } break; case 280: -#line 801 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamANDAssem); } break; +#line 800 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdAbstract); } break; case 281: -#line 802 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamORAssem); } break; +#line 801 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdAssem); } break; case 282: -#line 803 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPrivateScope); } break; +#line 802 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamANDAssem); } break; case 283: -#line 804 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdHideBySig); } break; +#line 803 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdFamORAssem); } break; case 284: -#line 805 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdNewSlot); } break; +#line 804 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) ((yypvt[-1].methAttr & ~mdMemberAccessMask) | mdPrivateScope); } break; case 285: -#line 806 "asmparse.y" -{ yyval.methAttr = yypvt[-1].methAttr; } break; +#line 805 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdHideBySig); } break; case 286: -#line 807 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdUnmanagedExport); } break; +#line 806 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdNewSlot); } break; case 287: -#line 808 "asmparse.y" -{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdRequireSecObject); } break; +#line 807 "asmparse.y" +{ yyval.methAttr = yypvt[-1].methAttr; } break; case 288: +#line 808 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdUnmanagedExport); } break; +case 289: #line 809 "asmparse.y" +{ yyval.methAttr = (CorMethodAttr) (yypvt[-1].methAttr | mdRequireSecObject); } break; +case 290: +#line 810 "asmparse.y" { yyval.methAttr = (CorMethodAttr) (yypvt[-1].int32); } break; -case 289: -#line 811 "asmparse.y" +case 291: +#line 812 "asmparse.y" { PASM->SetPinvoke(yypvt[-4].binstr,0,yypvt[-2].binstr,yypvt[-1].pinvAttr); yyval.methAttr = (CorMethodAttr) (yypvt[-7].methAttr | mdPinvokeImpl); } break; -case 290: -#line 814 "asmparse.y" +case 292: +#line 815 "asmparse.y" { PASM->SetPinvoke(yypvt[-2].binstr,0,NULL,yypvt[-1].pinvAttr); yyval.methAttr = (CorMethodAttr) (yypvt[-5].methAttr | mdPinvokeImpl); } break; -case 291: -#line 817 "asmparse.y" +case 293: +#line 818 "asmparse.y" { PASM->SetPinvoke(new BinStr(),0,NULL,yypvt[-1].pinvAttr); yyval.methAttr = (CorMethodAttr) (yypvt[-4].methAttr | mdPinvokeImpl); } break; -case 292: -#line 821 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) 0; } break; -case 293: -#line 822 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmNoMangle); } break; case 294: -#line 823 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetAnsi); } break; +#line 822 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) 0; } break; case 295: -#line 824 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetUnicode); } break; +#line 823 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmNoMangle); } break; case 296: -#line 825 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetAuto); } break; +#line 824 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetAnsi); } break; case 297: -#line 826 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmSupportsLastError); } break; +#line 825 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetUnicode); } break; case 298: -#line 827 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvWinapi); } break; +#line 826 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCharSetAuto); } break; case 299: -#line 828 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvCdecl); } break; +#line 827 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmSupportsLastError); } break; case 300: -#line 829 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvStdcall); } break; +#line 828 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvWinapi); } break; case 301: -#line 830 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvThiscall); } break; +#line 829 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvCdecl); } break; case 302: -#line 831 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvFastcall); } break; +#line 830 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvStdcall); } break; case 303: -#line 832 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmBestFitEnabled); } break; +#line 831 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvThiscall); } break; case 304: -#line 833 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmBestFitDisabled); } break; +#line 832 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].pinvAttr | pmCallConvFastcall); } break; case 305: -#line 834 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmThrowOnUnmappableCharEnabled); } break; +#line 833 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmBestFitEnabled); } break; case 306: -#line 835 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmThrowOnUnmappableCharDisabled); } break; +#line 834 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmBestFitDisabled); } break; case 307: -#line 836 "asmparse.y" -{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].int32); } break; +#line 835 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmThrowOnUnmappableCharEnabled); } break; case 308: -#line 839 "asmparse.y" -{ yyval.string = newString(COR_CTOR_METHOD_NAME); } break; +#line 836 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-3].pinvAttr | pmThrowOnUnmappableCharDisabled); } break; case 309: -#line 840 "asmparse.y" -{ yyval.string = newString(COR_CCTOR_METHOD_NAME); } break; +#line 837 "asmparse.y" +{ yyval.pinvAttr = (CorPinvokeMap) (yypvt[-1].int32); } break; case 310: -#line 841 "asmparse.y" -{ yyval.string = yypvt[-0].string; } break; +#line 840 "asmparse.y" +{ yyval.string = newString(COR_CTOR_METHOD_NAME); } break; case 311: -#line 844 "asmparse.y" -{ yyval.int32 = 0; } break; +#line 841 "asmparse.y" +{ yyval.string = newString(COR_CCTOR_METHOD_NAME); } break; case 312: -#line 845 "asmparse.y" -{ yyval.int32 = yypvt[-3].int32 | pdIn; } break; +#line 842 "asmparse.y" +{ yyval.string = yypvt[-0].string; } break; case 313: -#line 846 "asmparse.y" -{ yyval.int32 = yypvt[-3].int32 | pdOut; } break; +#line 845 "asmparse.y" +{ yyval.int32 = 0; } break; case 314: -#line 847 "asmparse.y" -{ yyval.int32 = yypvt[-3].int32 | pdOptional; } break; +#line 846 "asmparse.y" +{ yyval.int32 = yypvt[-3].int32 | pdIn; } break; case 315: -#line 848 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32 + 1; } break; +#line 847 "asmparse.y" +{ yyval.int32 = yypvt[-3].int32 | pdOut; } break; case 316: -#line 851 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (miIL | miManaged); } break; +#line 848 "asmparse.y" +{ yyval.int32 = yypvt[-3].int32 | pdOptional; } break; case 317: -#line 852 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miNative); } break; +#line 849 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32 + 1; } break; case 318: -#line 853 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miIL); } break; +#line 852 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (miIL | miManaged); } break; case 319: -#line 854 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miOPTIL); } break; +#line 853 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miNative); } break; case 320: -#line 855 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFFB) | miManaged); } break; +#line 854 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miIL); } break; case 321: -#line 856 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFFB) | miUnmanaged); } break; +#line 855 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFF4) | miOPTIL); } break; case 322: -#line 857 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miForwardRef); } break; +#line 856 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFFB) | miManaged); } break; case 323: -#line 858 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miPreserveSig); } break; +#line 857 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) ((yypvt[-1].implAttr & 0xFFFB) | miUnmanaged); } break; case 324: -#line 859 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miRuntime); } break; +#line 858 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miForwardRef); } break; case 325: -#line 860 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miInternalCall); } break; +#line 859 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miPreserveSig); } break; case 326: -#line 861 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miSynchronized); } break; +#line 860 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miRuntime); } break; case 327: -#line 862 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miNoInlining); } break; +#line 861 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miInternalCall); } break; case 328: -#line 863 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miAggressiveInlining); } break; +#line 862 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miSynchronized); } break; case 329: -#line 864 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miNoOptimization); } break; +#line 863 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miNoInlining); } break; case 330: -#line 865 "asmparse.y" -{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miAggressiveOptimization); } break; +#line 864 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miAggressiveInlining); } break; case 331: +#line 865 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miNoOptimization); } break; +case 332: #line 866 "asmparse.y" +{ yyval.implAttr = (CorMethodImpl) (yypvt[-1].implAttr | miAggressiveOptimization); } break; +case 333: +#line 867 "asmparse.y" { yyval.implAttr = (CorMethodImpl) (yypvt[-1].int32); } break; -case 332: -#line 869 "asmparse.y" +case 334: +#line 870 "asmparse.y" { PASM->delArgNameList(PASM->m_firstArgName); PASM->m_firstArgName = NULL;PASM->m_lastArgName = NULL; } break; -case 335: -#line 877 "asmparse.y" -{ PASM->EmitByte(yypvt[-0].int32); } break; -case 336: -#line 878 "asmparse.y" -{ delete PASM->m_SEHD; PASM->m_SEHD = PASM->m_SEHDstack.POP(); } break; case 337: -#line 879 "asmparse.y" -{ PASM->EmitMaxStack(yypvt[-0].int32); } break; +#line 878 "asmparse.y" +{ PASM->EmitByte(yypvt[-0].int32); } break; case 338: +#line 879 "asmparse.y" +{ delete PASM->m_SEHD; PASM->m_SEHD = PASM->m_SEHDstack.POP(); } break; +case 339: #line 880 "asmparse.y" +{ PASM->EmitMaxStack(yypvt[-0].int32); } break; +case 340: +#line 881 "asmparse.y" { PASM->EmitLocals(parser->MakeSig(IMAGE_CEE_CS_CALLCONV_LOCAL_SIG, 0, yypvt[-1].binstr)); } break; -case 339: -#line 882 "asmparse.y" +case 341: +#line 883 "asmparse.y" { PASM->EmitZeroInit(); PASM->EmitLocals(parser->MakeSig(IMAGE_CEE_CS_CALLCONV_LOCAL_SIG, 0, yypvt[-1].binstr)); } break; -case 340: -#line 885 "asmparse.y" -{ PASM->EmitEntryPoint(); } break; -case 341: +case 342: #line 886 "asmparse.y" +{ PASM->EmitEntryPoint(); } break; +case 343: +#line 887 "asmparse.y" { PASM->EmitZeroInit(); } break; -case 344: -#line 889 "asmparse.y" +case 346: +#line 890 "asmparse.y" { PASM->AddLabel(PASM->m_CurPC,yypvt[-1].string); /*PASM->EmitLabel($1);*/ } break; -case 350: -#line 895 "asmparse.y" +case 352: +#line 896 "asmparse.y" { if(PASM->m_pCurMethod->m_dwExportOrdinal == 0xFFFFFFFF) { PASM->m_pCurMethod->m_dwExportOrdinal = yypvt[-1].int32; @@ -3142,8 +3144,8 @@ case 350: else PASM->report->warn("Duplicate .export directive, ignored\n"); } break; -case 351: -#line 905 "asmparse.y" +case 353: +#line 906 "asmparse.y" { if(PASM->m_pCurMethod->m_dwExportOrdinal == 0xFFFFFFFF) { PASM->m_pCurMethod->m_dwExportOrdinal = yypvt[-3].int32; @@ -3154,44 +3156,44 @@ case 351: else PASM->report->warn("Duplicate .export directive, ignored\n"); } break; -case 352: -#line 915 "asmparse.y" +case 354: +#line 916 "asmparse.y" { PASM->m_pCurMethod->m_wVTEntry = (WORD)yypvt[-2].int32; PASM->m_pCurMethod->m_wVTSlot = (WORD)yypvt[-0].int32; } break; -case 353: -#line 918 "asmparse.y" +case 355: +#line 919 "asmparse.y" { PASM->AddMethodImpl(yypvt[-2].token,yypvt[-0].string,NULL,NULL,NULL,NULL); } break; -case 354: -#line 921 "asmparse.y" +case 356: +#line 922 "asmparse.y" { PASM->AddMethodImpl(yypvt[-6].token,yypvt[-4].string, (yypvt[-3].int32==0 ? parser->MakeSig(yypvt[-8].int32,yypvt[-7].binstr,yypvt[-1].binstr) : parser->MakeSig(yypvt[-8].int32| IMAGE_CEE_CS_CALLCONV_GENERIC,yypvt[-7].binstr,yypvt[-1].binstr,yypvt[-3].int32)) ,NULL,NULL,NULL); PASM->ResetArgNameList(); } break; -case 356: -#line 928 "asmparse.y" +case 358: +#line 929 "asmparse.y" { if((yypvt[-1].int32 > 0) && (yypvt[-1].int32 <= (int)PASM->m_pCurMethod->m_NumTyPars)) PASM->m_pCustomDescrList = PASM->m_pCurMethod->m_TyPars[yypvt[-1].int32-1].CAList(); else PASM->report->error("Type parameter index out of range\n"); } break; -case 357: -#line 933 "asmparse.y" +case 359: +#line 934 "asmparse.y" { int n = PASM->m_pCurMethod->FindTyPar(yypvt[-0].string); if(n >= 0) PASM->m_pCustomDescrList = PASM->m_pCurMethod->m_TyPars[n].CAList(); else PASM->report->error("Type parameter '%s' undefined\n",yypvt[-0].string); } break; -case 358: -#line 939 "asmparse.y" -{ PASM->m_pCurMethod->AddGenericParamConstraint(yypvt[-3].int32, 0, yypvt[-0].token); } break; -case 359: +case 360: #line 940 "asmparse.y" +{ PASM->m_pCurMethod->AddGenericParamConstraint(yypvt[-3].int32, 0, yypvt[-0].token); } break; +case 361: +#line 941 "asmparse.y" { PASM->m_pCurMethod->AddGenericParamConstraint(0, yypvt[-2].string, yypvt[-0].token); } break; -case 360: -#line 943 "asmparse.y" +case 362: +#line 944 "asmparse.y" { if( yypvt[-2].int32 ) { ARG_NAME_LIST* pAN=PASM->findArg(PASM->m_pCurMethod->m_firstArgName, yypvt[-2].int32 - 1); if(pAN) @@ -3210,139 +3212,139 @@ case 360: } PASM->m_tkCurrentCVOwner = 0; } break; -case 361: -#line 963 "asmparse.y" +case 363: +#line 964 "asmparse.y" { PASM->m_pCurMethod->CloseScope(); } break; -case 362: -#line 966 "asmparse.y" +case 364: +#line 967 "asmparse.y" { PASM->m_pCurMethod->OpenScope(); } break; -case 366: -#line 977 "asmparse.y" -{ PASM->m_SEHD->tryTo = PASM->m_CurPC; } break; -case 367: -#line 978 "asmparse.y" -{ PASM->SetTryLabels(yypvt[-2].string, yypvt[-0].string); } break; case 368: +#line 978 "asmparse.y" +{ PASM->m_SEHD->tryTo = PASM->m_CurPC; } break; +case 369: #line 979 "asmparse.y" +{ PASM->SetTryLabels(yypvt[-2].string, yypvt[-0].string); } break; +case 370: +#line 980 "asmparse.y" { if(PASM->m_SEHD) {PASM->m_SEHD->tryFrom = yypvt[-2].int32; PASM->m_SEHD->tryTo = yypvt[-0].int32;} } break; -case 369: -#line 983 "asmparse.y" +case 371: +#line 984 "asmparse.y" { PASM->NewSEHDescriptor(); PASM->m_SEHD->tryFrom = PASM->m_CurPC; } break; -case 370: -#line 988 "asmparse.y" -{ PASM->EmitTry(); } break; -case 371: +case 372: #line 989 "asmparse.y" { PASM->EmitTry(); } break; -case 372: +case 373: #line 990 "asmparse.y" { PASM->EmitTry(); } break; -case 373: +case 374: #line 991 "asmparse.y" { PASM->EmitTry(); } break; -case 374: -#line 995 "asmparse.y" -{ PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; case 375: +#line 992 "asmparse.y" +{ PASM->EmitTry(); } break; +case 376: #line 996 "asmparse.y" +{ PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; +case 377: +#line 997 "asmparse.y" { PASM->SetFilterLabel(yypvt[-0].string); PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; -case 376: -#line 998 "asmparse.y" +case 378: +#line 999 "asmparse.y" { PASM->m_SEHD->sehFilter = yypvt[-0].int32; PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; -case 377: -#line 1002 "asmparse.y" +case 379: +#line 1003 "asmparse.y" { PASM->m_SEHD->sehClause = COR_ILEXCEPTION_CLAUSE_FILTER; PASM->m_SEHD->sehFilter = PASM->m_CurPC; } break; -case 378: -#line 1006 "asmparse.y" +case 380: +#line 1007 "asmparse.y" { PASM->m_SEHD->sehClause = COR_ILEXCEPTION_CLAUSE_NONE; PASM->SetCatchClass(yypvt[-0].token); PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; -case 379: -#line 1011 "asmparse.y" +case 381: +#line 1012 "asmparse.y" { PASM->m_SEHD->sehClause = COR_ILEXCEPTION_CLAUSE_FINALLY; PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; -case 380: -#line 1015 "asmparse.y" +case 382: +#line 1016 "asmparse.y" { PASM->m_SEHD->sehClause = COR_ILEXCEPTION_CLAUSE_FAULT; PASM->m_SEHD->sehHandler = PASM->m_CurPC; } break; -case 381: -#line 1019 "asmparse.y" -{ PASM->m_SEHD->sehHandlerTo = PASM->m_CurPC; } break; -case 382: -#line 1020 "asmparse.y" -{ PASM->SetHandlerLabels(yypvt[-2].string, yypvt[-0].string); } break; case 383: +#line 1020 "asmparse.y" +{ PASM->m_SEHD->sehHandlerTo = PASM->m_CurPC; } break; +case 384: #line 1021 "asmparse.y" +{ PASM->SetHandlerLabels(yypvt[-2].string, yypvt[-0].string); } break; +case 385: +#line 1022 "asmparse.y" { PASM->m_SEHD->sehHandler = yypvt[-2].int32; PASM->m_SEHD->sehHandlerTo = yypvt[-0].int32; } break; -case 385: -#line 1029 "asmparse.y" -{ PASM->EmitDataLabel(yypvt[-1].string); } break; case 387: -#line 1033 "asmparse.y" -{ PASM->SetDataSection(); } break; -case 388: -#line 1034 "asmparse.y" -{ PASM->SetTLSSection(); } break; +#line 1030 "asmparse.y" +{ PASM->EmitDataLabel(yypvt[-1].string); } break; case 389: +#line 1034 "asmparse.y" +{ PASM->SetDataSection(); } break; +case 390: #line 1035 "asmparse.y" +{ PASM->SetTLSSection(); } break; +case 391: +#line 1036 "asmparse.y" { PASM->SetILSection(); } break; -case 394: -#line 1046 "asmparse.y" -{ yyval.int32 = 1; } break; -case 395: +case 396: #line 1047 "asmparse.y" +{ yyval.int32 = 1; } break; +case 397: +#line 1048 "asmparse.y" { yyval.int32 = yypvt[-1].int32; if(yypvt[-1].int32 <= 0) { PASM->report->error("Illegal item count: %d\n",yypvt[-1].int32); if(!PASM->OnErrGo) yyval.int32 = 1; }} break; -case 396: -#line 1052 "asmparse.y" -{ PASM->EmitDataString(yypvt[-1].binstr); } break; -case 397: -#line 1053 "asmparse.y" -{ PASM->EmitDD(yypvt[-1].string); } break; case 398: +#line 1053 "asmparse.y" +{ PASM->EmitDataString(yypvt[-1].binstr); } break; +case 399: #line 1054 "asmparse.y" +{ PASM->EmitDD(yypvt[-1].string); } break; +case 400: +#line 1055 "asmparse.y" { PASM->EmitData(yypvt[-1].binstr->ptr(),yypvt[-1].binstr->length()); } break; -case 399: -#line 1056 "asmparse.y" +case 401: +#line 1057 "asmparse.y" { float f = (float) (*yypvt[-2].float64); float* p = new (nothrow) float[yypvt[-0].int32]; if(p != NULL) { for(int i=0; i < yypvt[-0].int32; i++) p[i] = f; PASM->EmitData(p, sizeof(float)*yypvt[-0].int32); delete yypvt[-2].float64; delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(float)*yypvt[-0].int32); } break; -case 400: -#line 1063 "asmparse.y" +case 402: +#line 1064 "asmparse.y" { double* p = new (nothrow) double[yypvt[-0].int32]; if(p != NULL) { for(int i=0; iEmitData(p, sizeof(double)*yypvt[-0].int32); delete yypvt[-2].float64; delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(double)*yypvt[-0].int32); } break; -case 401: -#line 1070 "asmparse.y" +case 403: +#line 1071 "asmparse.y" { __int64* p = new (nothrow) __int64[yypvt[-0].int32]; if(p != NULL) { for(int i=0; iEmitData(p, sizeof(__int64)*yypvt[-0].int32); delete yypvt[-2].int64; delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(__int64)*yypvt[-0].int32); } break; -case 402: -#line 1077 "asmparse.y" +case 404: +#line 1078 "asmparse.y" { __int32* p = new (nothrow) __int32[yypvt[-0].int32]; if(p != NULL) { for(int i=0; iEmitData(p, sizeof(__int32)*yypvt[-0].int32); delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(__int32)*yypvt[-0].int32); } break; -case 403: -#line 1084 "asmparse.y" +case 405: +#line 1085 "asmparse.y" { __int16 i = (__int16) yypvt[-2].int32; FAIL_UNLESS(i == yypvt[-2].int32, ("Value %d too big\n", yypvt[-2].int32)); __int16* p = new (nothrow) __int16[yypvt[-0].int32]; if(p != NULL) { @@ -3350,8 +3352,8 @@ case 403: PASM->EmitData(p, sizeof(__int16)*yypvt[-0].int32); delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(__int16)*yypvt[-0].int32); } break; -case 404: -#line 1092 "asmparse.y" +case 406: +#line 1093 "asmparse.y" { __int8 i = (__int8) yypvt[-2].int32; FAIL_UNLESS(i == yypvt[-2].int32, ("Value %d too big\n", yypvt[-2].int32)); __int8* p = new (nothrow) __int8[yypvt[-0].int32]; if(p != NULL) { @@ -3359,405 +3361,405 @@ case 404: PASM->EmitData(p, sizeof(__int8)*yypvt[-0].int32); delete [] p; } else PASM->report->error("Out of memory emitting data block %d bytes\n", sizeof(__int8)*yypvt[-0].int32); } break; -case 405: -#line 1099 "asmparse.y" -{ PASM->EmitData(NULL, sizeof(float)*yypvt[-0].int32); } break; -case 406: -#line 1100 "asmparse.y" -{ PASM->EmitData(NULL, sizeof(double)*yypvt[-0].int32); } break; case 407: -#line 1101 "asmparse.y" -{ PASM->EmitData(NULL, sizeof(__int64)*yypvt[-0].int32); } break; +#line 1100 "asmparse.y" +{ PASM->EmitData(NULL, sizeof(float)*yypvt[-0].int32); } break; case 408: -#line 1102 "asmparse.y" -{ PASM->EmitData(NULL, sizeof(__int32)*yypvt[-0].int32); } break; +#line 1101 "asmparse.y" +{ PASM->EmitData(NULL, sizeof(double)*yypvt[-0].int32); } break; case 409: -#line 1103 "asmparse.y" -{ PASM->EmitData(NULL, sizeof(__int16)*yypvt[-0].int32); } break; +#line 1102 "asmparse.y" +{ PASM->EmitData(NULL, sizeof(__int64)*yypvt[-0].int32); } break; case 410: +#line 1103 "asmparse.y" +{ PASM->EmitData(NULL, sizeof(__int32)*yypvt[-0].int32); } break; +case 411: #line 1104 "asmparse.y" +{ PASM->EmitData(NULL, sizeof(__int16)*yypvt[-0].int32); } break; +case 412: +#line 1105 "asmparse.y" { PASM->EmitData(NULL, sizeof(__int8)*yypvt[-0].int32); } break; -case 411: -#line 1108 "asmparse.y" +case 413: +#line 1109 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R4); float f = (float)(*yypvt[-1].float64); yyval.binstr->appendInt32(*((__int32*)&f)); delete yypvt[-1].float64; } break; -case 412: -#line 1111 "asmparse.y" +case 414: +#line 1112 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R8); yyval.binstr->appendInt64((__int64 *)yypvt[-1].float64); delete yypvt[-1].float64; } break; -case 413: -#line 1113 "asmparse.y" +case 415: +#line 1114 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 414: -#line 1115 "asmparse.y" +case 416: +#line 1116 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R8); yyval.binstr->appendInt64((__int64 *)yypvt[-1].int64); delete yypvt[-1].int64; } break; -case 415: -#line 1117 "asmparse.y" +case 417: +#line 1118 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I8); yyval.binstr->appendInt64((__int64 *)yypvt[-1].int64); delete yypvt[-1].int64; } break; -case 416: -#line 1119 "asmparse.y" +case 418: +#line 1120 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 417: -#line 1121 "asmparse.y" +case 419: +#line 1122 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I2); yyval.binstr->appendInt16(yypvt[-1].int32); } break; -case 418: -#line 1123 "asmparse.y" +case 420: +#line 1124 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I1); yyval.binstr->appendInt8(yypvt[-1].int32); } break; -case 419: -#line 1125 "asmparse.y" +case 421: +#line 1126 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); yyval.binstr->appendInt64((__int64 *)yypvt[-1].int64); delete yypvt[-1].int64; } break; -case 420: -#line 1127 "asmparse.y" +case 422: +#line 1128 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 421: -#line 1129 "asmparse.y" +case 423: +#line 1130 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); yyval.binstr->appendInt16(yypvt[-1].int32); } break; -case 422: -#line 1131 "asmparse.y" +case 424: +#line 1132 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); yyval.binstr->appendInt8(yypvt[-1].int32); } break; -case 423: -#line 1133 "asmparse.y" +case 425: +#line 1134 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); yyval.binstr->appendInt64((__int64 *)yypvt[-1].int64); delete yypvt[-1].int64; } break; -case 424: -#line 1135 "asmparse.y" +case 426: +#line 1136 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 425: -#line 1137 "asmparse.y" +case 427: +#line 1138 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); yyval.binstr->appendInt16(yypvt[-1].int32); } break; -case 426: -#line 1139 "asmparse.y" +case 428: +#line 1140 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); yyval.binstr->appendInt8(yypvt[-1].int32); } break; -case 427: -#line 1141 "asmparse.y" +case 429: +#line 1142 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_CHAR); yyval.binstr->appendInt16(yypvt[-1].int32); } break; -case 428: -#line 1143 "asmparse.y" +case 430: +#line 1144 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_BOOLEAN); yyval.binstr->appendInt8(yypvt[-1].int32);} break; -case 429: -#line 1145 "asmparse.y" +case 431: +#line 1146 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); yyval.binstr->append(yypvt[-1].binstr); delete yypvt[-1].binstr;} break; -case 430: -#line 1149 "asmparse.y" -{ bParsingByteArray = TRUE; } break; -case 431: -#line 1152 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; case 432: -#line 1153 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 1150 "asmparse.y" +{ bParsingByteArray = TRUE; } break; case 433: -#line 1156 "asmparse.y" -{ __int8 i = (__int8) yypvt[-0].int32; yyval.binstr = new BinStr(); yyval.binstr->appendInt8(i); } break; +#line 1153 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; case 434: -#line 1157 "asmparse.y" -{ __int8 i = (__int8) yypvt[-0].int32; yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(i); } break; -case 435: -#line 1161 "asmparse.y" +#line 1154 "asmparse.y" { yyval.binstr = yypvt[-0].binstr; } break; +case 435: +#line 1157 "asmparse.y" +{ __int8 i = (__int8) yypvt[-0].int32; yyval.binstr = new BinStr(); yyval.binstr->appendInt8(i); } break; case 436: -#line 1162 "asmparse.y" -{ yyval.binstr = BinStrToUnicode(yypvt[-0].binstr,true); yyval.binstr->insertInt8(ELEMENT_TYPE_STRING);} break; +#line 1158 "asmparse.y" +{ __int8 i = (__int8) yypvt[-0].int32; yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(i); } break; case 437: +#line 1162 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; +case 438: #line 1163 "asmparse.y" +{ yyval.binstr = BinStrToUnicode(yypvt[-0].binstr,true); yyval.binstr->insertInt8(ELEMENT_TYPE_STRING);} break; +case 439: +#line 1164 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_CLASS); yyval.binstr->appendInt32(0); } break; -case 438: -#line 1168 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; -case 439: -#line 1169 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); yyval.binstr->appendInt8(0xFF); } break; case 440: +#line 1169 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; +case 441: #line 1170 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); yyval.binstr->appendInt8(0xFF); } break; +case 442: +#line 1171 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); AppendStringWithLength(yyval.binstr,yypvt[-1].string); delete [] yypvt[-1].string;} break; -case 441: -#line 1172 "asmparse.y" +case 443: +#line 1173 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TYPE); AppendStringWithLength(yyval.binstr,yypvt[-1].string); delete [] yypvt[-1].string;} break; -case 442: -#line 1174 "asmparse.y" +case 444: +#line 1175 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TYPE); AppendStringWithLength(yyval.binstr,PASM->ReflectionNotation(yypvt[-1].token));} break; -case 443: -#line 1176 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TYPE); yyval.binstr->appendInt8(0xFF); } break; -case 444: +case 445: #line 1177 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_TYPE); yyval.binstr->appendInt8(0xFF); } break; +case 446: +#line 1178 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(SERIALIZATION_TYPE_TAGGED_OBJECT);} break; -case 445: -#line 1179 "asmparse.y" +case 447: +#line 1180 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_R4); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 446: -#line 1183 "asmparse.y" +case 448: +#line 1184 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_R8); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 447: -#line 1187 "asmparse.y" +case 449: +#line 1188 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_I8); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 448: -#line 1191 "asmparse.y" +case 450: +#line 1192 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_I4); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 449: -#line 1195 "asmparse.y" +case 451: +#line 1196 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_I2); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 450: -#line 1199 "asmparse.y" +case 452: +#line 1200 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_I1); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 451: -#line 1203 "asmparse.y" +case 453: +#line 1204 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U8); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 452: -#line 1207 "asmparse.y" +case 454: +#line 1208 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U4); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 453: -#line 1211 "asmparse.y" +case 455: +#line 1212 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U2); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 454: -#line 1215 "asmparse.y" +case 456: +#line 1216 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U1); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 455: -#line 1219 "asmparse.y" +case 457: +#line 1220 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U8); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 456: -#line 1223 "asmparse.y" +case 458: +#line 1224 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U4); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 457: -#line 1227 "asmparse.y" +case 459: +#line 1228 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U2); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 458: -#line 1231 "asmparse.y" +case 460: +#line 1232 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_U1); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 459: -#line 1235 "asmparse.y" +case 461: +#line 1236 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_CHAR); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 460: -#line 1239 "asmparse.y" +case 462: +#line 1240 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_BOOLEAN); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 461: -#line 1243 "asmparse.y" +case 463: +#line 1244 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(ELEMENT_TYPE_STRING); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 462: -#line 1247 "asmparse.y" +case 464: +#line 1248 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(SERIALIZATION_TYPE_TYPE); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 463: -#line 1251 "asmparse.y" +case 465: +#line 1252 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt32(yypvt[-4].int32); yyval.binstr->insertInt8(SERIALIZATION_TYPE_TAGGED_OBJECT); yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; -case 464: -#line 1257 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; -case 465: +case 466: #line 1258 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; +case 467: +#line 1259 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; float f = (float) (*yypvt[-0].float64); yyval.binstr->appendInt32(*((__int32*)&f)); delete yypvt[-0].float64; } break; -case 466: -#line 1260 "asmparse.y" +case 468: +#line 1261 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt32(yypvt[-0].int32); } break; -case 467: -#line 1264 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; -case 468: +case 469: #line 1265 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; +case 470: +#line 1266 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt64((__int64 *)yypvt[-0].float64); delete yypvt[-0].float64; } break; -case 469: -#line 1267 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; - yyval.binstr->appendInt64((__int64 *)yypvt[-0].int64); delete yypvt[-0].int64; } break; -case 470: -#line 1271 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; case 471: -#line 1272 "asmparse.y" +#line 1268 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt64((__int64 *)yypvt[-0].int64); delete yypvt[-0].int64; } break; case 472: -#line 1276 "asmparse.y" +#line 1272 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 473: -#line 1277 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt32(yypvt[-0].int32);} break; +#line 1273 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; + yyval.binstr->appendInt64((__int64 *)yypvt[-0].int64); delete yypvt[-0].int64; } break; case 474: -#line 1280 "asmparse.y" +#line 1277 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 475: -#line 1281 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt16(yypvt[-0].int32);} break; +#line 1278 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt32(yypvt[-0].int32);} break; case 476: -#line 1284 "asmparse.y" +#line 1281 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 477: -#line 1285 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(yypvt[-0].int32); } break; +#line 1282 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt16(yypvt[-0].int32);} break; case 478: -#line 1288 "asmparse.y" +#line 1285 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 479: -#line 1289 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; - yyval.binstr->appendInt8(yypvt[-0].int32);} break; +#line 1286 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(yypvt[-0].int32); } break; case 480: -#line 1293 "asmparse.y" +#line 1289 "asmparse.y" { yyval.binstr = new BinStr(); } break; case 481: -#line 1294 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(0xFF); } break; +#line 1290 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; + yyval.binstr->appendInt8(yypvt[-0].int32);} break; case 482: +#line 1294 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; +case 483: #line 1295 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(0xFF); } break; +case 484: +#line 1296 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; AppendStringWithLength(yyval.binstr,yypvt[-0].string); delete [] yypvt[-0].string;} break; -case 483: -#line 1299 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; -case 484: -#line 1300 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(0xFF); } break; case 485: +#line 1300 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; +case 486: #line 1301 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->appendInt8(0xFF); } break; +case 487: +#line 1302 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; AppendStringWithLength(yyval.binstr,yypvt[-0].string); delete [] yypvt[-0].string;} break; -case 486: -#line 1303 "asmparse.y" +case 488: +#line 1304 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; AppendStringWithLength(yyval.binstr,PASM->ReflectionNotation(yypvt[-0].token));} break; -case 487: -#line 1307 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; -case 488: +case 489: #line 1308 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; +case 490: +#line 1309 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; -case 489: -#line 1312 "asmparse.y" +case 491: +#line 1313 "asmparse.y" { parser->m_ANSFirst.PUSH(PASM->m_firstArgName); parser->m_ANSLast.PUSH(PASM->m_lastArgName); PASM->m_firstArgName = NULL; PASM->m_lastArgName = NULL; } break; -case 490: -#line 1318 "asmparse.y" -{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; -case 491: -#line 1321 "asmparse.y" -{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 492: -#line 1324 "asmparse.y" +#line 1319 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 493: -#line 1327 "asmparse.y" +#line 1322 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 494: -#line 1330 "asmparse.y" +#line 1325 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 495: -#line 1333 "asmparse.y" +#line 1328 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 496: -#line 1336 "asmparse.y" +#line 1331 "asmparse.y" +{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; +case 497: +#line 1334 "asmparse.y" +{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; +case 498: +#line 1337 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); if((!PASM->OnErrGo)&& ((yypvt[-0].opcode == CEE_NEWOBJ)|| (yypvt[-0].opcode == CEE_CALLVIRT))) iCallConv = IMAGE_CEE_CS_CALLCONV_HASTHIS; } break; -case 497: -#line 1344 "asmparse.y" -{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; -case 498: -#line 1347 "asmparse.y" -{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 499: -#line 1350 "asmparse.y" +#line 1345 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 500: -#line 1353 "asmparse.y" +#line 1348 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 501: -#line 1356 "asmparse.y" -{ yyval.instr = SetupInstr(yypvt[-0].opcode); iOpcodeLen = PASM->OpcodeLen(yyval.instr); } break; +#line 1351 "asmparse.y" +{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 502: -#line 1359 "asmparse.y" +#line 1354 "asmparse.y" { yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 503: -#line 1362 "asmparse.y" -{ yyval.instr = yypvt[-1].instr; bParsingByteArray = TRUE; } break; +#line 1357 "asmparse.y" +{ yyval.instr = SetupInstr(yypvt[-0].opcode); iOpcodeLen = PASM->OpcodeLen(yyval.instr); } break; case 504: -#line 1366 "asmparse.y" -{ PASM->EmitOpcode(yypvt[-0].instr); } break; +#line 1360 "asmparse.y" +{ yyval.instr = SetupInstr(yypvt[-0].opcode); } break; case 505: -#line 1367 "asmparse.y" -{ PASM->EmitInstrVar(yypvt[-1].instr, yypvt[-0].int32); } break; +#line 1363 "asmparse.y" +{ yyval.instr = yypvt[-1].instr; bParsingByteArray = TRUE; } break; case 506: -#line 1368 "asmparse.y" -{ PASM->EmitInstrVarByName(yypvt[-1].instr, yypvt[-0].string); } break; +#line 1367 "asmparse.y" +{ PASM->EmitOpcode(yypvt[-0].instr); } break; case 507: -#line 1369 "asmparse.y" -{ PASM->EmitInstrI(yypvt[-1].instr, yypvt[-0].int32); } break; +#line 1368 "asmparse.y" +{ PASM->EmitInstrVar(yypvt[-1].instr, yypvt[-0].int32); } break; case 508: -#line 1370 "asmparse.y" -{ PASM->EmitInstrI8(yypvt[-1].instr, yypvt[-0].int64); } break; +#line 1369 "asmparse.y" +{ PASM->EmitInstrVarByName(yypvt[-1].instr, yypvt[-0].string); } break; case 509: -#line 1371 "asmparse.y" -{ PASM->EmitInstrR(yypvt[-1].instr, yypvt[-0].float64); delete (yypvt[-0].float64);} break; +#line 1370 "asmparse.y" +{ PASM->EmitInstrI(yypvt[-1].instr, yypvt[-0].int32); } break; case 510: -#line 1372 "asmparse.y" -{ double f = (double) (*yypvt[-0].int64); PASM->EmitInstrR(yypvt[-1].instr, &f); } break; +#line 1371 "asmparse.y" +{ PASM->EmitInstrI8(yypvt[-1].instr, yypvt[-0].int64); } break; case 511: +#line 1372 "asmparse.y" +{ PASM->EmitInstrR(yypvt[-1].instr, yypvt[-0].float64); delete (yypvt[-0].float64);} break; +case 512: #line 1373 "asmparse.y" +{ double f = (double) (*yypvt[-0].int64); PASM->EmitInstrR(yypvt[-1].instr, &f); } break; +case 513: +#line 1374 "asmparse.y" { unsigned L = yypvt[-1].binstr->length(); FAIL_UNLESS(L >= sizeof(float), ("%d hexbytes, must be at least %d\n", L,sizeof(float))); @@ -3767,22 +3769,22 @@ case 511: : (double)(*(float *)(yypvt[-1].binstr->ptr())); PASM->EmitInstrR(yypvt[-2].instr,&f); } delete yypvt[-1].binstr; } break; -case 512: -#line 1382 "asmparse.y" -{ PASM->EmitInstrBrOffset(yypvt[-1].instr, yypvt[-0].int32); } break; -case 513: +case 514: #line 1383 "asmparse.y" +{ PASM->EmitInstrBrOffset(yypvt[-1].instr, yypvt[-0].int32); } break; +case 515: +#line 1384 "asmparse.y" { PASM->EmitInstrBrTarget(yypvt[-1].instr, yypvt[-0].string); } break; -case 514: -#line 1385 "asmparse.y" +case 516: +#line 1386 "asmparse.y" { PASM->SetMemberRefFixup(yypvt[-0].token,PASM->OpcodeLen(yypvt[-1].instr)); PASM->EmitInstrI(yypvt[-1].instr,yypvt[-0].token); PASM->m_tkCurrentCVOwner = yypvt[-0].token; PASM->m_pCustomDescrList = NULL; iCallConv = 0; } break; -case 515: -#line 1392 "asmparse.y" +case 517: +#line 1393 "asmparse.y" { yypvt[-3].binstr->insertInt8(IMAGE_CEE_CS_CALLCONV_FIELD); mdToken mr = PASM->MakeMemberRef(yypvt[-2].token, yypvt[-0].string, yypvt[-3].binstr); PASM->SetMemberRefFixup(mr, PASM->OpcodeLen(yypvt[-4].instr)); @@ -3790,8 +3792,8 @@ case 515: PASM->m_tkCurrentCVOwner = mr; PASM->m_pCustomDescrList = NULL; } break; -case 516: -#line 1400 "asmparse.y" +case 518: +#line 1401 "asmparse.y" { yypvt[-1].binstr->insertInt8(IMAGE_CEE_CS_CALLCONV_FIELD); mdToken mr = PASM->MakeMemberRef(mdTokenNil, yypvt[-0].string, yypvt[-1].binstr); PASM->SetMemberRefFixup(mr, PASM->OpcodeLen(yypvt[-2].instr)); @@ -3799,578 +3801,578 @@ case 516: PASM->m_tkCurrentCVOwner = mr; PASM->m_pCustomDescrList = NULL; } break; -case 517: -#line 1407 "asmparse.y" +case 519: +#line 1408 "asmparse.y" { mdToken mr = yypvt[-0].token; PASM->SetMemberRefFixup(mr, PASM->OpcodeLen(yypvt[-1].instr)); PASM->EmitInstrI(yypvt[-1].instr,mr); PASM->m_tkCurrentCVOwner = mr; PASM->m_pCustomDescrList = NULL; } break; -case 518: -#line 1413 "asmparse.y" +case 520: +#line 1414 "asmparse.y" { mdToken mr = yypvt[-0].tdd->m_tkTypeSpec; PASM->SetMemberRefFixup(mr, PASM->OpcodeLen(yypvt[-1].instr)); PASM->EmitInstrI(yypvt[-1].instr,mr); PASM->m_tkCurrentCVOwner = mr; PASM->m_pCustomDescrList = NULL; } break; -case 519: -#line 1419 "asmparse.y" +case 521: +#line 1420 "asmparse.y" { mdToken mr = yypvt[-0].tdd->m_tkTypeSpec; PASM->SetMemberRefFixup(mr, PASM->OpcodeLen(yypvt[-1].instr)); PASM->EmitInstrI(yypvt[-1].instr,mr); PASM->m_tkCurrentCVOwner = mr; PASM->m_pCustomDescrList = NULL; } break; -case 520: -#line 1425 "asmparse.y" +case 522: +#line 1426 "asmparse.y" { PASM->EmitInstrI(yypvt[-1].instr, yypvt[-0].token); PASM->m_tkCurrentCVOwner = yypvt[-0].token; PASM->m_pCustomDescrList = NULL; } break; -case 521: -#line 1429 "asmparse.y" +case 523: +#line 1430 "asmparse.y" { PASM->EmitInstrStringLiteral(yypvt[-1].instr, yypvt[-0].binstr,TRUE); } break; -case 522: -#line 1431 "asmparse.y" +case 524: +#line 1432 "asmparse.y" { PASM->EmitInstrStringLiteral(yypvt[-4].instr, yypvt[-1].binstr,FALSE); } break; -case 523: -#line 1433 "asmparse.y" +case 525: +#line 1434 "asmparse.y" { PASM->EmitInstrStringLiteral(yypvt[-3].instr, yypvt[-1].binstr,FALSE,TRUE); } break; -case 524: -#line 1435 "asmparse.y" +case 526: +#line 1436 "asmparse.y" { PASM->EmitInstrSig(yypvt[-5].instr, parser->MakeSig(yypvt[-4].int32, yypvt[-3].binstr, yypvt[-1].binstr)); PASM->ResetArgNameList(); } break; -case 525: -#line 1439 "asmparse.y" +case 527: +#line 1440 "asmparse.y" { PASM->EmitInstrI(yypvt[-1].instr,yypvt[-0].token); PASM->m_tkCurrentCVOwner = yypvt[-0].token; PASM->m_pCustomDescrList = NULL; iOpcodeLen = 0; } break; -case 526: -#line 1444 "asmparse.y" -{ PASM->EmitInstrSwitch(yypvt[-3].instr, yypvt[-1].labels); } break; -case 527: -#line 1447 "asmparse.y" -{ yyval.labels = 0; } break; case 528: -#line 1448 "asmparse.y" -{ yyval.labels = new Labels(yypvt[-2].string, yypvt[-0].labels, TRUE); } break; +#line 1445 "asmparse.y" +{ PASM->EmitInstrSwitch(yypvt[-3].instr, yypvt[-1].labels); } break; case 529: -#line 1449 "asmparse.y" -{ yyval.labels = new Labels((char *)(UINT_PTR)yypvt[-2].int32, yypvt[-0].labels, FALSE); } break; +#line 1448 "asmparse.y" +{ yyval.labels = 0; } break; case 530: -#line 1450 "asmparse.y" -{ yyval.labels = new Labels(yypvt[-0].string, NULL, TRUE); } break; +#line 1449 "asmparse.y" +{ yyval.labels = new Labels(yypvt[-2].string, yypvt[-0].labels, TRUE); } break; case 531: -#line 1451 "asmparse.y" -{ yyval.labels = new Labels((char *)(UINT_PTR)yypvt[-0].int32, NULL, FALSE); } break; +#line 1450 "asmparse.y" +{ yyval.labels = new Labels((char *)(UINT_PTR)yypvt[-2].int32, yypvt[-0].labels, FALSE); } break; case 532: -#line 1455 "asmparse.y" -{ yyval.binstr = NULL; } break; +#line 1451 "asmparse.y" +{ yyval.labels = new Labels(yypvt[-0].string, NULL, TRUE); } break; case 533: -#line 1456 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; } break; +#line 1452 "asmparse.y" +{ yyval.labels = new Labels((char *)(UINT_PTR)yypvt[-0].int32, NULL, FALSE); } break; case 534: -#line 1459 "asmparse.y" +#line 1456 "asmparse.y" { yyval.binstr = NULL; } break; case 535: -#line 1460 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 1457 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; } break; case 536: -#line 1463 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 1460 "asmparse.y" +{ yyval.binstr = NULL; } break; case 537: -#line 1464 "asmparse.y" -{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; +#line 1461 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 538: -#line 1468 "asmparse.y" -{ yyval.binstr = new BinStr(); } break; +#line 1464 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 539: -#line 1469 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr;} break; +#line 1465 "asmparse.y" +{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; case 540: -#line 1472 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 1469 "asmparse.y" +{ yyval.binstr = new BinStr(); } break; case 541: -#line 1473 "asmparse.y" -{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; +#line 1470 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr;} break; case 542: -#line 1476 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_SENTINEL); } break; +#line 1473 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 543: -#line 1477 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-1].binstr); PASM->addArgName(NULL, yypvt[-1].binstr, yypvt[-0].binstr, yypvt[-2].int32); } break; +#line 1474 "asmparse.y" +{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; case 544: -#line 1478 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-2].binstr); PASM->addArgName(yypvt[-0].string, yypvt[-2].binstr, yypvt[-1].binstr, yypvt[-3].int32);} break; +#line 1477 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_SENTINEL); } break; case 545: -#line 1482 "asmparse.y" -{ yyval.token = PASM->ResolveClassRef(PASM->GetAsmRef(yypvt[-2].string), yypvt[-0].string, NULL); delete[] yypvt[-2].string;} break; +#line 1478 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-1].binstr); PASM->addArgName(NULL, yypvt[-1].binstr, yypvt[-0].binstr, yypvt[-2].int32); } break; case 546: -#line 1483 "asmparse.y" -{ yyval.token = PASM->ResolveClassRef(yypvt[-2].token, yypvt[-0].string, NULL); } break; +#line 1479 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-2].binstr); PASM->addArgName(yypvt[-0].string, yypvt[-2].binstr, yypvt[-1].binstr, yypvt[-3].int32);} break; case 547: -#line 1484 "asmparse.y" -{ yyval.token = PASM->ResolveClassRef(mdTokenNil, yypvt[-0].string, NULL); } break; +#line 1483 "asmparse.y" +{ yyval.token = PASM->ResolveClassRef(PASM->GetAsmRef(yypvt[-2].string), yypvt[-0].string, NULL); delete[] yypvt[-2].string;} break; case 548: -#line 1485 "asmparse.y" -{ yyval.token = PASM->ResolveClassRef(PASM->GetModRef(yypvt[-2].string),yypvt[-0].string, NULL); delete[] yypvt[-2].string;} break; +#line 1484 "asmparse.y" +{ yyval.token = PASM->ResolveClassRef(yypvt[-2].token, yypvt[-0].string, NULL); } break; case 549: -#line 1486 "asmparse.y" -{ yyval.token = PASM->ResolveClassRef(1,yypvt[-0].string,NULL); } break; +#line 1485 "asmparse.y" +{ yyval.token = PASM->ResolveClassRef(mdTokenNil, yypvt[-0].string, NULL); } break; case 550: -#line 1487 "asmparse.y" -{ yyval.token = yypvt[-0].token; } break; +#line 1486 "asmparse.y" +{ yyval.token = PASM->ResolveClassRef(PASM->GetModRef(yypvt[-2].string),yypvt[-0].string, NULL); delete[] yypvt[-2].string;} break; case 551: -#line 1488 "asmparse.y" -{ yyval.token = yypvt[-0].tdd->m_tkTypeSpec; } break; +#line 1487 "asmparse.y" +{ yyval.token = PASM->ResolveClassRef(1,yypvt[-0].string,NULL); } break; case 552: +#line 1488 "asmparse.y" +{ yyval.token = yypvt[-0].token; } break; +case 553: #line 1489 "asmparse.y" +{ yyval.token = yypvt[-0].tdd->m_tkTypeSpec; } break; +case 554: +#line 1490 "asmparse.y" { if(PASM->m_pCurClass != NULL) yyval.token = PASM->m_pCurClass->m_cl; else { yyval.token = 0; PASM->report->error(".this outside class scope\n"); } } break; -case 553: -#line 1492 "asmparse.y" +case 555: +#line 1493 "asmparse.y" { if(PASM->m_pCurClass != NULL) { yyval.token = PASM->m_pCurClass->m_crExtends; if(RidFromToken(yyval.token) == 0) PASM->report->error(".base undefined\n"); } else { yyval.token = 0; PASM->report->error(".base outside class scope\n"); } } break; -case 554: -#line 1498 "asmparse.y" +case 556: +#line 1499 "asmparse.y" { if(PASM->m_pCurClass != NULL) { if(PASM->m_pCurClass->m_pEncloser != NULL) yyval.token = PASM->m_pCurClass->m_pEncloser->m_cl; else { yyval.token = 0; PASM->report->error(".nester undefined\n"); } } else { yyval.token = 0; PASM->report->error(".nester outside class scope\n"); } } break; -case 555: -#line 1505 "asmparse.y" -{ yyval.string = yypvt[-0].string; } break; -case 556: -#line 1506 "asmparse.y" -{ yyval.string = newStringWDel(yypvt[-2].string, NESTING_SEP, yypvt[-0].string); } break; case 557: -#line 1509 "asmparse.y" -{ yyval.token = yypvt[-0].token;} break; +#line 1506 "asmparse.y" +{ yyval.string = yypvt[-0].string; } break; case 558: -#line 1510 "asmparse.y" -{ yyval.token = PASM->GetAsmRef(yypvt[-1].string); delete[] yypvt[-1].string;} break; +#line 1507 "asmparse.y" +{ yyval.string = newStringWDel(yypvt[-2].string, NESTING_SEP, yypvt[-0].string); } break; case 559: -#line 1511 "asmparse.y" -{ yyval.token = PASM->GetModRef(yypvt[-1].string); delete[] yypvt[-1].string;} break; +#line 1510 "asmparse.y" +{ yyval.token = yypvt[-0].token;} break; case 560: +#line 1511 "asmparse.y" +{ yyval.token = PASM->GetAsmRef(yypvt[-1].string); delete[] yypvt[-1].string;} break; +case 561: #line 1512 "asmparse.y" +{ yyval.token = PASM->GetModRef(yypvt[-1].string); delete[] yypvt[-1].string;} break; +case 562: +#line 1513 "asmparse.y" { yyval.token = PASM->ResolveTypeSpec(yypvt[-0].binstr); } break; -case 561: -#line 1516 "asmparse.y" +case 563: +#line 1517 "asmparse.y" { yyval.binstr = new BinStr(); } break; -case 562: -#line 1518 "asmparse.y" +case 564: +#line 1519 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_CUSTOMMARSHALER); corEmitInt(yyval.binstr,yypvt[-7].binstr->length()); yyval.binstr->append(yypvt[-7].binstr); corEmitInt(yyval.binstr,yypvt[-5].binstr->length()); yyval.binstr->append(yypvt[-5].binstr); corEmitInt(yyval.binstr,yypvt[-3].binstr->length()); yyval.binstr->append(yypvt[-3].binstr); corEmitInt(yyval.binstr,yypvt[-1].binstr->length()); yyval.binstr->append(yypvt[-1].binstr); PASM->report->warn("Deprecated 4-string form of custom marshaler, first two strings ignored\n");} break; -case 563: -#line 1525 "asmparse.y" +case 565: +#line 1526 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_CUSTOMMARSHALER); corEmitInt(yyval.binstr,0); corEmitInt(yyval.binstr,0); corEmitInt(yyval.binstr,yypvt[-3].binstr->length()); yyval.binstr->append(yypvt[-3].binstr); corEmitInt(yyval.binstr,yypvt[-1].binstr->length()); yyval.binstr->append(yypvt[-1].binstr); } break; -case 564: -#line 1530 "asmparse.y" +case 566: +#line 1531 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_FIXEDSYSSTRING); corEmitInt(yyval.binstr,yypvt[-1].int32); } break; -case 565: -#line 1533 "asmparse.y" +case 567: +#line 1534 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_FIXEDARRAY); corEmitInt(yyval.binstr,yypvt[-2].int32); yyval.binstr->append(yypvt[-0].binstr); } break; -case 566: -#line 1535 "asmparse.y" +case 568: +#line 1536 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_VARIANT); PASM->report->warn("Deprecated native type 'variant'\n"); } break; -case 567: -#line 1537 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_CURRENCY); } break; -case 568: +case 569: #line 1538 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_CURRENCY); } break; +case 570: +#line 1539 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_SYSCHAR); PASM->report->warn("Deprecated native type 'syschar'\n"); } break; -case 569: -#line 1540 "asmparse.y" +case 571: +#line 1541 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_VOID); PASM->report->warn("Deprecated native type 'void'\n"); } break; -case 570: -#line 1542 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BOOLEAN); } break; -case 571: -#line 1543 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I1); } break; case 572: -#line 1544 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I2); } break; +#line 1543 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BOOLEAN); } break; case 573: -#line 1545 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I4); } break; +#line 1544 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I1); } break; case 574: -#line 1546 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I8); } break; +#line 1545 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I2); } break; case 575: -#line 1547 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_R4); } break; +#line 1546 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I4); } break; case 576: -#line 1548 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_R8); } break; +#line 1547 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_I8); } break; case 577: -#line 1549 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ERROR); } break; +#line 1548 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_R4); } break; case 578: -#line 1550 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U1); } break; +#line 1549 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_R8); } break; case 579: -#line 1551 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U2); } break; +#line 1550 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ERROR); } break; case 580: +#line 1551 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U1); } break; +case 581: #line 1552 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U4); } break; -case 581: -#line 1553 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U8); } break; +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U2); } break; case 582: -#line 1554 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U1); } break; +#line 1553 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U4); } break; case 583: -#line 1555 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U2); } break; +#line 1554 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U8); } break; case 584: -#line 1556 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U4); } break; +#line 1555 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U1); } break; case 585: -#line 1557 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U8); } break; +#line 1556 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U2); } break; case 586: +#line 1557 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U4); } break; +case 587: #line 1558 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_U8); } break; +case 588: +#line 1559 "asmparse.y" { yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(NATIVE_TYPE_PTR); PASM->report->warn("Deprecated native type '*'\n"); } break; -case 587: -#line 1560 "asmparse.y" +case 589: +#line 1561 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; if(yyval.binstr->length()==0) yyval.binstr->appendInt8(NATIVE_TYPE_MAX); yyval.binstr->insertInt8(NATIVE_TYPE_ARRAY); } break; -case 588: -#line 1562 "asmparse.y" +case 590: +#line 1563 "asmparse.y" { yyval.binstr = yypvt[-3].binstr; if(yyval.binstr->length()==0) yyval.binstr->appendInt8(NATIVE_TYPE_MAX); yyval.binstr->insertInt8(NATIVE_TYPE_ARRAY); corEmitInt(yyval.binstr,0); corEmitInt(yyval.binstr,yypvt[-1].int32); corEmitInt(yyval.binstr,0); } break; -case 589: -#line 1567 "asmparse.y" +case 591: +#line 1568 "asmparse.y" { yyval.binstr = yypvt[-5].binstr; if(yyval.binstr->length()==0) yyval.binstr->appendInt8(NATIVE_TYPE_MAX); yyval.binstr->insertInt8(NATIVE_TYPE_ARRAY); corEmitInt(yyval.binstr,yypvt[-1].int32); corEmitInt(yyval.binstr,yypvt[-3].int32); corEmitInt(yyval.binstr,ntaSizeParamIndexSpecified); } break; -case 590: -#line 1572 "asmparse.y" +case 592: +#line 1573 "asmparse.y" { yyval.binstr = yypvt[-4].binstr; if(yyval.binstr->length()==0) yyval.binstr->appendInt8(NATIVE_TYPE_MAX); yyval.binstr->insertInt8(NATIVE_TYPE_ARRAY); corEmitInt(yyval.binstr,yypvt[-1].int32); } break; -case 591: -#line 1575 "asmparse.y" +case 593: +#line 1576 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_DECIMAL); PASM->report->warn("Deprecated native type 'decimal'\n"); } break; -case 592: -#line 1577 "asmparse.y" +case 594: +#line 1578 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_DATE); PASM->report->warn("Deprecated native type 'date'\n"); } break; -case 593: -#line 1579 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BSTR); } break; -case 594: -#line 1580 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPSTR); } break; case 595: -#line 1581 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPWSTR); } break; +#line 1580 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BSTR); } break; case 596: -#line 1582 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPTSTR); } break; +#line 1581 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPSTR); } break; case 597: +#line 1582 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPWSTR); } break; +case 598: #line 1583 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPTSTR); } break; +case 599: +#line 1584 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_OBJECTREF); PASM->report->warn("Deprecated native type 'objectref'\n"); } break; -case 598: -#line 1585 "asmparse.y" +case 600: +#line 1586 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_IUNKNOWN); if(yypvt[-0].int32 != -1) corEmitInt(yyval.binstr,yypvt[-0].int32); } break; -case 599: -#line 1587 "asmparse.y" +case 601: +#line 1588 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_IDISPATCH); if(yypvt[-0].int32 != -1) corEmitInt(yyval.binstr,yypvt[-0].int32); } break; -case 600: -#line 1589 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_STRUCT); } break; -case 601: +case 602: #line 1590 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_STRUCT); } break; +case 603: +#line 1591 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_INTF); if(yypvt[-0].int32 != -1) corEmitInt(yyval.binstr,yypvt[-0].int32); } break; -case 602: -#line 1592 "asmparse.y" +case 604: +#line 1593 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_SAFEARRAY); corEmitInt(yyval.binstr,yypvt[-0].int32); corEmitInt(yyval.binstr,0);} break; -case 603: -#line 1595 "asmparse.y" +case 605: +#line 1596 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_SAFEARRAY); corEmitInt(yyval.binstr,yypvt[-2].int32); corEmitInt(yyval.binstr,yypvt[-0].binstr->length()); yyval.binstr->append(yypvt[-0].binstr); } break; -case 604: -#line 1599 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_INT); } break; -case 605: -#line 1600 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_UINT); } break; case 606: +#line 1600 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_INT); } break; +case 607: #line 1601 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_UINT); } break; -case 607: +case 608: #line 1602 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_UINT); } break; +case 609: +#line 1603 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_NESTEDSTRUCT); PASM->report->warn("Deprecated native type 'nested struct'\n"); } break; -case 608: -#line 1604 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BYVALSTR); } break; -case 609: -#line 1605 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ANSIBSTR); } break; case 610: -#line 1606 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_TBSTR); } break; +#line 1605 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_BYVALSTR); } break; case 611: -#line 1607 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_VARIANTBOOL); } break; +#line 1606 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ANSIBSTR); } break; case 612: -#line 1608 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_FUNC); } break; +#line 1607 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_TBSTR); } break; case 613: -#line 1609 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ASANY); } break; +#line 1608 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_VARIANTBOOL); } break; case 614: -#line 1610 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPSTRUCT); } break; +#line 1609 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_FUNC); } break; case 615: -#line 1611 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-0].tdd->m_pbsTypeSpec); } break; +#line 1610 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_ASANY); } break; case 616: -#line 1614 "asmparse.y" -{ yyval.int32 = -1; } break; +#line 1611 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(NATIVE_TYPE_LPSTRUCT); } break; case 617: -#line 1615 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32; } break; +#line 1612 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-0].tdd->m_pbsTypeSpec); } break; case 618: -#line 1618 "asmparse.y" -{ yyval.int32 = VT_EMPTY; } break; +#line 1615 "asmparse.y" +{ yyval.int32 = -1; } break; case 619: -#line 1619 "asmparse.y" -{ yyval.int32 = VT_NULL; } break; +#line 1616 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32; } break; case 620: -#line 1620 "asmparse.y" -{ yyval.int32 = VT_VARIANT; } break; +#line 1619 "asmparse.y" +{ yyval.int32 = VT_EMPTY; } break; case 621: -#line 1621 "asmparse.y" -{ yyval.int32 = VT_CY; } break; +#line 1620 "asmparse.y" +{ yyval.int32 = VT_NULL; } break; case 622: -#line 1622 "asmparse.y" -{ yyval.int32 = VT_VOID; } break; +#line 1621 "asmparse.y" +{ yyval.int32 = VT_VARIANT; } break; case 623: -#line 1623 "asmparse.y" -{ yyval.int32 = VT_BOOL; } break; +#line 1622 "asmparse.y" +{ yyval.int32 = VT_CY; } break; case 624: -#line 1624 "asmparse.y" -{ yyval.int32 = VT_I1; } break; +#line 1623 "asmparse.y" +{ yyval.int32 = VT_VOID; } break; case 625: -#line 1625 "asmparse.y" -{ yyval.int32 = VT_I2; } break; +#line 1624 "asmparse.y" +{ yyval.int32 = VT_BOOL; } break; case 626: -#line 1626 "asmparse.y" -{ yyval.int32 = VT_I4; } break; +#line 1625 "asmparse.y" +{ yyval.int32 = VT_I1; } break; case 627: -#line 1627 "asmparse.y" -{ yyval.int32 = VT_I8; } break; +#line 1626 "asmparse.y" +{ yyval.int32 = VT_I2; } break; case 628: -#line 1628 "asmparse.y" -{ yyval.int32 = VT_R4; } break; +#line 1627 "asmparse.y" +{ yyval.int32 = VT_I4; } break; case 629: -#line 1629 "asmparse.y" -{ yyval.int32 = VT_R8; } break; +#line 1628 "asmparse.y" +{ yyval.int32 = VT_I8; } break; case 630: -#line 1630 "asmparse.y" -{ yyval.int32 = VT_UI1; } break; +#line 1629 "asmparse.y" +{ yyval.int32 = VT_R4; } break; case 631: -#line 1631 "asmparse.y" -{ yyval.int32 = VT_UI2; } break; +#line 1630 "asmparse.y" +{ yyval.int32 = VT_R8; } break; case 632: -#line 1632 "asmparse.y" -{ yyval.int32 = VT_UI4; } break; +#line 1631 "asmparse.y" +{ yyval.int32 = VT_UI1; } break; case 633: -#line 1633 "asmparse.y" -{ yyval.int32 = VT_UI8; } break; +#line 1632 "asmparse.y" +{ yyval.int32 = VT_UI2; } break; case 634: -#line 1634 "asmparse.y" -{ yyval.int32 = VT_UI1; } break; +#line 1633 "asmparse.y" +{ yyval.int32 = VT_UI4; } break; case 635: -#line 1635 "asmparse.y" -{ yyval.int32 = VT_UI2; } break; +#line 1634 "asmparse.y" +{ yyval.int32 = VT_UI8; } break; case 636: -#line 1636 "asmparse.y" -{ yyval.int32 = VT_UI4; } break; +#line 1635 "asmparse.y" +{ yyval.int32 = VT_UI1; } break; case 637: -#line 1637 "asmparse.y" -{ yyval.int32 = VT_UI8; } break; +#line 1636 "asmparse.y" +{ yyval.int32 = VT_UI2; } break; case 638: -#line 1638 "asmparse.y" -{ yyval.int32 = VT_PTR; } break; +#line 1637 "asmparse.y" +{ yyval.int32 = VT_UI4; } break; case 639: -#line 1639 "asmparse.y" -{ yyval.int32 = yypvt[-2].int32 | VT_ARRAY; } break; +#line 1638 "asmparse.y" +{ yyval.int32 = VT_UI8; } break; case 640: -#line 1640 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32 | VT_VECTOR; } break; +#line 1639 "asmparse.y" +{ yyval.int32 = VT_PTR; } break; case 641: -#line 1641 "asmparse.y" -{ yyval.int32 = yypvt[-1].int32 | VT_BYREF; } break; +#line 1640 "asmparse.y" +{ yyval.int32 = yypvt[-2].int32 | VT_ARRAY; } break; case 642: -#line 1642 "asmparse.y" -{ yyval.int32 = VT_DECIMAL; } break; +#line 1641 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32 | VT_VECTOR; } break; case 643: -#line 1643 "asmparse.y" -{ yyval.int32 = VT_DATE; } break; +#line 1642 "asmparse.y" +{ yyval.int32 = yypvt[-1].int32 | VT_BYREF; } break; case 644: -#line 1644 "asmparse.y" -{ yyval.int32 = VT_BSTR; } break; +#line 1643 "asmparse.y" +{ yyval.int32 = VT_DECIMAL; } break; case 645: -#line 1645 "asmparse.y" -{ yyval.int32 = VT_LPSTR; } break; +#line 1644 "asmparse.y" +{ yyval.int32 = VT_DATE; } break; case 646: -#line 1646 "asmparse.y" -{ yyval.int32 = VT_LPWSTR; } break; +#line 1645 "asmparse.y" +{ yyval.int32 = VT_BSTR; } break; case 647: -#line 1647 "asmparse.y" -{ yyval.int32 = VT_UNKNOWN; } break; +#line 1646 "asmparse.y" +{ yyval.int32 = VT_LPSTR; } break; case 648: -#line 1648 "asmparse.y" -{ yyval.int32 = VT_DISPATCH; } break; +#line 1647 "asmparse.y" +{ yyval.int32 = VT_LPWSTR; } break; case 649: -#line 1649 "asmparse.y" -{ yyval.int32 = VT_SAFEARRAY; } break; +#line 1648 "asmparse.y" +{ yyval.int32 = VT_UNKNOWN; } break; case 650: -#line 1650 "asmparse.y" -{ yyval.int32 = VT_INT; } break; +#line 1649 "asmparse.y" +{ yyval.int32 = VT_DISPATCH; } break; case 651: -#line 1651 "asmparse.y" -{ yyval.int32 = VT_UINT; } break; +#line 1650 "asmparse.y" +{ yyval.int32 = VT_SAFEARRAY; } break; case 652: +#line 1651 "asmparse.y" +{ yyval.int32 = VT_INT; } break; +case 653: #line 1652 "asmparse.y" { yyval.int32 = VT_UINT; } break; -case 653: -#line 1653 "asmparse.y" -{ yyval.int32 = VT_ERROR; } break; case 654: -#line 1654 "asmparse.y" -{ yyval.int32 = VT_HRESULT; } break; +#line 1653 "asmparse.y" +{ yyval.int32 = VT_UINT; } break; case 655: -#line 1655 "asmparse.y" -{ yyval.int32 = VT_CARRAY; } break; +#line 1654 "asmparse.y" +{ yyval.int32 = VT_ERROR; } break; case 656: -#line 1656 "asmparse.y" -{ yyval.int32 = VT_USERDEFINED; } break; +#line 1655 "asmparse.y" +{ yyval.int32 = VT_HRESULT; } break; case 657: -#line 1657 "asmparse.y" -{ yyval.int32 = VT_RECORD; } break; +#line 1656 "asmparse.y" +{ yyval.int32 = VT_CARRAY; } break; case 658: -#line 1658 "asmparse.y" -{ yyval.int32 = VT_FILETIME; } break; +#line 1657 "asmparse.y" +{ yyval.int32 = VT_USERDEFINED; } break; case 659: -#line 1659 "asmparse.y" -{ yyval.int32 = VT_BLOB; } break; +#line 1658 "asmparse.y" +{ yyval.int32 = VT_RECORD; } break; case 660: -#line 1660 "asmparse.y" -{ yyval.int32 = VT_STREAM; } break; +#line 1659 "asmparse.y" +{ yyval.int32 = VT_FILETIME; } break; case 661: -#line 1661 "asmparse.y" -{ yyval.int32 = VT_STORAGE; } break; +#line 1660 "asmparse.y" +{ yyval.int32 = VT_BLOB; } break; case 662: -#line 1662 "asmparse.y" -{ yyval.int32 = VT_STREAMED_OBJECT; } break; +#line 1661 "asmparse.y" +{ yyval.int32 = VT_STREAM; } break; case 663: -#line 1663 "asmparse.y" -{ yyval.int32 = VT_STORED_OBJECT; } break; +#line 1662 "asmparse.y" +{ yyval.int32 = VT_STORAGE; } break; case 664: -#line 1664 "asmparse.y" -{ yyval.int32 = VT_BLOB_OBJECT; } break; +#line 1663 "asmparse.y" +{ yyval.int32 = VT_STREAMED_OBJECT; } break; case 665: -#line 1665 "asmparse.y" -{ yyval.int32 = VT_CF; } break; +#line 1664 "asmparse.y" +{ yyval.int32 = VT_STORED_OBJECT; } break; case 666: +#line 1665 "asmparse.y" +{ yyval.int32 = VT_BLOB_OBJECT; } break; +case 667: #line 1666 "asmparse.y" +{ yyval.int32 = VT_CF; } break; +case 668: +#line 1667 "asmparse.y" { yyval.int32 = VT_CLSID; } break; -case 667: -#line 1670 "asmparse.y" +case 669: +#line 1671 "asmparse.y" { if(yypvt[-0].token == PASM->m_tkSysString) { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); } else if(yypvt[-0].token == PASM->m_tkSysObject) { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_OBJECT); } else yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_CLASS, yypvt[-0].token); } break; -case 668: -#line 1676 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_OBJECT); } break; -case 669: -#line 1677 "asmparse.y" -{ yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_VALUETYPE, yypvt[-0].token); } break; case 670: +#line 1677 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_OBJECT); } break; +case 671: #line 1678 "asmparse.y" { yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_VALUETYPE, yypvt[-0].token); } break; -case 671: -#line 1679 "asmparse.y" -{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; case 672: -#line 1680 "asmparse.y" -{ yyval.binstr = parser->MakeTypeArray(ELEMENT_TYPE_ARRAY, yypvt[-3].binstr, yypvt[-1].binstr); } break; +#line 1679 "asmparse.y" +{ yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_VALUETYPE, yypvt[-0].token); } break; case 673: -#line 1681 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_BYREF); } break; +#line 1680 "asmparse.y" +{ yyval.binstr = yypvt[-2].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_SZARRAY); } break; case 674: -#line 1682 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_PTR); } break; +#line 1681 "asmparse.y" +{ yyval.binstr = parser->MakeTypeArray(ELEMENT_TYPE_ARRAY, yypvt[-3].binstr, yypvt[-1].binstr); } break; case 675: -#line 1683 "asmparse.y" -{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_PINNED); } break; +#line 1682 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_BYREF); } break; case 676: +#line 1683 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_PTR); } break; +case 677: #line 1684 "asmparse.y" +{ yyval.binstr = yypvt[-1].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_PINNED); } break; +case 678: +#line 1685 "asmparse.y" { yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_CMOD_REQD, yypvt[-1].token); yyval.binstr->append(yypvt[-4].binstr); } break; -case 677: -#line 1686 "asmparse.y" +case 679: +#line 1687 "asmparse.y" { yyval.binstr = parser->MakeTypeClass(ELEMENT_TYPE_CMOD_OPT, yypvt[-1].token); yyval.binstr->append(yypvt[-4].binstr); } break; -case 678: -#line 1689 "asmparse.y" +case 680: +#line 1690 "asmparse.y" { yyval.binstr = parser->MakeSig(yypvt[-5].int32, yypvt[-4].binstr, yypvt[-1].binstr); yyval.binstr->insertInt8(ELEMENT_TYPE_FNPTR); PASM->delArgNameList(PASM->m_firstArgName); PASM->m_firstArgName = parser->m_ANSFirst.POP(); PASM->m_lastArgName = parser->m_ANSLast.POP(); } break; -case 679: -#line 1695 "asmparse.y" +case 681: +#line 1696 "asmparse.y" { if(yypvt[-1].binstr == NULL) yyval.binstr = yypvt[-3].binstr; else { yyval.binstr = new BinStr(); @@ -4378,24 +4380,24 @@ case 679: yyval.binstr->append(yypvt[-3].binstr); corEmitInt(yyval.binstr, corCountArgs(yypvt[-1].binstr)); yyval.binstr->append(yypvt[-1].binstr); delete yypvt[-3].binstr; delete yypvt[-1].binstr; }} break; -case 680: -#line 1702 "asmparse.y" +case 682: +#line 1703 "asmparse.y" { //if(PASM->m_pCurMethod) { // if(($3 < 0)||((DWORD)$3 >= PASM->m_pCurMethod->m_NumTyPars)) // PASM->report->error("Invalid method type parameter '%d'\n",$3); yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_MVAR); corEmitInt(yyval.binstr, yypvt[-0].int32); //} else PASM->report->error("Method type parameter '%d' outside method scope\n",$3); } break; -case 681: -#line 1708 "asmparse.y" +case 683: +#line 1709 "asmparse.y" { //if(PASM->m_pCurClass) { // if(($2 < 0)||((DWORD)$2 >= PASM->m_pCurClass->m_NumTyPars)) // PASM->report->error("Invalid type parameter '%d'\n",$2); yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_VAR); corEmitInt(yyval.binstr, yypvt[-0].int32); //} else PASM->report->error("Type parameter '%d' outside class scope\n",$2); } break; -case 682: -#line 1714 "asmparse.y" +case 684: +#line 1715 "asmparse.y" { int eltype = ELEMENT_TYPE_MVAR; int n=-1; if(PASM->m_pCurMethod) n = PASM->m_pCurMethod->FindTyPar(yypvt[-0].string); @@ -4411,8 +4413,8 @@ case 682: n = 0x1FFFFFFF; } yyval.binstr = new BinStr(); yyval.binstr->appendInt8(eltype); corEmitInt(yyval.binstr,n); } break; -case 683: -#line 1729 "asmparse.y" +case 685: +#line 1730 "asmparse.y" { int eltype = ELEMENT_TYPE_VAR; int n=-1; if(PASM->m_pCurClass && !newclass) n = PASM->m_pCurClass->FindTyPar(yypvt[-0].string); @@ -4428,491 +4430,491 @@ case 683: n = 0x1FFFFFFF; } yyval.binstr = new BinStr(); yyval.binstr->appendInt8(eltype); corEmitInt(yyval.binstr,n); } break; -case 684: -#line 1744 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_TYPEDBYREF); } break; -case 685: -#line 1745 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_VOID); } break; case 686: -#line 1746 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I); } break; +#line 1745 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_TYPEDBYREF); } break; case 687: -#line 1747 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U); } break; +#line 1746 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_VOID); } break; case 688: +#line 1747 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I); } break; +case 689: #line 1748 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U); } break; -case 689: -#line 1749 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; case 690: -#line 1750 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_SENTINEL); } break; +#line 1749 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U); } break; case 691: -#line 1753 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_CHAR); } break; +#line 1750 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 692: -#line 1754 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); } break; +#line 1751 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; yyval.binstr->insertInt8(ELEMENT_TYPE_SENTINEL); } break; case 693: -#line 1755 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_BOOLEAN); } break; +#line 1754 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_CHAR); } break; case 694: -#line 1756 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I1); } break; +#line 1755 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_STRING); } break; case 695: -#line 1757 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I2); } break; +#line 1756 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_BOOLEAN); } break; case 696: -#line 1758 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I4); } break; +#line 1757 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I1); } break; case 697: -#line 1759 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I8); } break; +#line 1758 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I2); } break; case 698: -#line 1760 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R4); } break; +#line 1759 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I4); } break; case 699: -#line 1761 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R8); } break; +#line 1760 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_I8); } break; case 700: -#line 1762 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); } break; +#line 1761 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R4); } break; case 701: -#line 1763 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); } break; +#line 1762 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_R8); } break; case 702: -#line 1764 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); } break; +#line 1763 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); } break; case 703: -#line 1765 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); } break; +#line 1764 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); } break; case 704: -#line 1766 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); } break; +#line 1765 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); } break; case 705: -#line 1767 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); } break; +#line 1766 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); } break; case 706: -#line 1768 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); } break; +#line 1767 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U1); } break; case 707: -#line 1769 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); } break; +#line 1768 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U2); } break; case 708: -#line 1770 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-0].tdd->m_pbsTypeSpec); } break; +#line 1769 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U4); } break; case 709: -#line 1773 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; } break; +#line 1770 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt8(ELEMENT_TYPE_U8); } break; case 710: -#line 1774 "asmparse.y" -{ yyval.binstr = yypvt[-2].binstr; yypvt[-2].binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; +#line 1771 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->append(yypvt[-0].tdd->m_pbsTypeSpec); } break; case 711: -#line 1777 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(0x7FFFFFFF); yyval.binstr->appendInt32(0x7FFFFFFF); } break; +#line 1774 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; } break; case 712: +#line 1775 "asmparse.y" +{ yyval.binstr = yypvt[-2].binstr; yypvt[-2].binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; } break; +case 713: #line 1778 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt32(0x7FFFFFFF); yyval.binstr->appendInt32(0x7FFFFFFF); } break; -case 713: -#line 1779 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(0); yyval.binstr->appendInt32(yypvt[-0].int32); } break; case 714: +#line 1779 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(0x7FFFFFFF); yyval.binstr->appendInt32(0x7FFFFFFF); } break; +case 715: #line 1780 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(0); yyval.binstr->appendInt32(yypvt[-0].int32); } break; +case 716: +#line 1781 "asmparse.y" { FAIL_UNLESS(yypvt[-2].int32 <= yypvt[-0].int32, ("lower bound %d must be <= upper bound %d\n", yypvt[-2].int32, yypvt[-0].int32)); if (yypvt[-2].int32 > yypvt[-0].int32) { YYERROR; }; yyval.binstr = new BinStr(); yyval.binstr->appendInt32(yypvt[-2].int32); yyval.binstr->appendInt32(yypvt[-0].int32-yypvt[-2].int32+1); } break; -case 715: -#line 1783 "asmparse.y" -{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(yypvt[-1].int32); yyval.binstr->appendInt32(0x7FFFFFFF); } break; -case 716: -#line 1788 "asmparse.y" -{ PASM->AddPermissionDecl(yypvt[-4].secAct, yypvt[-3].token, yypvt[-1].pair); } break; case 717: -#line 1790 "asmparse.y" -{ PASM->AddPermissionDecl(yypvt[-5].secAct, yypvt[-4].token, yypvt[-1].binstr); } break; +#line 1784 "asmparse.y" +{ yyval.binstr = new BinStr(); yyval.binstr->appendInt32(yypvt[-1].int32); yyval.binstr->appendInt32(0x7FFFFFFF); } break; case 718: -#line 1791 "asmparse.y" -{ PASM->AddPermissionDecl(yypvt[-1].secAct, yypvt[-0].token, (NVPair *)NULL); } break; +#line 1789 "asmparse.y" +{ PASM->AddPermissionDecl(yypvt[-4].secAct, yypvt[-3].token, yypvt[-1].pair); } break; case 719: +#line 1791 "asmparse.y" +{ PASM->AddPermissionDecl(yypvt[-5].secAct, yypvt[-4].token, yypvt[-1].binstr); } break; +case 720: #line 1792 "asmparse.y" +{ PASM->AddPermissionDecl(yypvt[-1].secAct, yypvt[-0].token, (NVPair *)NULL); } break; +case 721: +#line 1793 "asmparse.y" { PASM->AddPermissionSetDecl(yypvt[-2].secAct, yypvt[-1].binstr); } break; -case 720: -#line 1794 "asmparse.y" +case 722: +#line 1795 "asmparse.y" { PASM->AddPermissionSetDecl(yypvt[-1].secAct,BinStrToUnicode(yypvt[-0].binstr,true));} break; -case 721: -#line 1796 "asmparse.y" +case 723: +#line 1797 "asmparse.y" { BinStr* ret = new BinStr(); ret->insertInt8('.'); corEmitInt(ret, nSecAttrBlobs); ret->append(yypvt[-1].binstr); PASM->AddPermissionSetDecl(yypvt[-4].secAct,ret); nSecAttrBlobs = 0; } break; -case 722: -#line 1804 "asmparse.y" -{ yyval.binstr = new BinStr(); nSecAttrBlobs = 0;} break; -case 723: -#line 1805 "asmparse.y" -{ yyval.binstr = yypvt[-0].binstr; nSecAttrBlobs = 1; } break; case 724: +#line 1805 "asmparse.y" +{ yyval.binstr = new BinStr(); nSecAttrBlobs = 0;} break; +case 725: #line 1806 "asmparse.y" +{ yyval.binstr = yypvt[-0].binstr; nSecAttrBlobs = 1; } break; +case 726: +#line 1807 "asmparse.y" { yyval.binstr = yypvt[-2].binstr; yyval.binstr->append(yypvt[-0].binstr); nSecAttrBlobs++; } break; -case 725: -#line 1810 "asmparse.y" +case 727: +#line 1811 "asmparse.y" { yyval.binstr = PASM->EncodeSecAttr(PASM->ReflectionNotation(yypvt[-4].token),yypvt[-1].binstr,nCustomBlobNVPairs); nCustomBlobNVPairs = 0; } break; -case 726: -#line 1813 "asmparse.y" +case 728: +#line 1814 "asmparse.y" { yyval.binstr = PASM->EncodeSecAttr(yypvt[-4].string,yypvt[-1].binstr,nCustomBlobNVPairs); nCustomBlobNVPairs = 0; } break; -case 727: -#line 1817 "asmparse.y" -{ yyval.secAct = yypvt[-2].secAct; bParsingByteArray = TRUE; } break; -case 728: -#line 1819 "asmparse.y" -{ yyval.secAct = yypvt[-2].secAct; bParsingByteArray = TRUE; } break; case 729: -#line 1822 "asmparse.y" -{ yyval.pair = yypvt[-0].pair; } break; +#line 1818 "asmparse.y" +{ yyval.secAct = yypvt[-2].secAct; bParsingByteArray = TRUE; } break; case 730: -#line 1823 "asmparse.y" -{ yyval.pair = yypvt[-2].pair->Concat(yypvt[-0].pair); } break; +#line 1820 "asmparse.y" +{ yyval.secAct = yypvt[-2].secAct; bParsingByteArray = TRUE; } break; case 731: -#line 1826 "asmparse.y" -{ yypvt[-2].binstr->appendInt8(0); yyval.pair = new NVPair(yypvt[-2].binstr, yypvt[-0].binstr); } break; +#line 1823 "asmparse.y" +{ yyval.pair = yypvt[-0].pair; } break; case 732: -#line 1829 "asmparse.y" -{ yyval.int32 = 1; } break; +#line 1824 "asmparse.y" +{ yyval.pair = yypvt[-2].pair->Concat(yypvt[-0].pair); } break; case 733: +#line 1827 "asmparse.y" +{ yypvt[-2].binstr->appendInt8(0); yyval.pair = new NVPair(yypvt[-2].binstr, yypvt[-0].binstr); } break; +case 734: #line 1830 "asmparse.y" +{ yyval.int32 = 1; } break; +case 735: +#line 1831 "asmparse.y" { yyval.int32 = 0; } break; -case 734: -#line 1833 "asmparse.y" +case 736: +#line 1834 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_BOOLEAN); yyval.binstr->appendInt8(yypvt[-0].int32); } break; -case 735: -#line 1836 "asmparse.y" +case 737: +#line 1837 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_I4); yyval.binstr->appendInt32(yypvt[-0].int32); } break; -case 736: -#line 1839 "asmparse.y" +case 738: +#line 1840 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_I4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 737: -#line 1842 "asmparse.y" +case 739: +#line 1843 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_STRING); yyval.binstr->append(yypvt[-0].binstr); delete yypvt[-0].binstr; yyval.binstr->appendInt8(0); } break; -case 738: -#line 1846 "asmparse.y" +case 740: +#line 1847 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); char* sz = PASM->ReflectionNotation(yypvt[-5].token); strcpy_s((char *)yyval.binstr->getBuff((unsigned)strlen(sz) + 1), strlen(sz) + 1,sz); yyval.binstr->appendInt8(1); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 739: -#line 1852 "asmparse.y" +case 741: +#line 1853 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); char* sz = PASM->ReflectionNotation(yypvt[-5].token); strcpy_s((char *)yyval.binstr->getBuff((unsigned)strlen(sz) + 1), strlen(sz) + 1,sz); yyval.binstr->appendInt8(2); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 740: -#line 1858 "asmparse.y" +case 742: +#line 1859 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); char* sz = PASM->ReflectionNotation(yypvt[-5].token); strcpy_s((char *)yyval.binstr->getBuff((unsigned)strlen(sz) + 1), strlen(sz) + 1,sz); yyval.binstr->appendInt8(4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 741: -#line 1864 "asmparse.y" +case 743: +#line 1865 "asmparse.y" { yyval.binstr = new BinStr(); yyval.binstr->appendInt8(SERIALIZATION_TYPE_ENUM); char* sz = PASM->ReflectionNotation(yypvt[-3].token); strcpy_s((char *)yyval.binstr->getBuff((unsigned)strlen(sz) + 1), strlen(sz) + 1,sz); yyval.binstr->appendInt8(4); yyval.binstr->appendInt32(yypvt[-1].int32); } break; -case 742: -#line 1872 "asmparse.y" -{ yyval.secAct = dclRequest; } break; -case 743: -#line 1873 "asmparse.y" -{ yyval.secAct = dclDemand; } break; case 744: -#line 1874 "asmparse.y" -{ yyval.secAct = dclAssert; } break; +#line 1873 "asmparse.y" +{ yyval.secAct = dclRequest; } break; case 745: -#line 1875 "asmparse.y" -{ yyval.secAct = dclDeny; } break; +#line 1874 "asmparse.y" +{ yyval.secAct = dclDemand; } break; case 746: -#line 1876 "asmparse.y" -{ yyval.secAct = dclPermitOnly; } break; +#line 1875 "asmparse.y" +{ yyval.secAct = dclAssert; } break; case 747: -#line 1877 "asmparse.y" -{ yyval.secAct = dclLinktimeCheck; } break; +#line 1876 "asmparse.y" +{ yyval.secAct = dclDeny; } break; case 748: -#line 1878 "asmparse.y" -{ yyval.secAct = dclInheritanceCheck; } break; +#line 1877 "asmparse.y" +{ yyval.secAct = dclPermitOnly; } break; case 749: -#line 1879 "asmparse.y" -{ yyval.secAct = dclRequestMinimum; } break; +#line 1878 "asmparse.y" +{ yyval.secAct = dclLinktimeCheck; } break; case 750: -#line 1880 "asmparse.y" -{ yyval.secAct = dclRequestOptional; } break; +#line 1879 "asmparse.y" +{ yyval.secAct = dclInheritanceCheck; } break; case 751: -#line 1881 "asmparse.y" -{ yyval.secAct = dclRequestRefuse; } break; +#line 1880 "asmparse.y" +{ yyval.secAct = dclRequestMinimum; } break; case 752: -#line 1882 "asmparse.y" -{ yyval.secAct = dclPrejitGrant; } break; +#line 1881 "asmparse.y" +{ yyval.secAct = dclRequestOptional; } break; case 753: -#line 1883 "asmparse.y" -{ yyval.secAct = dclPrejitDenied; } break; +#line 1882 "asmparse.y" +{ yyval.secAct = dclRequestRefuse; } break; case 754: -#line 1884 "asmparse.y" -{ yyval.secAct = dclNonCasDemand; } break; +#line 1883 "asmparse.y" +{ yyval.secAct = dclPrejitGrant; } break; case 755: -#line 1885 "asmparse.y" -{ yyval.secAct = dclNonCasLinkDemand; } break; +#line 1884 "asmparse.y" +{ yyval.secAct = dclPrejitDenied; } break; case 756: -#line 1886 "asmparse.y" -{ yyval.secAct = dclNonCasInheritance; } break; +#line 1885 "asmparse.y" +{ yyval.secAct = dclNonCasDemand; } break; case 757: -#line 1890 "asmparse.y" -{ PASM->ResetLineNumbers(); nCurrPC = PASM->m_CurPC; PENV->bExternSource = TRUE; PENV->bExternSourceAutoincrement = FALSE; } break; +#line 1886 "asmparse.y" +{ yyval.secAct = dclNonCasLinkDemand; } break; case 758: +#line 1887 "asmparse.y" +{ yyval.secAct = dclNonCasInheritance; } break; +case 759: #line 1891 "asmparse.y" +{ PASM->ResetLineNumbers(); nCurrPC = PASM->m_CurPC; PENV->bExternSource = TRUE; PENV->bExternSourceAutoincrement = FALSE; } break; +case 760: +#line 1892 "asmparse.y" { PASM->ResetLineNumbers(); nCurrPC = PASM->m_CurPC; PENV->bExternSource = TRUE; PENV->bExternSourceAutoincrement = TRUE; } break; -case 759: -#line 1894 "asmparse.y" +case 761: +#line 1895 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-1].int32; PENV->nExtCol = 0; PENV->nExtColEnd = static_cast(-1); PASM->SetSourceFileName(yypvt[-0].string);} break; -case 760: -#line 1897 "asmparse.y" +case 762: +#line 1898 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-0].int32; PENV->nExtCol = 0; PENV->nExtColEnd = static_cast(-1); } break; -case 761: -#line 1899 "asmparse.y" +case 763: +#line 1900 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-3].int32; PENV->nExtCol=yypvt[-1].int32; PENV->nExtColEnd = static_cast(-1); PASM->SetSourceFileName(yypvt[-0].string);} break; -case 762: -#line 1902 "asmparse.y" +case 764: +#line 1903 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-2].int32; PENV->nExtCol=yypvt[-0].int32; PENV->nExtColEnd = static_cast(-1);} break; -case 763: -#line 1905 "asmparse.y" +case 765: +#line 1906 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-5].int32; PENV->nExtCol=yypvt[-3].int32; PENV->nExtColEnd = yypvt[-1].int32; PASM->SetSourceFileName(yypvt[-0].string);} break; -case 764: -#line 1909 "asmparse.y" +case 766: +#line 1910 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-4].int32; PENV->nExtCol=yypvt[-2].int32; PENV->nExtColEnd = yypvt[-0].int32; } break; -case 765: -#line 1912 "asmparse.y" +case 767: +#line 1913 "asmparse.y" { PENV->nExtLine = yypvt[-5].int32; PENV->nExtLineEnd = yypvt[-3].int32; PENV->nExtCol=yypvt[-1].int32; PENV->nExtColEnd = static_cast(-1); PASM->SetSourceFileName(yypvt[-0].string);} break; -case 766: -#line 1916 "asmparse.y" +case 768: +#line 1917 "asmparse.y" { PENV->nExtLine = yypvt[-4].int32; PENV->nExtLineEnd = yypvt[-2].int32; PENV->nExtCol=yypvt[-0].int32; PENV->nExtColEnd = static_cast(-1); } break; -case 767: -#line 1919 "asmparse.y" +case 769: +#line 1920 "asmparse.y" { PENV->nExtLine = yypvt[-7].int32; PENV->nExtLineEnd = yypvt[-5].int32; PENV->nExtCol=yypvt[-3].int32; PENV->nExtColEnd = yypvt[-1].int32; PASM->SetSourceFileName(yypvt[-0].string);} break; -case 768: -#line 1923 "asmparse.y" +case 770: +#line 1924 "asmparse.y" { PENV->nExtLine = yypvt[-6].int32; PENV->nExtLineEnd = yypvt[-4].int32; PENV->nExtCol=yypvt[-2].int32; PENV->nExtColEnd = yypvt[-0].int32; } break; -case 769: -#line 1925 "asmparse.y" +case 771: +#line 1926 "asmparse.y" { PENV->nExtLine = PENV->nExtLineEnd = yypvt[-1].int32 - 1; PENV->nExtCol = 0; PENV->nExtColEnd = static_cast(-1); PASM->SetSourceFileName(yypvt[-0].binstr);} break; -case 770: -#line 1932 "asmparse.y" -{ PASMM->AddFile(yypvt[-5].string, yypvt[-6].fileAttr|yypvt[-4].fileAttr|yypvt[-0].fileAttr, yypvt[-2].binstr); } break; -case 771: -#line 1933 "asmparse.y" -{ PASMM->AddFile(yypvt[-1].string, yypvt[-2].fileAttr|yypvt[-0].fileAttr, NULL); } break; case 772: -#line 1936 "asmparse.y" -{ yyval.fileAttr = (CorFileFlags) 0; } break; +#line 1933 "asmparse.y" +{ PASMM->AddFile(yypvt[-5].string, yypvt[-6].fileAttr|yypvt[-4].fileAttr|yypvt[-0].fileAttr, yypvt[-2].binstr); } break; case 773: -#line 1937 "asmparse.y" -{ yyval.fileAttr = (CorFileFlags) (yypvt[-1].fileAttr | ffContainsNoMetaData); } break; +#line 1934 "asmparse.y" +{ PASMM->AddFile(yypvt[-1].string, yypvt[-2].fileAttr|yypvt[-0].fileAttr, NULL); } break; case 774: -#line 1940 "asmparse.y" +#line 1937 "asmparse.y" { yyval.fileAttr = (CorFileFlags) 0; } break; case 775: -#line 1941 "asmparse.y" -{ yyval.fileAttr = (CorFileFlags) 0x80000000; } break; +#line 1938 "asmparse.y" +{ yyval.fileAttr = (CorFileFlags) (yypvt[-1].fileAttr | ffContainsNoMetaData); } break; case 776: -#line 1944 "asmparse.y" -{ bParsingByteArray = TRUE; } break; +#line 1941 "asmparse.y" +{ yyval.fileAttr = (CorFileFlags) 0; } break; case 777: -#line 1947 "asmparse.y" -{ PASMM->StartAssembly(yypvt[-0].string, NULL, (DWORD)yypvt[-1].asmAttr, FALSE); } break; +#line 1942 "asmparse.y" +{ yyval.fileAttr = (CorFileFlags) 0x80000000; } break; case 778: -#line 1950 "asmparse.y" -{ yyval.asmAttr = (CorAssemblyFlags) 0; } break; +#line 1945 "asmparse.y" +{ bParsingByteArray = TRUE; } break; case 779: -#line 1951 "asmparse.y" -{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afRetargetable); } break; +#line 1948 "asmparse.y" +{ PASMM->StartAssembly(yypvt[-0].string, NULL, (DWORD)yypvt[-1].asmAttr, FALSE); } break; case 780: -#line 1952 "asmparse.y" -{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afContentType_WindowsRuntime); } break; +#line 1951 "asmparse.y" +{ yyval.asmAttr = (CorAssemblyFlags) 0; } break; case 781: -#line 1953 "asmparse.y" -{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afPA_NoPlatform); } break; +#line 1952 "asmparse.y" +{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afRetargetable); } break; case 782: -#line 1954 "asmparse.y" -{ yyval.asmAttr = yypvt[-2].asmAttr; } break; +#line 1953 "asmparse.y" +{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afContentType_WindowsRuntime); } break; case 783: -#line 1955 "asmparse.y" -{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_MSIL); } break; +#line 1954 "asmparse.y" +{ yyval.asmAttr = (CorAssemblyFlags) (yypvt[-1].asmAttr | afPA_NoPlatform); } break; case 784: -#line 1956 "asmparse.y" -{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_x86); } break; +#line 1955 "asmparse.y" +{ yyval.asmAttr = yypvt[-2].asmAttr; } break; case 785: -#line 1957 "asmparse.y" -{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_AMD64); } break; +#line 1956 "asmparse.y" +{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_MSIL); } break; case 786: -#line 1958 "asmparse.y" -{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_ARM); } break; +#line 1957 "asmparse.y" +{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_x86); } break; case 787: +#line 1958 "asmparse.y" +{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_AMD64); } break; +case 788: #line 1959 "asmparse.y" +{ SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_ARM); } break; +case 789: +#line 1960 "asmparse.y" { SET_PA(yyval.asmAttr,yypvt[-1].asmAttr,afPA_ARM64); } break; -case 790: -#line 1966 "asmparse.y" +case 792: +#line 1967 "asmparse.y" { PASMM->SetAssemblyHashAlg(yypvt[-0].int32); } break; -case 793: -#line 1971 "asmparse.y" -{ yyval.int32 = yypvt[-0].int32; } break; -case 794: -#line 1972 "asmparse.y" -{ yyval.int32 = 0xFFFF; } break; case 795: -#line 1975 "asmparse.y" -{ PASMM->SetAssemblyPublicKey(yypvt[-1].binstr); } break; +#line 1972 "asmparse.y" +{ yyval.int32 = yypvt[-0].int32; } break; case 796: -#line 1977 "asmparse.y" -{ PASMM->SetAssemblyVer((USHORT)yypvt[-6].int32, (USHORT)yypvt[-4].int32, (USHORT)yypvt[-2].int32, (USHORT)yypvt[-0].int32); } break; +#line 1973 "asmparse.y" +{ yyval.int32 = 0xFFFF; } break; case 797: -#line 1978 "asmparse.y" -{ yypvt[-0].binstr->appendInt8(0); PASMM->SetAssemblyLocale(yypvt[-0].binstr,TRUE); } break; +#line 1976 "asmparse.y" +{ PASMM->SetAssemblyPublicKey(yypvt[-1].binstr); } break; case 798: +#line 1978 "asmparse.y" +{ PASMM->SetAssemblyVer((USHORT)yypvt[-6].int32, (USHORT)yypvt[-4].int32, (USHORT)yypvt[-2].int32, (USHORT)yypvt[-0].int32); } break; +case 799: #line 1979 "asmparse.y" +{ yypvt[-0].binstr->appendInt8(0); PASMM->SetAssemblyLocale(yypvt[-0].binstr,TRUE); } break; +case 800: +#line 1980 "asmparse.y" { PASMM->SetAssemblyLocale(yypvt[-1].binstr,FALSE); } break; -case 801: -#line 1984 "asmparse.y" -{ bParsingByteArray = TRUE; } break; -case 802: -#line 1987 "asmparse.y" -{ bParsingByteArray = TRUE; } break; case 803: -#line 1990 "asmparse.y" +#line 1985 "asmparse.y" { bParsingByteArray = TRUE; } break; case 804: -#line 1994 "asmparse.y" -{ PASMM->StartAssembly(yypvt[-0].string, NULL, yypvt[-1].asmAttr, TRUE); } break; +#line 1988 "asmparse.y" +{ bParsingByteArray = TRUE; } break; case 805: -#line 1996 "asmparse.y" +#line 1991 "asmparse.y" +{ bParsingByteArray = TRUE; } break; +case 806: +#line 1995 "asmparse.y" +{ PASMM->StartAssembly(yypvt[-0].string, NULL, yypvt[-1].asmAttr, TRUE); } break; +case 807: +#line 1997 "asmparse.y" { PASMM->StartAssembly(yypvt[-2].string, yypvt[-0].string, yypvt[-3].asmAttr, TRUE); } break; -case 808: -#line 2003 "asmparse.y" -{ PASMM->SetAssemblyHashBlob(yypvt[-1].binstr); } break; case 810: -#line 2005 "asmparse.y" -{ PASMM->SetAssemblyPublicKeyToken(yypvt[-1].binstr); } break; -case 811: -#line 2006 "asmparse.y" -{ PASMM->SetAssemblyAutodetect(); } break; +#line 2004 "asmparse.y" +{ PASMM->SetAssemblyHashBlob(yypvt[-1].binstr); } break; case 812: -#line 2009 "asmparse.y" -{ PASMM->StartComType(yypvt[-0].string, yypvt[-1].exptAttr);} break; +#line 2006 "asmparse.y" +{ PASMM->SetAssemblyPublicKeyToken(yypvt[-1].binstr); } break; case 813: -#line 2012 "asmparse.y" -{ PASMM->StartComType(yypvt[-0].string, yypvt[-1].exptAttr); } break; +#line 2007 "asmparse.y" +{ PASMM->SetAssemblyAutodetect(); } break; case 814: -#line 2015 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) 0; } break; +#line 2010 "asmparse.y" +{ PASMM->StartComType(yypvt[-0].string, yypvt[-1].exptAttr);} break; case 815: -#line 2016 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdNotPublic); } break; +#line 2013 "asmparse.y" +{ PASMM->StartComType(yypvt[-0].string, yypvt[-1].exptAttr); } break; case 816: -#line 2017 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdPublic); } break; +#line 2016 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) 0; } break; case 817: -#line 2018 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdForwarder); } break; +#line 2017 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdNotPublic); } break; case 818: -#line 2019 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedPublic); } break; +#line 2018 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdPublic); } break; case 819: -#line 2020 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedPrivate); } break; +#line 2019 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-1].exptAttr | tdForwarder); } break; case 820: -#line 2021 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedFamily); } break; +#line 2020 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedPublic); } break; case 821: -#line 2022 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedAssembly); } break; +#line 2021 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedPrivate); } break; case 822: -#line 2023 "asmparse.y" -{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedFamANDAssem); } break; +#line 2022 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedFamily); } break; case 823: +#line 2023 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedAssembly); } break; +case 824: #line 2024 "asmparse.y" +{ yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedFamANDAssem); } break; +case 825: +#line 2025 "asmparse.y" { yyval.exptAttr = (CorTypeAttr) (yypvt[-2].exptAttr | tdNestedFamORAssem); } break; -case 826: -#line 2031 "asmparse.y" -{ PASMM->SetComTypeFile(yypvt[-0].string); } break; -case 827: -#line 2032 "asmparse.y" -{ PASMM->SetComTypeComType(yypvt[-0].string); } break; case 828: -#line 2033 "asmparse.y" -{ PASMM->SetComTypeAsmRef(yypvt[-0].string); } break; +#line 2032 "asmparse.y" +{ PASMM->SetComTypeFile(yypvt[-0].string); } break; case 829: +#line 2033 "asmparse.y" +{ PASMM->SetComTypeComType(yypvt[-0].string); } break; +case 830: #line 2034 "asmparse.y" +{ PASMM->SetComTypeAsmRef(yypvt[-0].string); } break; +case 831: +#line 2035 "asmparse.y" { if(!PASMM->SetComTypeImplementationTok(yypvt[-1].int32)) PASM->report->error("Invalid implementation of exported type\n"); } break; -case 830: -#line 2036 "asmparse.y" +case 832: +#line 2037 "asmparse.y" { if(!PASMM->SetComTypeClassTok(yypvt[-0].int32)) PASM->report->error("Invalid TypeDefID of exported type\n"); } break; -case 833: -#line 2042 "asmparse.y" -{ PASMM->StartManifestRes(yypvt[-0].string, yypvt[-0].string, yypvt[-1].manresAttr); } break; -case 834: -#line 2044 "asmparse.y" -{ PASMM->StartManifestRes(yypvt[-2].string, yypvt[-0].string, yypvt[-3].manresAttr); } break; case 835: -#line 2047 "asmparse.y" -{ yyval.manresAttr = (CorManifestResourceFlags) 0; } break; +#line 2043 "asmparse.y" +{ PASMM->StartManifestRes(yypvt[-0].string, yypvt[-0].string, yypvt[-1].manresAttr); } break; case 836: -#line 2048 "asmparse.y" -{ yyval.manresAttr = (CorManifestResourceFlags) (yypvt[-1].manresAttr | mrPublic); } break; +#line 2045 "asmparse.y" +{ PASMM->StartManifestRes(yypvt[-2].string, yypvt[-0].string, yypvt[-3].manresAttr); } break; case 837: +#line 2048 "asmparse.y" +{ yyval.manresAttr = (CorManifestResourceFlags) 0; } break; +case 838: #line 2049 "asmparse.y" +{ yyval.manresAttr = (CorManifestResourceFlags) (yypvt[-1].manresAttr | mrPublic); } break; +case 839: +#line 2050 "asmparse.y" { yyval.manresAttr = (CorManifestResourceFlags) (yypvt[-1].manresAttr | mrPrivate); } break; -case 840: -#line 2056 "asmparse.y" -{ PASMM->SetManifestResFile(yypvt[-2].string, (ULONG)yypvt[-0].int32); } break; -case 841: +case 842: #line 2057 "asmparse.y" +{ PASMM->SetManifestResFile(yypvt[-2].string, (ULONG)yypvt[-0].int32); } break; +case 843: +#line 2058 "asmparse.y" { PASMM->SetManifestResAsmRef(yypvt[-0].string); } break;/* End of actions */ #line 329 "F:\\NetFXDev1\\src\\tools\\devdiv\\amd64\\yypars.c" } diff --git a/src/coreclr/ilasm/prebuilt/asmparse.grammar b/src/coreclr/ilasm/prebuilt/asmparse.grammar index 82dac9517f7d7b..6d90815f8d28b3 100644 --- a/src/coreclr/ilasm/prebuilt/asmparse.grammar +++ b/src/coreclr/ilasm/prebuilt/asmparse.grammar @@ -265,7 +265,9 @@ typarAttrib : '+' | '-' | 'class' | 'valuetype' + | 'byreflike' | '.ctor' + | 'flags' '(' int32 ')' ; typarAttribs : /* EMPTY */ diff --git a/src/coreclr/ildasm/dasm.cpp b/src/coreclr/ildasm/dasm.cpp index f5c8ea21de6549..6d87c8bae816be 100644 --- a/src/coreclr/ildasm/dasm.cpp +++ b/src/coreclr/ildasm/dasm.cpp @@ -3080,9 +3080,16 @@ char *DumpGenericPars(_Inout_updates_(SZSTRING_SIZE) char* szString, mdToken tok if ((attr & gpNotNullableValueTypeConstraint) != 0) szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "valuetype "); CHECK_REMAINING_SIZE; + if ((attr & gpAcceptByRefLike) != 0) + szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "byreflike "); + CHECK_REMAINING_SIZE; if ((attr & gpDefaultConstructorConstraint) != 0) szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), ".ctor "); CHECK_REMAINING_SIZE; + DWORD unknownAttr = attr & ~(gpSpecialConstraintMask | gpVarianceMask); + if (unknownAttr != 0) + szptr += sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr), "flags(0x%x) ", unknownAttr); + CHECK_REMAINING_SIZE; if (NumConstrs) { CQuickBytes out; diff --git a/src/coreclr/inc/corhdr.h b/src/coreclr/inc/corhdr.h index b4ea57f811ce14..150f5c58f8d4fa 100644 --- a/src/coreclr/inc/corhdr.h +++ b/src/coreclr/inc/corhdr.h @@ -842,11 +842,12 @@ typedef enum CorGenericParamAttr gpContravariant = 0x0002, // Special constraints, applicable to any type parameters - gpSpecialConstraintMask = 0x001C, + gpSpecialConstraintMask = 0x003C, gpNoSpecialConstraint = 0x0000, gpReferenceTypeConstraint = 0x0004, // type argument must be a reference type gpNotNullableValueTypeConstraint = 0x0008, // type argument must be a value type but not Nullable gpDefaultConstructorConstraint = 0x0010, // type argument must have a public default constructor + gpAcceptByRefLike = 0x0020, // type argument can be ByRefLike } CorGenericParamAttr; // structures and enums moved from COR.H diff --git a/src/coreclr/inc/corinfo.h b/src/coreclr/inc/corinfo.h index ca792f63e89751..1e50f7734d0372 100644 --- a/src/coreclr/inc/corinfo.h +++ b/src/coreclr/inc/corinfo.h @@ -438,7 +438,7 @@ enum CorInfoHelpFunc CORINFO_HELP_CHKCASTCLASS_SPECIAL, // Optimized helper for classes. Assumes that the trivial cases // has been taken care of by the inlined check - CORINFO_HELP_BOX, + CORINFO_HELP_BOX, // Fast box helper. Only possible exception is OutOfMemory CORINFO_HELP_BOX_NULLABLE, // special form of boxing for Nullable CORINFO_HELP_UNBOX, CORINFO_HELP_UNBOX_NULLABLE, // special form of unboxing for Nullable @@ -2291,7 +2291,7 @@ class ICorStaticInfo // was truncated when copied to the buffer. // // Operation: - // + // // On entry, `*pnBufLen` specifies the size of the buffer pointed to by `*ppBuf` as a count of characters. // There are two cases: // 1. If the size is zero, the function computes the length of the representation and returns that. diff --git a/src/coreclr/inc/il_kywd.h b/src/coreclr/inc/il_kywd.h index e2a2e554656144..3a3b86a85fbeb0 100644 --- a/src/coreclr/inc/il_kywd.h +++ b/src/coreclr/inc/il_kywd.h @@ -39,6 +39,7 @@ KYWD( "value", VALUE_, NO_VALUE ) KYWD( "valuetype", VALUETYPE_, NO_VALUE ) KYWD( "class", CLASS_, NO_VALUE ) + KYWD( "byreflike", BYREFLIKE_, NO_VALUE ) KYWD( "vararg", VARARG_, NO_VALUE ) KYWD( "default", DEFAULT_, NO_VALUE ) KYWD( "stdcall", STDCALL_, NO_VALUE ) diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h index 10305239a81d56..fe542522df4aa5 100644 --- a/src/coreclr/jit/compiler.h +++ b/src/coreclr/jit/compiler.h @@ -4380,10 +4380,17 @@ class Compiler GenTree* impImportLdvirtftn(GenTree* thisPtr, CORINFO_RESOLVED_TOKEN* pResolvedToken, CORINFO_CALL_INFO* pCallInfo); + enum class BoxPatterns + { + None = 0, + IsByRefLike = 1, + MakeInlineObservation = 2, + }; + int impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, const BYTE* codeAddr, const BYTE* codeEndp, - bool makeInlineObservation = false); + BoxPatterns opts); void impImportAndPushBox(CORINFO_RESOLVED_TOKEN* pResolvedToken); void impImportNewObjArray(CORINFO_RESOLVED_TOKEN* pResolvedToken, CORINFO_CALL_INFO* pCallInfo); diff --git a/src/coreclr/jit/compiler.hpp b/src/coreclr/jit/compiler.hpp index 0483cca3e62f5b..25321ccf70349c 100644 --- a/src/coreclr/jit/compiler.hpp +++ b/src/coreclr/jit/compiler.hpp @@ -3611,7 +3611,7 @@ inline bool Compiler::IsSharedStaticHelper(GenTree* tree) bool result1 = // More helpers being added to IsSharedStaticHelper (that have similar behaviors but are not true - // ShareStaticHelperts) + // ShareStaticHelpers) helper == CORINFO_HELP_STRCNS || helper == CORINFO_HELP_BOX || // helpers being added to IsSharedStaticHelper diff --git a/src/coreclr/jit/fgbasic.cpp b/src/coreclr/jit/fgbasic.cpp index 632978641b9ee1..cd50ea219a0599 100644 --- a/src/coreclr/jit/fgbasic.cpp +++ b/src/coreclr/jit/fgbasic.cpp @@ -1047,7 +1047,8 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed { if (makeInlineObservations) { - int toSkip = impBoxPatternMatch(nullptr, codeAddr + sz, codeEndp, true); + int toSkip = + impBoxPatternMatch(nullptr, codeAddr + sz, codeEndp, BoxPatterns::MakeInlineObservation); if (toSkip > 0) { // toSkip > 0 means we most likely will hit a pattern (e.g. box+isinst+brtrue) that diff --git a/src/coreclr/jit/importer.cpp b/src/coreclr/jit/importer.cpp index aec26c053ebaa7..ed50eff66f166d 100644 --- a/src/coreclr/jit/importer.cpp +++ b/src/coreclr/jit/importer.cpp @@ -4317,7 +4317,6 @@ GenTree* Compiler::impIntrinsic(GenTree* newobjThis, default: NO_WAY("Intrinsic not supported in this path."); } - impPopStack(); // drop CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE call } } @@ -4603,7 +4602,7 @@ GenTree* Compiler::impIntrinsic(GenTree* newobjThis, if ((retNode == nullptr) && (pConstrainedResolvedToken != nullptr) && (constraintCallThisTransform == CORINFO_BOX_THIS)) { - // Ensure this is one of the is simple box cases (in particular, rule out nullables). + // Ensure this is one of the simple box cases (in particular, rule out nullables). const CorInfoHelpFunc boxHelper = info.compCompHnd->getBoxHelper(pConstrainedResolvedToken->hClass); const bool isSafeToOptimize = (boxHelper == CORINFO_HELP_BOX); @@ -6959,6 +6958,7 @@ GenTree* Compiler::impImportLdvirtftn(GenTree* thisPtr, // pResolvedToken - resolved token from the box operation // codeAddr - position in IL stream after the box instruction // codeEndp - end of IL stream +// opts - dictate pattern matching behavior // // Return Value: // Number of IL bytes matched and imported, -1 otherwise @@ -6970,7 +6970,7 @@ GenTree* Compiler::impImportLdvirtftn(GenTree* thisPtr, int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, const BYTE* codeAddr, const BYTE* codeEndp, - bool makeInlineObservation) + BoxPatterns opts) { if (codeAddr >= codeEndp) { @@ -6983,7 +6983,7 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, // box + unbox.any if (codeAddr + 1 + sizeof(mdToken) <= codeEndp) { - if (makeInlineObservation) + if (opts == BoxPatterns::MakeInlineObservation) { compInlineResult->Note(InlineObservation::CALLEE_FOLDABLE_BOX); return 1 + sizeof(mdToken); @@ -7014,7 +7014,7 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, // box + br_true/false if ((codeAddr + ((codeAddr[0] >= CEE_BRFALSE) ? 5 : 2)) <= codeEndp) { - if (makeInlineObservation) + if (opts == BoxPatterns::MakeInlineObservation) { compInlineResult->Note(InlineObservation::CALLEE_FOLDABLE_BOX); return 0; @@ -7046,8 +7046,8 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, if (canOptimize) { - CorInfoHelpFunc boxHelper = info.compCompHnd->getBoxHelper(pResolvedToken->hClass); - if (boxHelper == CORINFO_HELP_BOX) + if ((opts == BoxPatterns::IsByRefLike) || + info.compCompHnd->getBoxHelper(pResolvedToken->hClass) == CORINFO_HELP_BOX) { JITDUMP("\n Importing BOX; BR_TRUE/FALSE as %sconstant\n", treeToNullcheck == nullptr ? "" : "nullcheck+"); @@ -7082,16 +7082,27 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, case CEE_BRFALSE_S: if ((nextCodeAddr + ((nextCodeAddr[0] >= CEE_BRFALSE) ? 5 : 2)) <= codeEndp) { - if (makeInlineObservation) + if (opts == BoxPatterns::MakeInlineObservation) { compInlineResult->Note(InlineObservation::CALLEE_FOLDABLE_BOX); return 1 + sizeof(mdToken); } - if (!(impStackTop().val->gtFlags & GTF_SIDE_EFFECT)) + if ((impStackTop().val->gtFlags & GTF_SIDE_EFFECT) == 0) { - CorInfoHelpFunc boxHelper = info.compCompHnd->getBoxHelper(pResolvedToken->hClass); - if (boxHelper == CORINFO_HELP_BOX) + CorInfoHelpFunc foldAsHelper; + if (opts == BoxPatterns::IsByRefLike) + { + // Treat ByRefLike types as if they were regular boxing operations + // so they can be elided. + foldAsHelper = CORINFO_HELP_BOX; + } + else + { + foldAsHelper = info.compCompHnd->getBoxHelper(pResolvedToken->hClass); + } + + if (foldAsHelper == CORINFO_HELP_BOX) { CORINFO_RESOLVED_TOKEN isInstResolvedToken; @@ -7112,7 +7123,7 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, return 1 + sizeof(mdToken); } } - else if (boxHelper == CORINFO_HELP_BOX_NULLABLE) + else if (foldAsHelper == CORINFO_HELP_BOX_NULLABLE) { // For nullable we're going to fold it to "ldfld hasValue + brtrue/brfalse" or // "ldc.i4.0 + brtrue/brfalse" in case if the underlying type is not castable to @@ -7164,7 +7175,7 @@ int Compiler::impBoxPatternMatch(CORINFO_RESOLVED_TOKEN* pResolvedToken, case CEE_UNBOX_ANY: if ((nextCodeAddr + 1 + sizeof(mdToken)) <= codeEndp) { - if (makeInlineObservation) + if (opts == BoxPatterns::MakeInlineObservation) { compInlineResult->Note(InlineObservation::CALLEE_FOLDABLE_BOX); return 2 + sizeof(mdToken) * 2; @@ -16529,8 +16540,20 @@ void Compiler::impImportBlockCode(BasicBlock* block) break; } + bool isByRefLike = + (info.compCompHnd->getClassAttribs(resolvedToken.hClass) & CORINFO_FLG_BYREF_LIKE) != 0; + if (isByRefLike) + { + // For ByRefLike types we are required to either fold the + // recognized patterns in impBoxPatternMatch or otherwise + // throw InvalidProgramException at runtime. In either case + // we will need to spill side effects of the expression. + impSpillSideEffects(false, CHECK_SPILL_ALL DEBUGARG("Required for box of ByRefLike type")); + } + // Look ahead for box idioms - int matched = impBoxPatternMatch(&resolvedToken, codeAddr + sz, codeEndp); + int matched = impBoxPatternMatch(&resolvedToken, codeAddr + sz, codeEndp, + isByRefLike ? BoxPatterns::IsByRefLike : BoxPatterns::None); if (matched >= 0) { // Skip the matched IL instructions @@ -16538,10 +16561,19 @@ void Compiler::impImportBlockCode(BasicBlock* block) break; } - impImportAndPushBox(&resolvedToken); - if (compDonotInline()) + if (isByRefLike) { - return; + // ByRefLike types are supported in boxing scenarios when the instruction can be elided + // due to a recognized pattern above. If the pattern is not recognized, the code is invalid. + BADCODE("ByRefLike types cannot be boxed"); + } + else + { + impImportAndPushBox(&resolvedToken); + if (compDonotInline()) + { + return; + } } } break; diff --git a/src/coreclr/jit/valuenum.cpp b/src/coreclr/jit/valuenum.cpp index d4833dce961f92..bc26e0d0c8f79d 100644 --- a/src/coreclr/jit/valuenum.cpp +++ b/src/coreclr/jit/valuenum.cpp @@ -9709,7 +9709,7 @@ void Compiler::fgValueNumberHelperCallFunc(GenTreeCall* call, VNFunc vnf, ValueN case VNF_Box: case VNF_BoxNullable: { - // Generate unique VN so, VNForFunc generates a uniq value number for box nullable. + // Generate unique VN so, VNForFunc generates a unique value number for box nullable. // Alternatively instead of using vnpUniq below in VNPairForFunc(...), // we could use the value number of what the byref arg0 points to. // diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs index ed4cc14fb14235..5656d6845c295f 100644 --- a/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs +++ b/src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs @@ -75,8 +75,8 @@ public static unsafe object RhBox(MethodTable* pEEType, ref byte data) { ref byte dataAdjustedForNullable = ref data; - // Can box value types only (which also implies no finalizers). - Debug.Assert(pEEType->IsValueType && !pEEType->IsFinalizable); + // Can box non-ByRefLike value types only (which also implies no finalizers). + Debug.Assert(pEEType->IsValueType && !pEEType->IsByRefLike && !pEEType->IsFinalizable); // If we're boxing a Nullable then either box the underlying T or return null (if the // nullable's value is empty). diff --git a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/TypeLoader/ConstraintValidator.cs b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/TypeLoader/ConstraintValidator.cs index d7e1a2158404c0..a1b71506040843 100644 --- a/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/TypeLoader/ConstraintValidator.cs +++ b/src/coreclr/nativeaot/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/TypeLoader/ConstraintValidator.cs @@ -17,7 +17,9 @@ private static bool SatisfiesConstraints(this Type genericVariable, SigTypeConte if ((specialConstraints & GenericParameterAttributes.NotNullableValueTypeConstraint) != 0) { if (!typeArg.IsValueType) + { return false; + } else { // the type argument is a value type, however if it is any kind of Nullable we want to fail @@ -39,6 +41,9 @@ private static bool SatisfiesConstraints(this Type genericVariable, SigTypeConte return false; } + if (typeArg.IsByRefLike && (specialConstraints & (GenericParameterAttributes)0x20 /* GenericParameterAttributes.AcceptByRefLike */) == 0) + return false; + // Now check general subtype constraints foreach (var constraint in genericVariable.GetGenericParameterConstraints()) { diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs b/src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs index e39535645034e0..c161947fb8323c 100644 --- a/src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs +++ b/src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs @@ -47,7 +47,7 @@ public enum CorInfoHelpFunc CORINFO_HELP_FLTROUND, CORINFO_HELP_DBLROUND, - /* Allocating a new object. Always use ICorClassInfo::getNewHelper() to decide + /* Allocating a new object. Always use ICorClassInfo::getNewHelper() to decide which is the right helper to use to allocate an object of a given type. */ CORINFO_HELP_NEWFAST, @@ -81,10 +81,10 @@ which is the right helper to use to allocate an object of a given type. */ CORINFO_HELP_CHKCASTARRAY, CORINFO_HELP_CHKCASTCLASS, CORINFO_HELP_CHKCASTANY, - CORINFO_HELP_CHKCASTCLASS_SPECIAL, // Optimized helper for classes. Assumes that the trivial cases + CORINFO_HELP_CHKCASTCLASS_SPECIAL, // Optimized helper for classes. Assumes that the trivial cases // has been taken care of by the inlined check - CORINFO_HELP_BOX, + CORINFO_HELP_BOX, // Fast box helper. Only possible exception is OutOfMemory CORINFO_HELP_BOX_NULLABLE, // special form of boxing for Nullable CORINFO_HELP_UNBOX, CORINFO_HELP_UNBOX_NULLABLE, // special form of unboxing for Nullable @@ -120,7 +120,7 @@ which is the right helper to use to allocate an object of a given type. */ CORINFO_HELP_MON_EXIT_STATIC, CORINFO_HELP_GETCLASSFROMMETHODPARAM, // Given a generics method handle, returns a class handle - CORINFO_HELP_GETSYNCFROMCLASSHANDLE, // Given a generics class handle, returns the sync monitor + CORINFO_HELP_GETSYNCFROMCLASSHANDLE, // Given a generics class handle, returns the sync monitor // in its ManagedClassObject /* GC support */ @@ -166,7 +166,7 @@ which is the right helper to use to allocate an object of a given type. */ CORINFO_HELP_GETSTATICFIELDADDR_TLS, // Helper for PE TLS fields - // There are a variety of specialized helpers for accessing static fields. The JIT should use + // There are a variety of specialized helpers for accessing static fields. The JIT should use // ICorClassInfo::getSharedStaticsOrCCtorHelper to determine which helper to use // Helpers for regular statics @@ -275,7 +275,7 @@ which is the right helper to use to allocate an object of a given type. */ CORINFO_HELP_JIT_PINVOKE_BEGIN, // Transition to preemptive mode before a P/Invoke, frame is the first argument CORINFO_HELP_JIT_PINVOKE_END, // Transition to cooperative mode after a P/Invoke, frame is the first argument - CORINFO_HELP_JIT_REVERSE_PINVOKE_ENTER, // Transition to cooperative mode in reverse P/Invoke prolog, frame is the first argument + CORINFO_HELP_JIT_REVERSE_PINVOKE_ENTER, // Transition to cooperative mode in reverse P/Invoke prolog, frame is the first argument CORINFO_HELP_JIT_REVERSE_PINVOKE_ENTER_TRACK_TRANSITIONS, // Transition to cooperative mode and track transitions in reverse P/Invoke prolog. CORINFO_HELP_JIT_REVERSE_PINVOKE_EXIT, // Transition to preemptive mode in reverse P/Invoke epilog, frame is the first argument CORINFO_HELP_JIT_REVERSE_PINVOKE_EXIT_TRACK_TRANSITIONS, // Transition to preemptive mode and track transitions in reverse P/Invoke prolog. diff --git a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs index 8af0179381d0ce..a83d87d206a273 100644 --- a/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs +++ b/src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs @@ -2358,8 +2358,6 @@ private CorInfoHelpFunc getBoxHelper(CORINFO_CLASS_STRUCT_* cls) { var type = HandleToObject(cls); - // we shouldn't allow boxing of types that contains stack pointers - // csc and vbc already disallow it. if (type.IsByRefLike) ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramSpecific, MethodBeingCompiled); @@ -3940,7 +3938,7 @@ private bool notifyInstructionSetUsage(InstructionSet instructionSet, bool suppo if (!isMethodDefinedInCoreLib()) { // If a vector instruction set is marked as attempted to be used, but is also explicitly unsupported - // then we need to mark as explicitly unsupported the implied instruction set associated with the vector set. + // then we need to mark as explicitly unsupported the implied instruction set associated with the vector set. instructionSet = InstructionSetFlags.ConvertToImpliedInstructionSetForVectorInstructionSets(_compilation.TypeSystemContext.Target.Architecture, instructionSet); _actualInstructionSetUnsupported.AddInstructionSet(instructionSet); diff --git a/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.cs b/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.cs index eec341114e40a4..a6ca019dcabdc7 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/GenericParameterDesc.cs @@ -57,6 +57,11 @@ public enum GenericConstraints /// constructor. /// DefaultConstructorConstraint = 0x10, + + /// + /// A type is permitted to be ByRefLike. + /// + AcceptByRefLike = 0x20, } public abstract partial class GenericParameterDesc : TypeDesc diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemConstraintsHelpers.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemConstraintsHelpers.cs index cebce492c5fbff..d749946a72a3d0 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemConstraintsHelpers.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/TypeSystemConstraintsHelpers.cs @@ -36,7 +36,7 @@ private static bool VerifyGenericParamConstraint(InstantiationContext genericPar // Check default constructor constraint if ((constraints & GenericConstraints.DefaultConstructorConstraint) != 0) { - if (!instantiationParam.HasExplicitOrImplicitDefaultConstructor() + if (!instantiationParam.HasExplicitOrImplicitDefaultConstructor() && !CheckGenericSpecialConstraint(instantiationParam, GenericConstraints.DefaultConstructorConstraint)) return false; } @@ -44,11 +44,15 @@ private static bool VerifyGenericParamConstraint(InstantiationContext genericPar // Check struct constraint if ((constraints & GenericConstraints.NotNullableValueTypeConstraint) != 0) { - if ((!instantiationParam.IsValueType || instantiationParam.IsNullable) + if ((!instantiationParam.IsValueType || instantiationParam.IsNullable) && !CheckGenericSpecialConstraint(instantiationParam, GenericConstraints.NotNullableValueTypeConstraint)) return false; } + // Check for ByRefLike support + if (instantiationParam.IsByRefLike && (constraints & GenericConstraints.AcceptByRefLike) == 0) + return false; + var instantiatedConstraints = new ArrayBuilder(); GetInstantiatedConstraintsRecursive(instantiationParamContext, instantiationParam, ref instantiatedConstraints); @@ -65,7 +69,7 @@ private static bool VerifyGenericParamConstraint(InstantiationContext genericPar return true; } - // Used to determine whether a type parameter used to instantiate another type parameter with a specific special + // Used to determine whether a type parameter used to instantiate another type parameter with a specific special // constraint satisfies that constraint. private static bool CheckGenericSpecialConstraint(TypeDesc type, GenericConstraints specialConstraint) { diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs index 1a775400feafd6..a4ae4c40a66877 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs @@ -12,7 +12,7 @@ namespace ILCompiler internal class JitHelper { /// - /// Returns JIT helper entrypoint. JIT helpers can be either implemented by entrypoint with given mangled name or + /// Returns JIT helper entrypoint. JIT helpers can be either implemented by entrypoint with given mangled name or /// by a method in class library. /// public static void GetEntryPoint(TypeSystemContext context, ReadyToRunHelper id, out string mangledName, out MethodDesc methodDesc) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs index bdc1ac61a69ad3..bc4de930eb8d2e 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs @@ -31,7 +31,7 @@ partial class ILImporter private DependencyList _dependencies = new DependencyList(); private readonly byte[] _ilBytes; - + private class BasicBlock { // Common fields @@ -82,7 +82,7 @@ public ILImporter(ILScanner compilation, MethodDesc method, MethodIL methodIL = _compilation = compilation; _factory = (ILScanNodeFactory)compilation.NodeFactory; - + _ilBytes = methodIL.GetILBytes(); _canonMethodIL = methodIL; @@ -149,7 +149,7 @@ public DependencyList Import() _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.MonitorEnter), reason); _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.MonitorExit), reason); } - + } FindBasicBlocks(); @@ -414,7 +414,7 @@ private void ImportCall(ILOpcode opcode, int token) // type though, so we would fail to resolve and box. We have a special path for those to avoid boxing. directMethod = _compilation.TypeSystemContext.TryResolveConstrainedEnumMethod(constrained, method); } - + if (directMethod != null) { // Either @@ -628,7 +628,7 @@ private void ImportCall(ILOpcode opcode, int token) else _dependencies.Add(_factory.ConstructedTypeSymbol(_constrained), reason); } - + if (referencingArrayAddressMethod && !_isReadOnly) { // Address method is special - it expects an instantiation argument, unless a readonly prefix was applied. @@ -768,7 +768,7 @@ private void ImportLdFtn(int token, ILOpcode opCode) { ImportCall(opCode, token); } - + private void ImportBranch(ILOpcode opcode, BasicBlock target, BasicBlock fallthrough) { ImportFallthrough(target); @@ -1071,11 +1071,11 @@ private void AddBoxingDependencies(TypeDesc type, string reason) if (type.IsNullable) { - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Box), reason); + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Box_Nullable), reason); } else { - _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Box_Nullable), reason); + _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.Box), reason); } } @@ -1165,7 +1165,7 @@ private void ImportBinaryOperation(ILOpcode opcode) { _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.ThrowDivZero), "_divbyzero"); } - break; + break; case ILOpcode.rem: case ILOpcode.rem_un: if (_compilation.TypeSystemContext.Target.Architecture == TargetArchitecture.ARM) @@ -1190,7 +1190,7 @@ private void ImportFallthrough(BasicBlock next) private int ReadILTokenAt(int ilOffset) { - return (int)(_ilBytes[ilOffset] + return (int)(_ilBytes[ilOffset] + (_ilBytes[ilOffset + 1] << 8) + (_ilBytes[ilOffset + 2] << 16) + (_ilBytes[ilOffset + 3] << 24)); diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs index 8ec3cf31f332e0..e250d64fbf9ee4 100644 --- a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs @@ -14,7 +14,7 @@ namespace ILCompiler.Reflection.ReadyToRun { /// - /// This represents all possible signatures that is + /// This represents all possible signatures that is /// public abstract class ReadyToRunSignature { diff --git a/src/coreclr/vm/generics.cpp b/src/coreclr/vm/generics.cpp index de6683aa542ff3..c58ef270e0874f 100644 --- a/src/coreclr/vm/generics.cpp +++ b/src/coreclr/vm/generics.cpp @@ -583,15 +583,6 @@ BOOL CheckInstantiation(Instantiation inst) { return FALSE; } - - MethodTable* pMT = th.GetMethodTable(); - if (pMT != NULL) - { - if (pMT->IsByRefLike()) - { - return FALSE; - } - } } return TRUE; } diff --git a/src/coreclr/vm/jithelpers.cpp b/src/coreclr/vm/jithelpers.cpp index 11b9ff7bf7f5d7..67f4f9c9c7f2fa 100644 --- a/src/coreclr/vm/jithelpers.cpp +++ b/src/coreclr/vm/jithelpers.cpp @@ -2701,9 +2701,7 @@ HCIMPL2(Object*, JIT_Box, CORINFO_CLASS_HANDLE type, void* unboxedData) pMT->CheckRestore(); - // You can only box valuetypes - if (!pMT->IsValueType()) - COMPlusThrow(kInvalidCastException, W("Arg_ObjObj")); + _ASSERTE (pMT->IsValueType() && !pMT->IsByRefLike()); #ifdef _DEBUG if (g_pConfig->FastGCStressLevel()) { diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp index 6c78beebdffa2c..8f31f56c7f95df 100644 --- a/src/coreclr/vm/jitinterface.cpp +++ b/src/coreclr/vm/jitinterface.cpp @@ -6013,7 +6013,7 @@ CorInfoHelpFunc CEEInfo::getBoxHelper(CORINFO_CLASS_HANDLE clsHnd) } else { - if(VMClsHnd.IsTypeDesc()) + if (VMClsHnd.IsTypeDesc() || !VMClsHnd.IsValueType()) COMPlusThrow(kInvalidOperationException,W("InvalidOperation_TypeCannotBeBoxed")); // we shouldn't allow boxing of types that contains stack pointers diff --git a/src/coreclr/vm/siginfo.cpp b/src/coreclr/vm/siginfo.cpp index 5a277914d8cee5..c52c462c1ff24f 100644 --- a/src/coreclr/vm/siginfo.cpp +++ b/src/coreclr/vm/siginfo.cpp @@ -4734,6 +4734,11 @@ BOOL MetaSig::CompareVariableConstraints(const Substitution *pSubst1, if ((specialConstraints2 & (gpDefaultConstructorConstraint | gpNotNullableValueTypeConstraint)) == 0) return FALSE; } + if ((specialConstraints1 & gpAcceptByRefLike) != 0) + { + if ((specialConstraints2 & gpAcceptByRefLike) == 0) + return FALSE; + } } diff --git a/src/coreclr/vm/typedesc.cpp b/src/coreclr/vm/typedesc.cpp index 3b1a1c90ce0825..23c6b1ee5f3ed1 100644 --- a/src/coreclr/vm/typedesc.cpp +++ b/src/coreclr/vm/typedesc.cpp @@ -1435,7 +1435,7 @@ BOOL TypeVarTypeDesc::SatisfiesConstraints(SigTypeContext *pTypeContextOfConstra ArrayList argList; - // First check special constraints (must-be-reference-type, must-be-value-type, and must-have-default-constructor) + // First check special constraints DWORD flags; IfFailThrow(pInternalImport->GetGenericParamProps(genericParamToken, NULL, &flags, NULL, NULL, NULL)); @@ -1522,6 +1522,9 @@ BOOL TypeVarTypeDesc::SatisfiesConstraints(SigTypeContext *pTypeContextOfConstra if (thArg.IsTypeDesc() || (!thArg.AsMethodTable()->HasExplicitOrImplicitPublicDefaultConstructor())) return FALSE; } + + if (thArg.IsByRefLike() && (specialConstraints & gpAcceptByRefLike) == 0) + return FALSE; } // Complete the list by adding thArg itself. If thArg is not a generic variable this will be the only @@ -1598,7 +1601,7 @@ BOOL TypeVarTypeDesc::SatisfiesConstraints(SigTypeContext *pTypeContextOfConstra // to ensure that the implementation of the constraint is complete // // Do not apply this check when the generic argument is exactly a generic variable, as those - // do not hold the correct detail for checking, and do not need to do so. This constraint rule + // do not hold the correct detail for checking, and do not need to do so. This constraint rule // is only applicable for generic arguments which have been specialized to some extent if (!thArg.IsGenericVariable() && !thElem.IsTypeDesc() && diff --git a/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.il b/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.il new file mode 100644 index 00000000000000..51262790af14a2 --- /dev/null +++ b/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.il @@ -0,0 +1,631 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +.assembly extern System.Console { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } +.assembly extern System.Runtime { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) } + +.assembly InvalidCSharp { } + +// +// Begin invalid +// + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_Invalid`1 + extends [System.Runtime]System.Object +{ + .method public hidebysig specialname rtspecialname + instance void .ctor () cil managed + { + ldarg.0 + call instance void [System.Runtime]System.Object::.ctor() + ret + } +} + +.class interface public auto ansi abstract InvalidCSharp.GenericInterface_Invalid`1 +{ +} + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericValueType_Invalid`1 + extends [System.Runtime]System.ValueType +{ +} + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericByRefLike_Invalid`1 + extends [System.Runtime]System.ValueType +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = ( + 01 00 00 00 + ) +} + +// +// End invalid +// + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_Over`1 + extends [System.Runtime]System.Object +{ + .method public hidebysig specialname rtspecialname + instance void .ctor () cil managed + { + ldarg.0 + call instance void [System.Runtime]System.Object::.ctor() + ret + } +} + +.class interface public auto ansi abstract InvalidCSharp.GenericInterface_Over`1 +{ +} + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericValueType_Over`1 + extends [System.Runtime]System.ValueType +{ +} + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericByRefLike_Over`1 + extends [System.Runtime]System.ValueType +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = ( + 01 00 00 00 + ) + + .field public !T Field + + .method public hidebysig + instance object BoxAsObject(!T) cil managed + { + ldarg.1 + box !T + ret + } + + .method public hidebysig + instance bool BoxUnboxAny(!T) cil managed + { + ldarg.1 + // Begin sequence + box !T + unbox.any !T + // End sequence + pop + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool BoxBranch(!T) cil managed + { + ldarg.1 + // Begin sequence + box !T + brfalse.s NEXT_1 + // End sequence + NEXT_1: + + ldarg.1 + // Begin sequence + box !T + brfalse NEXT_2 + // End sequence + NEXT_2: + + ldarg.1 + // Begin sequence + box !T + brtrue.s NEXT_3 + // End sequence + NEXT_3: + + ldarg.1 + // Begin sequence + box !T + brtrue NEXT_4 + // End sequence + NEXT_4: + + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool BoxBranch_WithSideEffects(!T&) cil managed + { + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + brfalse.s NEXT_1 + // End sequence + NEXT_1: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + brfalse NEXT_2 + // End sequence + NEXT_2: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + brtrue.s NEXT_3 + // End sequence + NEXT_3: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + brtrue NEXT_4 + // End sequence + NEXT_4: + + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool BoxIsinstUnboxAny(!T) cil managed + { + ldarg.1 + // Begin sequence + box !T + isinst ByRefLikeType + unbox.any !T + // End sequence + pop + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool BoxIsinstBranch(!T) cil managed + { + ldarg.1 + // Begin sequence + box !T + isinst ByRefLikeType + brfalse.s NEXT_1 + // End sequence + NEXT_1: + + ldarg.1 + // Begin sequence + box !T + isinst ByRefLikeType + brfalse NEXT_2 + // End sequence + NEXT_2: + + ldarg.1 + // Begin sequence + box !T + isinst ByRefLikeType + brtrue.s NEXT_3 + // End sequence + NEXT_3: + + ldarg.1 + // Begin sequence + box !T + isinst ByRefLikeType + brtrue NEXT_4 + // End sequence + NEXT_4: + + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool BoxIsinstBranch_WithSideEffects(!T&) cil managed + { + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + isinst ByRefLikeType + brfalse.s NEXT_1 + // End sequence + NEXT_1: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + isinst ByRefLikeType + brfalse NEXT_2 + // End sequence + NEXT_2: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + isinst ByRefLikeType + brtrue.s NEXT_3 + // End sequence + NEXT_3: + + ldarg.1 + // Begin sequence + ldobj !T // Side-effect + box !T + isinst ByRefLikeType + brtrue NEXT_4 + // End sequence + NEXT_4: + + ldc.i4.1 + ret + } + + .method public hidebysig + instance bool AllocArrayOfT() cil managed aggressiveinlining + { + ldc.i4.1 + newarr !T + ldnull + cgt.un + ret + } + + .method public hidebysig + instance bool AllocMultiDimArrayOfT() cil managed + { + ldc.i4.1 + ldc.i4.1 + newobj instance void !T[0..., 0...]::.ctor(int32, int32) + ldnull + cgt.un + ret + } + + .method public hidebysig + instance bool InstanceOfT( + object o + ) cil managed + { + ldarg.1 + isinst !T + ldnull + cgt.un + ret + } + + .method public hidebysig + instance void CastToT( + object o + ) cil managed + { + ldarg.1 + castclass !T + pop + ret + } + + .method public hidebysig + instance void UnboxToT( + object o + ) cil managed + { + ldarg.1 + unbox.any !T + pop + ret + } +} + +.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_WithStaticField`1 + extends [System.Runtime]System.Object +{ + .method public hidebysig specialname rtspecialname + instance void .ctor () cil managed + { + .locals init ( + [0] !T, + [1] !T + ) + + ldarg.0 + call instance void [System.Runtime]System.Object::.ctor() + + ldloca.s 0 + initobj !T + + ldloc.0 + stsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1::StaticField + ldsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1::StaticField + stloc.1 + ret + } + + .field public static !T StaticField +} + +.class public sequential ansi sealed beforefieldinit ByRefLikeType + extends [System.Runtime]System.ValueType +{ + .custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = ( + 01 00 00 00 + ) +} + +.class public auto ansi abstract sealed beforefieldinit Exec + extends [System.Runtime]System.Object +{ + .method public hidebysig static + string GenericClass() cil managed + { + ldtoken class InvalidCSharp.GenericClass_Over`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericInterface() cil managed + { + ldtoken class InvalidCSharp.GenericInterface_Over`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericValueType() cil managed + { + ldtoken valuetype InvalidCSharp.GenericValueType_Over`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericByRefLike() cil managed + { + ldtoken valuetype InvalidCSharp.GenericByRefLike_Over`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + + .method public hidebysig static + string GenericClass_Invalid() cil managed + { + ldtoken class InvalidCSharp.GenericClass_Invalid`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericInterface_Invalid() cil managed + { + ldtoken class InvalidCSharp.GenericInterface_Invalid`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericValueType_Invalid() cil managed + { + ldtoken valuetype InvalidCSharp.GenericValueType_Invalid`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + .method public hidebysig static + string GenericByRefLike_Invalid() cil managed + { + ldtoken valuetype InvalidCSharp.GenericByRefLike_Invalid`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + + .method public hidebysig static + object BoxAsObject() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldloc 0 + ldfld !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance object valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxAsObject(!0) + ret + } + + .method public hidebysig static + bool BoxUnboxAny() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldloc 0 + ldfld !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxUnboxAny(!0) + ret + } + + .method public hidebysig static + bool BoxBranch() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1, + [1] bool + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + + ldloca.s 0 + ldloc 0 + ldfld !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxBranch(!0) + pop + + ldloca.s 0 + ldloca.s 0 + ldflda !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxBranch_WithSideEffects(!0&) + + ret + } + + .method public hidebysig static + bool BoxIsinstUnboxAny() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldloc 0 + ldfld !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxIsinstUnboxAny(!0) + ret + } + + .method public hidebysig static + bool BoxIsinstBranch() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + + ldloca.s 0 + ldloc 0 + ldfld !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxIsinstBranch(!0) + pop + + ldloca.s 0 + ldloca.s 0 + ldflda !0 valuetype InvalidCSharp.GenericByRefLike_Over`1::Field + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::BoxIsinstBranch_WithSideEffects(!0&) + + ret + } + + .method public hidebysig static + void AllocArrayOfT_Invalid() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::AllocArrayOfT() + pop + ret + } + + .method public hidebysig static + void AllocMultiDimArrayOfT_Invalid() cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::AllocMultiDimArrayOfT() + pop + ret + } + + .method public hidebysig static + string GenericClassWithStaticField_Invalid() cil managed + { + ldtoken class InvalidCSharp.GenericClass_WithStaticField`1 + call class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle) + callvirt instance string [System.Runtime]System.Object::ToString() + ret + } + + .method public hidebysig static + bool InstanceOfT(object) cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldarg.0 + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::InstanceOfT(object) + ret + } + + .method public hidebysig static + void CastToT(object) cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldarg.0 + call instance void valuetype InvalidCSharp.GenericByRefLike_Over`1::CastToT(object) + ret + } + + .method public hidebysig static + void UnboxToT(object) cil managed + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldloca.s 0 + ldarg.0 + call instance void valuetype InvalidCSharp.GenericByRefLike_Over`1::UnboxToT(object) + ret + } + + .method public hidebysig static + bool TypeLoadExceptionAvoidsInline(bool) cil managed noinlining + { + .locals init ( + [0] valuetype InvalidCSharp.GenericByRefLike_Over`1 + ) + + ldloca.s 0 + initobj valuetype InvalidCSharp.GenericByRefLike_Over`1 + ldarg.0 + brfalse.s DONTCALL + + ldloca.s 0 + call instance bool valuetype InvalidCSharp.GenericByRefLike_Over`1::AllocArrayOfT() + br.s DONE + + // Negate the input and return + DONTCALL: ldarg.0 + ldc.i4.0 + ceq + + DONE: ret + } +} \ No newline at end of file diff --git a/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.ilproj b/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.ilproj new file mode 100644 index 00000000000000..a5e71a6861e838 --- /dev/null +++ b/src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.ilproj @@ -0,0 +1,20 @@ + + + library + SharedLibrary + + $(ArtifactsBinDir)/coreclr/$(OSPlatformConfig) + + + $(ArtifactsBinDir)/coreclr/$(_hostOS).$(TargetArchitecture).Release + true + true + + + + + \ No newline at end of file diff --git a/src/tests/Loader/classloader/generics/ByRefLike/Validate.cs b/src/tests/Loader/classloader/generics/ByRefLike/Validate.cs new file mode 100644 index 00000000000000..15f0c831e08e3c --- /dev/null +++ b/src/tests/Loader/classloader/generics/ByRefLike/Validate.cs @@ -0,0 +1,110 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.IO; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using InvalidCSharp; + +using Xunit; + +class Validate +{ + [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_TypeLoad() + { + Console.WriteLine($"{nameof(Validate_TypeLoad)}..."); + + Console.WriteLine($" -- Instantiate: {Exec.GenericClass()}"); + Console.WriteLine($" -- Instantiate: {Exec.GenericInterface()}"); + Console.WriteLine($" -- Instantiate: {Exec.GenericValueType()}"); + Console.WriteLine($" -- Instantiate: {Exec.GenericByRefLike()}"); + + Assert.Throws(() => { Exec.GenericClass_Invalid(); }); + Assert.Throws(() => { Exec.GenericInterface_Invalid(); }); + Assert.Throws(() => { Exec.GenericValueType_Invalid(); }); + Assert.Throws(() => { Exec.GenericByRefLike_Invalid(); }); + } + + [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_Casting_Scenarios() + { + Console.WriteLine($"{nameof(Validate_Casting_Scenarios)}..."); + + // Opcodes that can handle cases naturally for ByRefLike types should fail. + // Since ByRefLike types can never be boxed, it stands to reason attempting + // to cast an object to a ByRefLike type will always return null or throw an + // appropriate exception. + Assert.False(Exec.InstanceOfT(new object())); + Assert.Throws(() => { Exec.CastToT(new object()); }); + Assert.Throws(() => { Exec.UnboxToT(new object()); }); + } + + [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_RecognizedOpCodeSequences_Scenarios() + { + Console.WriteLine($"{nameof(Validate_RecognizedOpCodeSequences_Scenarios)}..."); + + Assert.True(Exec.BoxUnboxAny()); + Assert.True(Exec.BoxBranch()); + Assert.True(Exec.BoxIsinstUnboxAny()); + Assert.True(Exec.BoxIsinstBranch()); + } + + [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_InvalidOpCode_Scenarios() + { + Console.WriteLine($"{nameof(Validate_InvalidOpCode_Scenarios)}..."); + + // These methods uses opcodes that are not able to handle ByRefLike type operands. + // The TypeLoader prevents these invalid types from being constructed. We rely on + // the failure to construct these invalid types to block opcode usage. + Assert.Throws(() => { Exec.AllocArrayOfT_Invalid(); }); + Assert.Throws(() => { Exec.AllocMultiDimArrayOfT_Invalid(); }); + Assert.Throws(() => { Exec.GenericClassWithStaticField_Invalid(); }); + + // Test that explicitly tries to box a ByRefLike type. + Assert.Throws(() => { Exec.BoxAsObject(); }); + } + + [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_Inlining_Behavior() + { + Console.WriteLine($"{nameof(Validate_Inlining_Behavior)}..."); + + // The call here is to ensure that an inlinable method that isn't called + // due to a branch, see input argument, doesn't break the compilation of the + // rest of method that is executed. + Assert.True(Exec.TypeLoadExceptionAvoidsInline(false)); + } + + // [Fact] + [SkipOnMono("Mono does not support ByRefLike generics yet")] + public static void Validate_MemberDiscoveryViaReflection_ForSpanReadOnlySpan() + { + Console.WriteLine($"{nameof(Validate_MemberDiscoveryViaReflection_ForSpanReadOnlySpan)}..."); + + // // Validate specific Span and ReadOnlySpan constructors can be discovered when T is ByRefLike + // { + // var ctor = typeof(Span).GetConstructor(new[] { typeof(void).MakePointerType(), typeof(int) }); + // Assert.NotNull(ctor); + // } + + // { + // var ctor = typeof(ReadOnlySpan).GetConstructor(new[] { typeof(void).MakePointerType(), typeof(int) }); + // Assert.NotNull(ctor); + // } + + // // Validate overloaded methods of Span can be discovered when T is ByRefLike + // { + // var m = typeof(Span).GetMethod("op_Implicit", new[] { typeof(Span) }); + // Assert.NotNull(m); + // } + } +} \ No newline at end of file diff --git a/src/tests/Loader/classloader/generics/ByRefLike/Validate.csproj b/src/tests/Loader/classloader/generics/ByRefLike/Validate.csproj new file mode 100644 index 00000000000000..f07b10c66b9c47 --- /dev/null +++ b/src/tests/Loader/classloader/generics/ByRefLike/Validate.csproj @@ -0,0 +1,15 @@ + + + Exe + + true + true + + + + + + + + + diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 31c42e2e19fd59..8a17c398838f8e 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -2802,6 +2802,9 @@ expected failure: unsupported type with ref field fails at AOT compile time, not runtime + + expected failure: unsupported type with ByRefLike parameters currently fails at AOT compile time, not runtime + https://github.com/dotnet/runtime/issues/57361