diff options
| -rw-r--r-- | pyGHDL/libghdl/std_names.py | 1334 | ||||
| -rw-r--r-- | pyGHDL/libghdl/vhdl/tokens.py | 105 | ||||
| -rw-r--r-- | src/std_names.adb | 2 | ||||
| -rw-r--r-- | src/std_names.ads | 41 | ||||
| -rw-r--r-- | src/vhdl/vhdl-scanner.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/vhdl-tokens.adb | 2 | ||||
| -rw-r--r-- | src/vhdl/vhdl-tokens.ads | 1 |
7 files changed, 747 insertions, 740 deletions
diff --git a/pyGHDL/libghdl/std_names.py b/pyGHDL/libghdl/std_names.py index f1f63f12a..5af03ac5a 100644 --- a/pyGHDL/libghdl/std_names.py +++ b/pyGHDL/libghdl/std_names.py @@ -121,673 +121,673 @@ class Name: Restrict = 363 Restrict_Guarantee = 364 Sequence = 365 - Vmode = 366 - Vprop = 367 - Vunit = 368 - Last_Vhdl08 = 368 - First_Ams_Keyword = 369 - Across = 369 - Break = 370 - Limit = 371 - Nature = 372 - Noise = 373 - Procedural = 374 - Quantity = 375 - Reference = 376 - Spectrum = 377 - Subnature = 378 - Terminal = 379 - Through = 380 - Tolerance = 381 - Last_AMS_Vhdl = 381 - Last_Keyword = 381 - First_Verilog = 382 - Always = 382 - Assign = 383 - Buf = 384 - Bufif0 = 385 - Bufif1 = 386 - Casex = 387 - Casez = 388 - Cmos = 389 - Deassign = 390 - Defparam = 391 - Disable = 392 - Edge = 393 - Endcase = 394 - Endfunction = 395 - Endmodule = 396 - Endprimitive = 397 - Endspecify = 398 - Endtable = 399 - Endtask = 400 - Forever = 401 - Fork = 402 - Highz0 = 403 - Highz1 = 404 - Ifnone = 405 - Initial = 406 - Input = 407 - Join = 408 - Large = 409 - Macromodule = 410 - Medium = 411 - Module = 412 - Negedge = 413 - Nmos = 414 - Notif0 = 415 - Notif1 = 416 - Output = 417 - Pmos = 418 - Posedge = 419 - Primitive = 420 - Pull0 = 421 - Pull1 = 422 - Pulldown = 423 - Pullup = 424 - Realtime = 425 - Reg = 426 - Repeat = 427 - Rcmos = 428 - Rnmos = 429 - Rpmos = 430 - Rtran = 431 - Rtranif0 = 432 - Rtranif1 = 433 - Scalared = 434 - Small = 435 - Specify = 436 - Specparam = 437 - Strong0 = 438 - Strong1 = 439 - Supply0 = 440 - Supply1 = 441 - Tablex = 442 - Task = 443 - Tran = 444 - Tranif0 = 445 - Tranif1 = 446 - Tri = 447 - Tri0 = 448 - Tri1 = 449 - Triand = 450 - Trior = 451 - Trireg = 452 - Vectored = 453 - Wand = 454 - Weak0 = 455 - Weak1 = 456 - Wire = 457 - Wor = 458 - Last_Verilog = 458 - First_V2001 = 459 - Automatic = 459 - Endgenerate = 460 - Genvar = 461 - Localparam = 462 - Unsigned = 463 - Signed = 464 - Last_V2001 = 464 - Uwire = 465 - First_SV3_0 = 466 - Always_Comb = 466 - Always_Ff = 467 - Always_Latch = 468 - Bit = 469 - Byte = 470 - Changed = 471 - Char = 472 - Const = 473 - Continue = 474 - Do = 475 - Endinterface = 476 - Endtransition = 477 - Enum = 478 - Export = 479 - Extern = 480 - Forkjoin = 481 - Iff = 482 - Import = 483 - Int = 484 - Interface = 485 - Logic = 486 - Longint = 487 - Longreal = 488 - Modport = 489 - Packed = 490 - Priority = 491 - Shortint = 492 - Shortreal = 493 - Static = 494 - Struct = 495 - Timeprecision = 496 - Timeunit = 497 - Transition = 498 - Typedef = 499 - Union = 500 - Unique = 501 - Unique0 = 502 - Void = 503 - Last_SV3_0 = 503 - First_SV3_1 = 504 - Chandle = 504 - Class = 505 - Clocking = 506 - Constraint = 507 - Dist = 508 - Endclass = 509 - Endclocking = 510 - Endprogram = 511 - Endproperty = 512 - Endsequence = 513 - Extends = 514 - Final = 515 - First_Match = 516 - Inside = 517 - Intersect = 518 - Join_Any = 519 - Join_None = 520 - Local = 521 - Program = 522 - Rand = 523 - Randc = 524 - Ref = 525 - Solve = 526 - String = 527 - Super = 528 - This = 529 - Throughout = 530 - Var = 531 - Virtual = 532 - Wait_Order = 533 - Last_SV3_1 = 533 - First_SV3_1a = 534 - Covergroup = 534 - Coverpoint = 535 - Endgroup = 536 - Endpackage = 537 - Expect = 538 - Foreach = 539 - Ignore_Bins = 540 - Illegal_Bins = 541 - Matches = 542 - Randcase = 543 - Randsequence = 544 - Tagged = 545 - Wildcard = 546 - Last_SV3_1a = 546 - First_SV2009 = 547 - Implies = 547 - S_Until = 548 - S_Until_With = 549 - Until_With = 550 - Last_SV2009 = 550 - First_Operator = 551 - Op_Equality = 551 - Op_Inequality = 552 - Op_Less = 553 - Op_Less_Equal = 554 - Op_Greater = 555 - Op_Greater_Equal = 556 - Op_Plus = 557 - Op_Minus = 558 - Op_Mul = 559 - Op_Div = 560 - Op_Exp = 561 - Op_Concatenation = 562 - Op_Condition = 563 - Op_Match_Equality = 564 - Op_Match_Inequality = 565 - Op_Match_Less = 566 - Op_Match_Less_Equal = 567 - Op_Match_Greater = 568 - Op_Match_Greater_Equal = 569 - Last_Operator = 569 - First_Attribute = 570 - Base = 570 - Left = 571 - Right = 572 - High = 573 - Low = 574 - Pos = 575 - Val = 576 - Succ = 577 - Pred = 578 - Leftof = 579 - Rightof = 580 - Reverse_Range = 581 - Length = 582 - Delayed = 583 - Stable = 584 - Quiet = 585 - Transaction = 586 - Event = 587 - Active = 588 - Last_Event = 589 - Last_Active = 590 - Last_Value = 591 - Last_Attribute = 591 - First_Vhdl87_Attribute = 592 - Behavior = 592 - Structure = 593 - Last_Vhdl87_Attribute = 593 - First_Vhdl93_Attribute = 594 - Ascending = 594 - Image = 595 - Value = 596 - Driving = 597 - Driving_Value = 598 - Simple_Name = 599 - Instance_Name = 600 - Path_Name = 601 - Last_Vhdl93_Attribute = 601 - First_Vhdl08_Attribute = 602 - Element = 602 - Last_Vhdl08_Attribute = 602 - First_AMS_Attribute = 603 - Contribution = 603 - Dot = 604 - Integ = 605 - Above = 606 - Zoh = 607 - Ltf = 608 - Ztf = 609 - Ramp = 610 - Slew = 611 - Last_AMS_Attribute = 611 - First_Standard = 612 - Std = 612 - Standard = 613 - Boolean = 614 - NFalse = 615 - NTrue = 616 - Character = 617 - Severity_Level = 618 - Note = 619 - Warning = 620 - Error = 621 - Failure = 622 - Universal_Integer = 623 - Universal_Real = 624 - Convertible_Integer = 625 - Convertible_Real = 626 - Integer = 627 - Real = 628 - Time = 629 - Fs = 630 - Ps = 631 - Ns = 632 - Us = 633 - Ms = 634 - Sec = 635 - Min = 636 - Hr = 637 - Max = 638 - Delay_Length = 639 - Now = 640 - Natural = 641 - Positive = 642 - Bit_Vector = 643 - File_Open_Kind = 644 - Read_Mode = 645 - Write_Mode = 646 - Append_Mode = 647 - File_Open_Status = 648 - Open_Ok = 649 - Status_Error = 650 - Name_Error = 651 - Mode_Error = 652 - Foreign = 653 - Boolean_Vector = 654 - To_Bstring = 655 - To_Binary_String = 656 - To_Ostring = 657 - To_Octal_String = 658 - To_Hstring = 659 - To_Hex_String = 660 - Integer_Vector = 661 - Real_Vector = 662 - Time_Vector = 663 - Digits = 664 - Format = 665 - Unit = 666 - Domain_Type = 667 - Quiescent_Domain = 668 - Time_Domain = 669 - Frequency_Domain = 670 - Domain = 671 - Frequency = 672 - Last_Standard = 672 - First_Charname = 673 - Nul = 673 - Soh = 674 - Stx = 675 - Etx = 676 - Eot = 677 - Enq = 678 - Ack = 679 - Bel = 680 - Bs = 681 - Ht = 682 - Lf = 683 - Vt = 684 - Ff = 685 - Cr = 686 - So = 687 - Si = 688 - Dle = 689 - Dc1 = 690 - Dc2 = 691 - Dc3 = 692 - Dc4 = 693 - Nak = 694 - Syn = 695 - Etb = 696 - Can = 697 - Em = 698 - Sub = 699 - Esc = 700 - Fsp = 701 - Gsp = 702 - Rsp = 703 - Usp = 704 - Del = 705 - C128 = 706 - C129 = 707 - C130 = 708 - C131 = 709 - C132 = 710 - C133 = 711 - C134 = 712 - C135 = 713 - C136 = 714 - C137 = 715 - C138 = 716 - C139 = 717 - C140 = 718 - C141 = 719 - C142 = 720 - C143 = 721 - C144 = 722 - C145 = 723 - C146 = 724 - C147 = 725 - C148 = 726 - C149 = 727 - C150 = 728 - C151 = 729 - C152 = 730 - C153 = 731 - C154 = 732 - C155 = 733 - C156 = 734 - C157 = 735 - C158 = 736 - C159 = 737 - Last_Charname = 737 - First_Misc = 738 - Guard = 738 - Deallocate = 739 - File_Open = 740 - File_Close = 741 - Read = 742 - Write = 743 - Flush = 744 - Endfile = 745 - I = 746 - J = 747 - F = 748 - L = 749 - P = 750 - R = 751 - S = 752 - V = 753 - External_Name = 754 - Open_Kind = 755 - First = 756 - Last = 757 - Textio = 758 - Work = 759 - Text = 760 - To_String = 761 - Minimum = 762 - Maximum = 763 - Untruncated_Text_Read = 764 - Textio_Read_Real = 765 - Textio_Write_Real = 766 - Get_Resolution_Limit = 767 - Control_Simulation = 768 - Step = 769 - Index = 770 - Item = 771 - Uu_File_Uu = 772 - Uu_Line_Uu = 773 - Label_Applies_To = 774 - Return_Port_Name = 775 - Map_To_Operator = 776 - Type_Function = 777 - Built_In = 778 - NNone = 779 - Last_Misc = 779 - First_Ieee_Pkg = 780 - Ieee = 780 - Std_Logic_1164 = 781 - VITAL_Timing = 782 - Numeric_Std = 783 - Numeric_Bit = 784 - Numeric_Std_Unsigned = 785 - Std_Logic_Arith = 786 - Std_Logic_Signed = 787 - Std_Logic_Unsigned = 788 - Std_Logic_Textio = 789 - Std_Logic_Misc = 790 - Math_Real = 791 - Last_Ieee_Pkg = 791 - First_Ieee_Name = 792 - Std_Ulogic = 792 - Std_Ulogic_Vector = 793 - Std_Logic = 794 - Std_Logic_Vector = 795 - Rising_Edge = 796 - Falling_Edge = 797 - VITAL_Level0 = 798 - VITAL_Level1 = 799 - Unresolved_Unsigned = 800 - Unresolved_Signed = 801 - To_Integer = 802 - To_Unsigned = 803 - To_Signed = 804 - Resize = 805 - Std_Match = 806 - Shift_Left = 807 - Shift_Right = 808 - Rotate_Left = 809 - Rotate_Right = 810 - To_Bit = 811 - To_Bitvector = 812 - To_Stdulogic = 813 - To_Stdlogicvector = 814 - To_Stdulogicvector = 815 - Is_X = 816 - To_01 = 817 - To_X01 = 818 - To_X01Z = 819 - To_UX01 = 820 - Conv_Signed = 821 - Conv_Unsigned = 822 - Conv_Integer = 823 - Conv_Std_Logic_Vector = 824 - And_Reduce = 825 - Nand_Reduce = 826 - Or_Reduce = 827 - Nor_Reduce = 828 - Xor_Reduce = 829 - Xnor_Reduce = 830 - Ceil = 831 - Floor = 832 - Round = 833 - Log2 = 834 - Sin = 835 - Cos = 836 - Arctan = 837 - Shl = 838 - Shr = 839 - Ext = 840 - Sxt = 841 - Find_Leftmost = 842 - Find_Rightmost = 843 - Last_Ieee_Name = 843 - First_Synthesis = 844 - Allconst = 844 - Allseq = 845 - Anyconst = 846 - Anyseq = 847 - Gclk = 848 - Loc = 849 - Keep = 850 - Last_Synthesis = 850 - First_Directive = 851 - Define = 851 - Endif = 852 - Ifdef = 853 - Ifndef = 854 - Include = 855 - Timescale = 856 - Undef = 857 - Protect = 858 - Begin_Protected = 859 - End_Protected = 860 - Key_Block = 861 - Data_Block = 862 - Line = 863 - Celldefine = 864 - Endcelldefine = 865 - Default_Nettype = 866 - Resetall = 867 - Last_Directive = 867 - First_Systask = 868 - Bits = 868 - D_Root = 869 - D_Unit = 870 - Last_Systask = 870 - First_SV_Method = 871 - Size = 871 - Insert = 872 - Delete = 873 - Pop_Front = 874 - Pop_Back = 875 - Push_Front = 876 - Push_Back = 877 - Name = 878 - Len = 879 - Substr = 880 - Exists = 881 - Atoi = 882 - Itoa = 883 - Find = 884 - Find_Index = 885 - Find_First = 886 - Find_First_Index = 887 - Find_Last = 888 - Find_Last_Index = 889 - Num = 890 - Randomize = 891 - Pre_Randomize = 892 - Post_Randomize = 893 - Srandom = 894 - Get_Randstate = 895 - Set_Randstate = 896 - Seed = 897 - State = 898 - Last_SV_Method = 898 - First_BSV = 899 - uAction = 899 - uActionValue = 900 - BVI = 901 - uC = 902 - uCF = 903 - uE = 904 - uSB = 905 - uSBR = 906 - Action = 907 - Endaction = 908 - Actionvalue = 909 - Endactionvalue = 910 - Ancestor = 911 - Clocked_By = 912 - Default_Clock = 913 - Default_Reset = 914 - Dependencies = 915 - Deriving = 916 - Determines = 917 - Enable = 918 - Ifc_Inout = 919 - Input_Clock = 920 - Input_Reset = 921 - Instance = 922 - Endinstance = 923 - Let = 924 - Match = 925 - Method = 926 - Endmethod = 927 - Numeric = 928 - Output_Clock = 929 - Output_Reset = 930 - Par = 931 - Endpar = 932 - Path = 933 - Provisos = 934 - Ready = 935 - Reset_By = 936 - Rule = 937 - Endrule = 938 - Rules = 939 - Endrules = 940 - Same_Family = 941 - Schedule = 942 - Seq = 943 - Endseq = 944 - Typeclass = 945 - Endtypeclass = 946 - Valueof = 947 - uValueof = 948 - Last_BSV = 948 - First_Comment = 949 - Psl = 949 - Pragma = 950 - Synthesis = 951 - Synopsys = 952 - Translate_Off = 953 - Translate_On = 954 - Translate = 955 - Synthesis_Off = 956 - Synthesis_On = 957 - Off = 958 - Full_Case = 959 - Parallel_Case = 960 - Last_Comment = 960 - First_PSL = 961 - A = 961 - Af = 962 - Ag = 963 - Ax = 964 - Abort = 965 - Assume_Guarantee = 966 - Async_Abort = 967 - Before = 968 - Clock = 969 - E = 970 - Ef = 971 - Eg = 972 - Ex = 973 - Endpoint = 974 - Eventually = 975 - Fairness = 976 - Fell = 977 - Forall = 978 - G = 979 - Inf = 980 - Inherit = 981 + Inherit = 366 + Vmode = 367 + Vprop = 368 + Vunit = 369 + Last_Vhdl08 = 369 + First_Ams_Keyword = 370 + Across = 370 + Break = 371 + Limit = 372 + Nature = 373 + Noise = 374 + Procedural = 375 + Quantity = 376 + Reference = 377 + Spectrum = 378 + Subnature = 379 + Terminal = 380 + Through = 381 + Tolerance = 382 + Last_AMS_Vhdl = 382 + Last_Keyword = 382 + First_Verilog = 383 + Always = 383 + Assign = 384 + Buf = 385 + Bufif0 = 386 + Bufif1 = 387 + Casex = 388 + Casez = 389 + Cmos = 390 + Deassign = 391 + Defparam = 392 + Disable = 393 + Edge = 394 + Endcase = 395 + Endfunction = 396 + Endmodule = 397 + Endprimitive = 398 + Endspecify = 399 + Endtable = 400 + Endtask = 401 + Forever = 402 + Fork = 403 + Highz0 = 404 + Highz1 = 405 + Ifnone = 406 + Initial = 407 + Input = 408 + Join = 409 + Large = 410 + Macromodule = 411 + Medium = 412 + Module = 413 + Negedge = 414 + Nmos = 415 + Notif0 = 416 + Notif1 = 417 + Output = 418 + Pmos = 419 + Posedge = 420 + Primitive = 421 + Pull0 = 422 + Pull1 = 423 + Pulldown = 424 + Pullup = 425 + Realtime = 426 + Reg = 427 + Repeat = 428 + Rcmos = 429 + Rnmos = 430 + Rpmos = 431 + Rtran = 432 + Rtranif0 = 433 + Rtranif1 = 434 + Scalared = 435 + Small = 436 + Specify = 437 + Specparam = 438 + Strong0 = 439 + Strong1 = 440 + Supply0 = 441 + Supply1 = 442 + Tablex = 443 + Task = 444 + Tran = 445 + Tranif0 = 446 + Tranif1 = 447 + Tri = 448 + Tri0 = 449 + Tri1 = 450 + Triand = 451 + Trior = 452 + Trireg = 453 + Vectored = 454 + Wand = 455 + Weak0 = 456 + Weak1 = 457 + Wire = 458 + Wor = 459 + Last_Verilog = 459 + First_V2001 = 460 + Automatic = 460 + Endgenerate = 461 + Genvar = 462 + Localparam = 463 + Unsigned = 464 + Signed = 465 + Last_V2001 = 465 + Uwire = 466 + First_SV3_0 = 467 + Always_Comb = 467 + Always_Ff = 468 + Always_Latch = 469 + Bit = 470 + Byte = 471 + Changed = 472 + Char = 473 + Const = 474 + Continue = 475 + Do = 476 + Endinterface = 477 + Endtransition = 478 + Enum = 479 + Export = 480 + Extern = 481 + Forkjoin = 482 + Iff = 483 + Import = 484 + Int = 485 + Interface = 486 + Logic = 487 + Longint = 488 + Longreal = 489 + Modport = 490 + Packed = 491 + Priority = 492 + Shortint = 493 + Shortreal = 494 + Static = 495 + Struct = 496 + Timeprecision = 497 + Timeunit = 498 + Transition = 499 + Typedef = 500 + Union = 501 + Unique = 502 + Unique0 = 503 + Void = 504 + Last_SV3_0 = 504 + First_SV3_1 = 505 + Chandle = 505 + Class = 506 + Clocking = 507 + Constraint = 508 + Dist = 509 + Endclass = 510 + Endclocking = 511 + Endprogram = 512 + Endproperty = 513 + Endsequence = 514 + Extends = 515 + Final = 516 + First_Match = 517 + Inside = 518 + Intersect = 519 + Join_Any = 520 + Join_None = 521 + Local = 522 + Program = 523 + Rand = 524 + Randc = 525 + Ref = 526 + Solve = 527 + String = 528 + Super = 529 + This = 530 + Throughout = 531 + Var = 532 + Virtual = 533 + Wait_Order = 534 + Last_SV3_1 = 534 + First_SV3_1a = 535 + Covergroup = 535 + Coverpoint = 536 + Endgroup = 537 + Endpackage = 538 + Expect = 539 + Foreach = 540 + Ignore_Bins = 541 + Illegal_Bins = 542 + Matches = 543 + Randcase = 544 + Randsequence = 545 + Tagged = 546 + Wildcard = 547 + Last_SV3_1a = 547 + First_SV2009 = 548 + Implies = 548 + S_Until = 549 + S_Until_With = 550 + Until_With = 551 + Last_SV2009 = 551 + First_Operator = 552 + Op_Equality = 552 + Op_Inequality = 553 + Op_Less = 554 + Op_Less_Equal = 555 + Op_Greater = 556 + Op_Greater_Equal = 557 + Op_Plus = 558 + Op_Minus = 559 + Op_Mul = 560 + Op_Div = 561 + Op_Exp = 562 + Op_Concatenation = 563 + Op_Condition = 564 + Op_Match_Equality = 565 + Op_Match_Inequality = 566 + Op_Match_Less = 567 + Op_Match_Less_Equal = 568 + Op_Match_Greater = 569 + Op_Match_Greater_Equal = 570 + Last_Operator = 570 + First_Attribute = 571 + Base = 571 + Left = 572 + Right = 573 + High = 574 + Low = 575 + Pos = 576 + Val = 577 + Succ = 578 + Pred = 579 + Leftof = 580 + Rightof = 581 + Reverse_Range = 582 + Length = 583 + Delayed = 584 + Stable = 585 + Quiet = 586 + Transaction = 587 + Event = 588 + Active = 589 + Last_Event = 590 + Last_Active = 591 + Last_Value = 592 + Last_Attribute = 592 + First_Vhdl87_Attribute = 593 + Behavior = 593 + Structure = 594 + Last_Vhdl87_Attribute = 594 + First_Vhdl93_Attribute = 595 + Ascending = 595 + Image = 596 + Value = 597 + Driving = 598 + Driving_Value = 599 + Simple_Name = 600 + Instance_Name = 601 + Path_Name = 602 + Last_Vhdl93_Attribute = 602 + First_Vhdl08_Attribute = 603 + Element = 603 + Last_Vhdl08_Attribute = 603 + First_AMS_Attribute = 604 + Contribution = 604 + Dot = 605 + Integ = 606 + Above = 607 + Zoh = 608 + Ltf = 609 + Ztf = 610 + Ramp = 611 + Slew = 612 + Last_AMS_Attribute = 612 + First_Standard = 613 + Std = 613 + Standard = 614 + Boolean = 615 + NFalse = 616 + NTrue = 617 + Character = 618 + Severity_Level = 619 + Note = 620 + Warning = 621 + Error = 622 + Failure = 623 + Universal_Integer = 624 + Universal_Real = 625 + Convertible_Integer = 626 + Convertible_Real = 627 + Integer = 628 + Real = 629 + Time = 630 + Fs = 631 + Ps = 632 + Ns = 633 + Us = 634 + Ms = 635 + Sec = 636 + Min = 637 + Hr = 638 + Max = 639 + Delay_Length = 640 + Now = 641 + Natural = 642 + Positive = 643 + Bit_Vector = 644 + File_Open_Kind = 645 + Read_Mode = 646 + Write_Mode = 647 + Append_Mode = 648 + File_Open_Status = 649 + Open_Ok = 650 + Status_Error = 651 + Name_Error = 652 + Mode_Error = 653 + Foreign = 654 + Boolean_Vector = 655 + To_Bstring = 656 + To_Binary_String = 657 + To_Ostring = 658 + To_Octal_String = 659 + To_Hstring = 660 + To_Hex_String = 661 + Integer_Vector = 662 + Real_Vector = 663 + Time_Vector = 664 + Digits = 665 + Format = 666 + Unit = 667 + Domain_Type = 668 + Quiescent_Domain = 669 + Time_Domain = 670 + Frequency_Domain = 671 + Domain = 672 + Frequency = 673 + Last_Standard = 673 + First_Charname = 674 + Nul = 674 + Soh = 675 + Stx = 676 + Etx = 677 + Eot = 678 + Enq = 679 + Ack = 680 + Bel = 681 + Bs = 682 + Ht = 683 + Lf = 684 + Vt = 685 + Ff = 686 + Cr = 687 + So = 688 + Si = 689 + Dle = 690 + Dc1 = 691 + Dc2 = 692 + Dc3 = 693 + Dc4 = 694 + Nak = 695 + Syn = 696 + Etb = 697 + Can = 698 + Em = 699 + Sub = 700 + Esc = 701 + Fsp = 702 + Gsp = 703 + Rsp = 704 + Usp = 705 + Del = 706 + C128 = 707 + C129 = 708 + C130 = 709 + C131 = 710 + C132 = 711 + C133 = 712 + C134 = 713 + C135 = 714 + C136 = 715 + C137 = 716 + C138 = 717 + C139 = 718 + C140 = 719 + C141 = 720 + C142 = 721 + C143 = 722 + C144 = 723 + C145 = 724 + C146 = 725 + C147 = 726 + C148 = 727 + C149 = 728 + C150 = 729 + C151 = 730 + C152 = 731 + C153 = 732 + C154 = 733 + C155 = 734 + C156 = 735 + C157 = 736 + C158 = 737 + C159 = 738 + Last_Charname = 738 + First_Misc = 739 + Guard = 739 + Deallocate = 740 + File_Open = 741 + File_Close = 742 + Read = 743 + Write = 744 + Flush = 745 + Endfile = 746 + I = 747 + J = 748 + F = 749 + L = 750 + P = 751 + R = 752 + S = 753 + V = 754 + External_Name = 755 + Open_Kind = 756 + First = 757 + Last = 758 + Textio = 759 + Work = 760 + Text = 761 + To_String = 762 + Minimum = 763 + Maximum = 764 + Untruncated_Text_Read = 765 + Textio_Read_Real = 766 + Textio_Write_Real = 767 + Get_Resolution_Limit = 768 + Control_Simulation = 769 + Step = 770 + Index = 771 + Item = 772 + Uu_File_Uu = 773 + Uu_Line_Uu = 774 + Label_Applies_To = 775 + Return_Port_Name = 776 + Map_To_Operator = 777 + Type_Function = 778 + Built_In = 779 + NNone = 780 + Last_Misc = 780 + First_Ieee_Pkg = 781 + Ieee = 781 + Std_Logic_1164 = 782 + VITAL_Timing = 783 + Numeric_Std = 784 + Numeric_Bit = 785 + Numeric_Std_Unsigned = 786 + Std_Logic_Arith = 787 + Std_Logic_Signed = 788 + Std_Logic_Unsigned = 789 + Std_Logic_Textio = 790 + Std_Logic_Misc = 791 + Math_Real = 792 + Last_Ieee_Pkg = 792 + First_Ieee_Name = 793 + Std_Ulogic = 793 + Std_Ulogic_Vector = 794 + Std_Logic = 795 + Std_Logic_Vector = 796 + Rising_Edge = 797 + Falling_Edge = 798 + VITAL_Level0 = 799 + VITAL_Level1 = 800 + Unresolved_Unsigned = 801 + Unresolved_Signed = 802 + To_Integer = 803 + To_Unsigned = 804 + To_Signed = 805 + Resize = 806 + Std_Match = 807 + Shift_Left = 808 + Shift_Right = 809 + Rotate_Left = 810 + Rotate_Right = 811 + To_Bit = 812 + To_Bitvector = 813 + To_Stdulogic = 814 + To_Stdlogicvector = 815 + To_Stdulogicvector = 816 + Is_X = 817 + To_01 = 818 + To_X01 = 819 + To_X01Z = 820 + To_UX01 = 821 + Conv_Signed = 822 + Conv_Unsigned = 823 + Conv_Integer = 824 + Conv_Std_Logic_Vector = 825 + And_Reduce = 826 + Nand_Reduce = 827 + Or_Reduce = 828 + Nor_Reduce = 829 + Xor_Reduce = 830 + Xnor_Reduce = 831 + Ceil = 832 + Floor = 833 + Round = 834 + Log2 = 835 + Sin = 836 + Cos = 837 + Arctan = 838 + Shl = 839 + Shr = 840 + Ext = 841 + Sxt = 842 + Find_Leftmost = 843 + Find_Rightmost = 844 + Last_Ieee_Name = 844 + First_Synthesis = 845 + Allconst = 845 + Allseq = 846 + Anyconst = 847 + Anyseq = 848 + Gclk = 849 + Loc = 850 + Keep = 851 + Last_Synthesis = 851 + First_Directive = 852 + Define = 852 + Endif = 853 + Ifdef = 854 + Ifndef = 855 + Include = 856 + Timescale = 857 + Undef = 858 + Protect = 859 + Begin_Protected = 860 + End_Protected = 861 + Key_Block = 862 + Data_Block = 863 + Line = 864 + Celldefine = 865 + Endcelldefine = 866 + Default_Nettype = 867 + Resetall = 868 + Last_Directive = 868 + First_Systask = 869 + Bits = 869 + D_Root = 870 + D_Unit = 871 + Last_Systask = 871 + First_SV_Method = 872 + Size = 872 + Insert = 873 + Delete = 874 + Pop_Front = 875 + Pop_Back = 876 + Push_Front = 877 + Push_Back = 878 + Name = 879 + Len = 880 + Substr = 881 + Exists = 882 + Atoi = 883 + Itoa = 884 + Find = 885 + Find_Index = 886 + Find_First = 887 + Find_First_Index = 888 + Find_Last = 889 + Find_Last_Index = 890 + Num = 891 + Randomize = 892 + Pre_Randomize = 893 + Post_Randomize = 894 + Srandom = 895 + Get_Randstate = 896 + Set_Randstate = 897 + Seed = 898 + State = 899 + Last_SV_Method = 899 + First_BSV = 900 + uAction = 900 + uActionValue = 901 + BVI = 902 + uC = 903 + uCF = 904 + uE = 905 + uSB = 906 + uSBR = 907 + Action = 908 + Endaction = 909 + Actionvalue = 910 + Endactionvalue = 911 + Ancestor = 912 + Clocked_By = 913 + Default_Clock = 914 + Default_Reset = 915 + Dependencies = 916 + Deriving = 917 + Determines = 918 + Enable = 919 + Ifc_Inout = 920 + Input_Clock = 921 + Input_Reset = 922 + Instance = 923 + Endinstance = 924 + Let = 925 + Match = 926 + Method = 927 + Endmethod = 928 + Numeric = 929 + Output_Clock = 930 + Output_Reset = 931 + Par = 932 + Endpar = 933 + Path = 934 + Provisos = 935 + Ready = 936 + Reset_By = 937 + Rule = 938 + Endrule = 939 + Rules = 940 + Endrules = 941 + Same_Family = 942 + Schedule = 943 + Seq = 944 + Endseq = 945 + Typeclass = 946 + Endtypeclass = 947 + Valueof = 948 + uValueof = 949 + Last_BSV = 949 + First_Comment = 950 + Psl = 950 + Pragma = 951 + Synthesis = 952 + Synopsys = 953 + Translate_Off = 954 + Translate_On = 955 + Translate = 956 + Synthesis_Off = 957 + Synthesis_On = 958 + Off = 959 + Full_Case = 960 + Parallel_Case = 961 + Last_Comment = 961 + First_PSL = 962 + A = 962 + Af = 963 + Ag = 964 + Ax = 965 + Abort = 966 + Assume_Guarantee = 967 + Async_Abort = 968 + Before = 969 + Clock = 970 + E = 971 + Ef = 972 + Eg = 973 + Ex = 974 + Endpoint = 975 + Eventually = 976 + Fairness = 977 + Fell = 978 + Forall = 979 + G = 980 + Inf = 981 Never = 982 Next_A = 983 Next_E = 984 diff --git a/pyGHDL/libghdl/vhdl/tokens.py b/pyGHDL/libghdl/vhdl/tokens.py index ed2e9f9dc..9e347eff8 100644 --- a/pyGHDL/libghdl/vhdl/tokens.py +++ b/pyGHDL/libghdl/vhdl/tokens.py @@ -182,55 +182,56 @@ class Tok(IntEnum): Restrict = 171 Restrict_Guarantee = 172 Sequence = 173 - Vmode = 174 - Vprop = 175 - Vunit = 176 - Across = 177 - Break = 178 - Limit = 179 - Nature = 180 - Noise = 181 - Procedural = 182 - Quantity = 183 - Reference = 184 - Spectrum = 185 - Subnature = 186 - Terminal = 187 - Through = 188 - Tolerance = 189 - Psl_Clock = 190 - Psl_Endpoint = 191 - Psl_Const = 192 - Psl_Boolean = 193 - Inf = 194 - Within = 195 - Abort = 196 - Async_Abort = 197 - Sync_Abort = 198 - Before = 199 - Before_Em = 200 - Before_Un = 201 - Before_Em_Un = 202 - Always = 203 - Never = 204 - Eventually_Em = 205 - Next_Em = 206 - Next_A = 207 - Next_A_Em = 208 - Next_E = 209 - Next_E_Em = 210 - Next_Event = 211 - Next_Event_Em = 212 - Next_Event_A = 213 - Next_Event_A_Em = 214 - Next_Event_E = 215 - Next_Event_E_Em = 216 - Until_Em = 217 - Until_Un = 218 - Until_Em_Un = 219 - Prev = 220 - Stable = 221 - Fell = 222 - Rose = 223 - Onehot = 224 - Onehot0 = 225 + Inherit = 174 + Vmode = 175 + Vprop = 176 + Vunit = 177 + Across = 178 + Break = 179 + Limit = 180 + Nature = 181 + Noise = 182 + Procedural = 183 + Quantity = 184 + Reference = 185 + Spectrum = 186 + Subnature = 187 + Terminal = 188 + Through = 189 + Tolerance = 190 + Psl_Clock = 191 + Psl_Endpoint = 192 + Psl_Const = 193 + Psl_Boolean = 194 + Inf = 195 + Within = 196 + Abort = 197 + Async_Abort = 198 + Sync_Abort = 199 + Before = 200 + Before_Em = 201 + Before_Un = 202 + Before_Em_Un = 203 + Always = 204 + Never = 205 + Eventually_Em = 206 + Next_Em = 207 + Next_A = 208 + Next_A_Em = 209 + Next_E = 210 + Next_E_Em = 211 + Next_Event = 212 + Next_Event_Em = 213 + Next_Event_A = 214 + Next_Event_A_Em = 215 + Next_Event_E = 216 + Next_Event_E_Em = 217 + Until_Em = 218 + Until_Un = 219 + Until_Em_Un = 220 + Prev = 221 + Stable = 222 + Fell = 223 + Rose = 224 + Onehot = 225 + Onehot0 = 226 diff --git a/src/std_names.adb b/src/std_names.adb index ceabfec97..245c8a1a9 100644 --- a/src/std_names.adb +++ b/src/std_names.adb @@ -162,6 +162,7 @@ package body Std_Names is Def ("restrict", Name_Restrict); Def ("restrict_guarantee", Name_Restrict_Guarantee); Def ("sequence", Name_Sequence); + Def ("inherit", Name_Inherit); Def ("vmode", Name_Vmode); Def ("vprop", Name_Vprop); Def ("vunit", Name_Vunit); @@ -829,7 +830,6 @@ package body Std_Names is Def ("forall", Name_Forall); Def ("g", Name_G); Def ("inf", Name_Inf); - Def ("inherit", Name_Inherit); Def ("never", Name_Never); Def ("next_a", Name_Next_A); Def ("next_e", Name_Next_E); diff --git a/src/std_names.ads b/src/std_names.ads index 4022a7493..5fc5bf919 100644 --- a/src/std_names.ads +++ b/src/std_names.ads @@ -181,9 +181,10 @@ package Std_Names is Name_Restrict : constant Name_Id := Name_First_Keyword + 106; Name_Restrict_Guarantee : constant Name_Id := Name_First_Keyword + 107; Name_Sequence : constant Name_Id := Name_First_Keyword + 108; - Name_Vmode : constant Name_Id := Name_First_Keyword + 109; - Name_Vprop : constant Name_Id := Name_First_Keyword + 110; - Name_Vunit : constant Name_Id := Name_First_Keyword + 111; + Name_Inherit : constant Name_Id := Name_First_Keyword + 109; + Name_Vmode : constant Name_Id := Name_First_Keyword + 110; + Name_Vprop : constant Name_Id := Name_First_Keyword + 111; + Name_Vunit : constant Name_Id := Name_First_Keyword + 112; Name_Last_Vhdl08 : constant Name_Id := Name_Vunit; subtype Name_Id_Vhdl08_Reserved_Words is @@ -967,33 +968,33 @@ package Std_Names is Name_G : constant Name_Id := Name_First_PSL + 18; -- Name_In Name_Inf : constant Name_Id := Name_First_PSL + 19; - Name_Inherit : constant Name_Id := Name_First_PSL + 20; + -- Name_Inherit -- Name_Is - Name_Never : constant Name_Id := Name_First_PSL + 21; + Name_Never : constant Name_Id := Name_First_PSL + 20; -- Name_Next - Name_Next_A : constant Name_Id := Name_First_PSL + 22; - Name_Next_E : constant Name_Id := Name_First_PSL + 23; - Name_Next_Event : constant Name_Id := Name_First_PSL + 24; - Name_Next_Event_A : constant Name_Id := Name_First_PSL + 25; - Name_Next_Event_E : constant Name_Id := Name_First_PSL + 26; + Name_Next_A : constant Name_Id := Name_First_PSL + 21; + Name_Next_E : constant Name_Id := Name_First_PSL + 22; + Name_Next_Event : constant Name_Id := Name_First_PSL + 23; + Name_Next_Event_A : constant Name_Id := Name_First_PSL + 24; + Name_Next_Event_E : constant Name_Id := Name_First_PSL + 25; -- Name_Not -- Name_Or -- Name_Property - Name_Onehot : constant Name_Id := Name_First_PSL + 27; - Name_Onehot0 : constant Name_Id := Name_First_PSL + 28; - Name_Prev : constant Name_Id := Name_First_PSL + 29; + Name_Onehot : constant Name_Id := Name_First_PSL + 26; + Name_Onehot0 : constant Name_Id := Name_First_PSL + 27; + Name_Prev : constant Name_Id := Name_First_PSL + 28; -- Name_Restrict -- Name_Restrict_Guarantee - Name_Rose : constant Name_Id := Name_First_PSL + 30; + Name_Rose : constant Name_Id := Name_First_PSL + 29; -- sequence - Name_Strong : constant Name_Id := Name_First_PSL + 31; - Name_Sync_Abort : constant Name_Id := Name_First_PSL + 32; + Name_Strong : constant Name_Id := Name_First_PSL + 30; + Name_Sync_Abort : constant Name_Id := Name_First_PSL + 31; -- union -- until - Name_W : constant Name_Id := Name_First_PSL + 33; - Name_Whilenot : constant Name_Id := Name_First_PSL + 34; - Name_Within : constant Name_Id := Name_First_PSL + 35; - Name_X : constant Name_Id := Name_First_PSL + 36; + Name_W : constant Name_Id := Name_First_PSL + 32; + Name_Whilenot : constant Name_Id := Name_First_PSL + 33; + Name_Within : constant Name_Id := Name_First_PSL + 34; + Name_X : constant Name_Id := Name_First_PSL + 35; Name_Last_PSL : constant Name_Id := Name_X; subtype Name_Id_PSL_Keywords is diff --git a/src/vhdl/vhdl-scanner.adb b/src/vhdl/vhdl-scanner.adb index 9c3d952ab..0527cd131 100644 --- a/src/vhdl/vhdl-scanner.adb +++ b/src/vhdl/vhdl-scanner.adb @@ -1323,6 +1323,8 @@ package body Vhdl.Scanner is Current_Token := Tok_Vprop; when Name_Vunit => Current_Token := Tok_Vunit; + when Name_Inherit => + Current_Token := Tok_Inherit; when others => Current_Token := Tok_Identifier; end case; diff --git a/src/vhdl/vhdl-tokens.adb b/src/vhdl/vhdl-tokens.adb index b8838c1db..90ce05bcc 100644 --- a/src/vhdl/vhdl-tokens.adb +++ b/src/vhdl/vhdl-tokens.adb @@ -380,6 +380,8 @@ package body Vhdl.Tokens is return "restrict_guarantee"; when Tok_Sequence => return "sequence"; + when Tok_Inherit => + return "inherit"; when Tok_Vmode => return "vmode"; when Tok_Vprop => diff --git a/src/vhdl/vhdl-tokens.ads b/src/vhdl/vhdl-tokens.ads index 5caba9dd9..8812e20e7 100644 --- a/src/vhdl/vhdl-tokens.ads +++ b/src/vhdl/vhdl-tokens.ads @@ -253,6 +253,7 @@ package Vhdl.Tokens is Tok_Restrict, Tok_Restrict_Guarantee, Tok_Sequence, + Tok_Inherit, Tok_Vmode, Tok_Vprop, Tok_Vunit, |