Changeset f7d268 in git
- Timestamp:
- Oct 14, 2016, 6:19:34 PM (7 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- c68b061ab1e23ef91a0d65ed417bfa3cee8006e2
- Parents:
- 0f36a04cd7db09611bfbd30ad74c8673f5fa6b9a
- Location:
- Singular
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/grammar.cc
r0f36a0 rf7d268 744 744 368, 419, 420, 421, 422, 423, 424, 425, 426, 430, 745 745 433, 434, 435, 436, 437, 438, 439, 440, 441, 444, 746 451, 456, 460, 464, 468, 472, 485, 513, 537, 5 50,747 5 56, 560, 564, 568, 572, 576, 580, 584, 588, 592,748 5 96, 600, 604, 608, 612, 616, 620, 624, 628, 632,749 6 36, 642, 646, 650, 654, 658, 665, 676, 682, 687,750 68 8, 689, 693, 697, 701, 705, 709, 713, 717, 721,751 7 25, 742, 749, 748, 766, 774, 782, 791, 795, 799,752 803, 807, 811, 815, 819, 823, 827, 831, 835, 839,753 8 51, 858, 859, 878, 879, 891, 896, 901, 905, 909,754 9 45, 971, 992, 1000, 1004, 1005, 1019, 1027, 1036, 1081,755 10 82, 1091, 1092, 1098, 1105, 1107, 1109, 1119, 1118, 1126,756 11 31, 1138, 1146, 1158, 1174, 1193, 1197, 1201, 1206, 1210,757 12 14, 1218, 1222, 1227, 1233, 1239, 1245, 1251, 1257, 1263,758 12 75, 1282, 1286, 1323, 1330, 1335, 1352, 1358, 1358, 1361,759 142 9, 1433, 1462, 1475, 1492, 1501, 1506, 1514, 1526, 1545,760 15 55, 1574, 1597, 1603, 1615, 1621746 451, 456, 460, 464, 468, 472, 485, 513, 537, 543, 747 549, 553, 557, 561, 565, 569, 573, 577, 581, 585, 748 589, 593, 597, 601, 605, 609, 613, 617, 621, 625, 749 629, 635, 639, 643, 647, 651, 658, 669, 675, 680, 750 681, 682, 686, 690, 694, 698, 702, 706, 710, 714, 751 718, 735, 742, 741, 759, 767, 775, 784, 788, 792, 752 796, 800, 804, 808, 812, 816, 820, 824, 828, 832, 753 844, 851, 852, 871, 872, 884, 889, 894, 898, 902, 754 938, 964, 985, 993, 997, 998, 1012, 1020, 1029, 1074, 755 1075, 1084, 1085, 1091, 1098, 1100, 1102, 1112, 1111, 1119, 756 1124, 1131, 1139, 1151, 1167, 1186, 1190, 1194, 1199, 1203, 757 1207, 1211, 1215, 1220, 1226, 1232, 1238, 1244, 1250, 1256, 758 1268, 1275, 1279, 1316, 1323, 1328, 1345, 1351, 1351, 1354, 759 1422, 1426, 1455, 1468, 1485, 1494, 1499, 1507, 1519, 1538, 760 1548, 1567, 1590, 1596, 1608, 1614 761 761 }; 762 762 #endif … … 2642 2642 { 2643 2643 memset(&(yyval.lv),0,sizeof((yyval.lv))); 2644 if ((yyvsp[(1) - (1)].i)!=LIB_CMD) 2645 { 2646 (yyval.lv).rtyp = (yyvsp[(1) - (1)].i); 2647 (yyval.lv).data = (yyval.lv).Data(); 2648 } 2649 else 2650 { 2651 (yyval.lv).rtyp=NONE; 2652 } 2644 (yyval.lv).rtyp = (yyvsp[(1) - (1)].i); 2645 (yyval.lv).data = (yyval.lv).Data(); 2653 2646 ;} 2654 2647 break; … … 2657 2650 2658 2651 /* Line 1464 of yacc.c */ 2659 #line 5 51"grammar.y"2652 #line 544 "grammar.y" 2660 2653 { 2661 2654 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 2668 2661 2669 2662 /* Line 1464 of yacc.c */ 2670 #line 55 7"grammar.y"2663 #line 550 "grammar.y" 2671 2664 { 2672 2665 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2677 2670 2678 2671 /* Line 1464 of yacc.c */ 2679 #line 5 61"grammar.y"2672 #line 554 "grammar.y" 2680 2673 { 2681 2674 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2686 2679 2687 2680 /* Line 1464 of yacc.c */ 2688 #line 5 65"grammar.y"2681 #line 558 "grammar.y" 2689 2682 { 2690 2683 if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2695 2688 2696 2689 /* Line 1464 of yacc.c */ 2697 #line 56 9"grammar.y"2690 #line 562 "grammar.y" 2698 2691 { 2699 2692 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2704 2697 2705 2698 /* Line 1464 of yacc.c */ 2706 #line 5 73"grammar.y"2699 #line 566 "grammar.y" 2707 2700 { 2708 2701 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2713 2706 2714 2707 /* Line 1464 of yacc.c */ 2715 #line 57 7"grammar.y"2708 #line 570 "grammar.y" 2716 2709 { 2717 2710 if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2722 2715 2723 2716 /* Line 1464 of yacc.c */ 2724 #line 5 81"grammar.y"2717 #line 574 "grammar.y" 2725 2718 { 2726 2719 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2731 2724 2732 2725 /* Line 1464 of yacc.c */ 2733 #line 5 85"grammar.y"2726 #line 578 "grammar.y" 2734 2727 { 2735 2728 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2740 2733 2741 2734 /* Line 1464 of yacc.c */ 2742 #line 58 9"grammar.y"2735 #line 582 "grammar.y" 2743 2736 { 2744 2737 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2749 2742 2750 2743 /* Line 1464 of yacc.c */ 2751 #line 5 93"grammar.y"2744 #line 586 "grammar.y" 2752 2745 { 2753 2746 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2758 2751 2759 2752 /* Line 1464 of yacc.c */ 2760 #line 59 7"grammar.y"2753 #line 590 "grammar.y" 2761 2754 { 2762 2755 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2767 2760 2768 2761 /* Line 1464 of yacc.c */ 2769 #line 601"grammar.y"2762 #line 594 "grammar.y" 2770 2763 { 2771 2764 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2776 2769 2777 2770 /* Line 1464 of yacc.c */ 2778 #line 605"grammar.y"2771 #line 598 "grammar.y" 2779 2772 { 2780 2773 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2785 2778 2786 2779 /* Line 1464 of yacc.c */ 2787 #line 60 9"grammar.y"2780 #line 602 "grammar.y" 2788 2781 { 2789 2782 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2794 2787 2795 2788 /* Line 1464 of yacc.c */ 2796 #line 6 13"grammar.y"2789 #line 606 "grammar.y" 2797 2790 { 2798 2791 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2803 2796 2804 2797 /* Line 1464 of yacc.c */ 2805 #line 61 7"grammar.y"2798 #line 610 "grammar.y" 2806 2799 { 2807 2800 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2812 2805 2813 2806 /* Line 1464 of yacc.c */ 2814 #line 6 21"grammar.y"2807 #line 614 "grammar.y" 2815 2808 { 2816 2809 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2821 2814 2822 2815 /* Line 1464 of yacc.c */ 2823 #line 6 25"grammar.y"2816 #line 618 "grammar.y" 2824 2817 { 2825 2818 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2830 2823 2831 2824 /* Line 1464 of yacc.c */ 2832 #line 62 9"grammar.y"2825 #line 622 "grammar.y" 2833 2826 { 2834 2827 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2839 2832 2840 2833 /* Line 1464 of yacc.c */ 2841 #line 6 33"grammar.y"2834 #line 626 "grammar.y" 2842 2835 { 2843 2836 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2848 2841 2849 2842 /* Line 1464 of yacc.c */ 2850 #line 63 7"grammar.y"2843 #line 630 "grammar.y" 2851 2844 { 2852 2845 int b=iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i)); // handle branchTo … … 2859 2852 2860 2853 /* Line 1464 of yacc.c */ 2861 #line 6 43"grammar.y"2854 #line 636 "grammar.y" 2862 2855 { 2863 2856 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2868 2861 2869 2862 /* Line 1464 of yacc.c */ 2870 #line 64 7"grammar.y"2863 #line 640 "grammar.y" 2871 2864 { 2872 2865 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2877 2870 2878 2871 /* Line 1464 of yacc.c */ 2879 #line 6 51"grammar.y"2872 #line 644 "grammar.y" 2880 2873 { 2881 2874 if(iiExprArith3(&(yyval.lv),RING_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2886 2879 2887 2880 /* Line 1464 of yacc.c */ 2888 #line 6 55"grammar.y"2881 #line 648 "grammar.y" 2889 2882 { 2890 2883 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),RING_CMD)) YYERROR; … … 2895 2888 2896 2889 /* Line 1464 of yacc.c */ 2890 #line 652 "grammar.y" 2891 { 2892 if (iiARROW(&(yyval.lv),(yyvsp[(1) - (3)].name),(yyvsp[(3) - (3)].name))) YYERROR; 2893 ;} 2894 break; 2895 2896 case 66: 2897 2898 /* Line 1464 of yacc.c */ 2897 2899 #line 659 "grammar.y" 2898 {2899 if (iiARROW(&(yyval.lv),(yyvsp[(1) - (3)].name),(yyvsp[(3) - (3)].name))) YYERROR;2900 ;}2901 break;2902 2903 case 66:2904 2905 /* Line 1464 of yacc.c */2906 #line 666 "grammar.y"2907 2900 { 2908 2901 leftv v = &(yyvsp[(1) - (3)].lv); … … 2920 2913 2921 2914 /* Line 1464 of yacc.c */ 2922 #line 67 7"grammar.y"2915 #line 670 "grammar.y" 2923 2916 { 2924 2917 (yyval.lv) = (yyvsp[(1) - (1)].lv); … … 2929 2922 2930 2923 /* Line 1464 of yacc.c */ 2931 #line 6 83"grammar.y"2924 #line 676 "grammar.y" 2932 2925 { 2933 2926 /*if ($1.typ == eunknown) YYERROR;*/ … … 2939 2932 2940 2933 /* Line 1464 of yacc.c */ 2934 #line 680 "grammar.y" 2935 { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;} 2936 break; 2937 2938 case 70: 2939 2940 /* Line 1464 of yacc.c */ 2941 #line 681 "grammar.y" 2942 { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;} 2943 break; 2944 2945 case 71: 2946 2947 /* Line 1464 of yacc.c */ 2948 #line 683 "grammar.y" 2949 { 2950 if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR; 2951 ;} 2952 break; 2953 2954 case 72: 2955 2956 /* Line 1464 of yacc.c */ 2941 2957 #line 687 "grammar.y" 2942 { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}2943 break;2944 2945 case 70:2946 2947 /* Line 1464 of yacc.c */2948 #line 688 "grammar.y"2949 { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;}2950 break;2951 2952 case 71:2953 2954 /* Line 1464 of yacc.c */2955 #line 690 "grammar.y"2956 {2957 if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR;2958 ;}2959 break;2960 2961 case 72:2962 2963 /* Line 1464 of yacc.c */2964 #line 694 "grammar.y"2965 2958 { 2966 2959 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (4)].lv),'[',&(yyvsp[(3) - (4)].lv))) YYERROR; … … 2971 2964 2972 2965 /* Line 1464 of yacc.c */ 2973 #line 69 8"grammar.y"2966 #line 691 "grammar.y" 2974 2967 { 2975 2968 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2980 2973 2981 2974 /* Line 1464 of yacc.c */ 2982 #line 702"grammar.y"2975 #line 695 "grammar.y" 2983 2976 { 2984 2977 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2989 2982 2990 2983 /* Line 1464 of yacc.c */ 2991 #line 706"grammar.y"2984 #line 699 "grammar.y" 2992 2985 { 2993 2986 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2998 2991 2999 2992 /* Line 1464 of yacc.c */ 3000 #line 7 10"grammar.y"2993 #line 703 "grammar.y" 3001 2994 { 3002 2995 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 3007 3000 3008 3001 /* Line 1464 of yacc.c */ 3009 #line 7 14"grammar.y"3002 #line 707 "grammar.y" 3010 3003 { 3011 3004 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 3016 3009 3017 3010 /* Line 1464 of yacc.c */ 3018 #line 71 8"grammar.y"3011 #line 711 "grammar.y" 3019 3012 { 3020 3013 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), 0, &(yyvsp[(5) - (6)].lv))) YYERROR; … … 3025 3018 3026 3019 /* Line 1464 of yacc.c */ 3027 #line 7 22"grammar.y"3020 #line 715 "grammar.y" 3028 3021 { 3029 3022 (yyval.lv)=(yyvsp[(2) - (3)].lv); … … 3034 3027 3035 3028 /* Line 1464 of yacc.c */ 3036 #line 7 26"grammar.y"3029 #line 719 "grammar.y" 3037 3030 { 3038 3031 #ifdef SIQ … … 3056 3049 3057 3050 /* Line 1464 of yacc.c */ 3058 #line 7 43"grammar.y"3051 #line 736 "grammar.y" 3059 3052 { 3060 3053 iiTestAssume(&(yyvsp[(2) - (5)].lv),&(yyvsp[(4) - (5)].lv)); … … 3067 3060 3068 3061 /* Line 1464 of yacc.c */ 3069 #line 74 9"grammar.y"3062 #line 742 "grammar.y" 3070 3063 { 3071 3064 #ifdef SIQ … … 3078 3071 3079 3072 /* Line 1464 of yacc.c */ 3080 #line 7 55"grammar.y"3073 #line 748 "grammar.y" 3081 3074 { 3082 3075 #ifdef SIQ … … 3093 3086 3094 3087 /* Line 1464 of yacc.c */ 3095 #line 76 7"grammar.y"3088 #line 760 "grammar.y" 3096 3089 { 3097 3090 #ifdef SIQ … … 3104 3097 3105 3098 /* Line 1464 of yacc.c */ 3106 #line 7 75"grammar.y"3099 #line 768 "grammar.y" 3107 3100 { 3108 3101 #ifdef SIQ … … 3115 3108 3116 3109 /* Line 1464 of yacc.c */ 3117 #line 7 83"grammar.y"3110 #line 776 "grammar.y" 3118 3111 { 3119 3112 #ifdef SIQ … … 3126 3119 3127 3120 /* Line 1464 of yacc.c */ 3128 #line 7 92"grammar.y"3121 #line 785 "grammar.y" 3129 3122 { 3130 3123 if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),PLUSPLUS)) YYERROR; … … 3135 3128 3136 3129 /* Line 1464 of yacc.c */ 3137 #line 7 96"grammar.y"3130 #line 789 "grammar.y" 3138 3131 { 3139 3132 if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),MINUSMINUS)) YYERROR; … … 3144 3137 3145 3138 /* Line 1464 of yacc.c */ 3146 #line 800"grammar.y"3139 #line 793 "grammar.y" 3147 3140 { 3148 3141 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'+',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3153 3146 3154 3147 /* Line 1464 of yacc.c */ 3155 #line 804"grammar.y"3148 #line 797 "grammar.y" 3156 3149 { 3157 3150 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'-',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3162 3155 3163 3156 /* Line 1464 of yacc.c */ 3164 #line 80 8"grammar.y"3157 #line 801 "grammar.y" 3165 3158 { 3166 3159 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3171 3164 3172 3165 /* Line 1464 of yacc.c */ 3173 #line 8 12"grammar.y"3166 #line 805 "grammar.y" 3174 3167 { 3175 3168 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'^',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3180 3173 3181 3174 /* Line 1464 of yacc.c */ 3182 #line 8 16"grammar.y"3175 #line 809 "grammar.y" 3183 3176 { 3184 3177 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3189 3182 3190 3183 /* Line 1464 of yacc.c */ 3191 #line 8 20"grammar.y"3184 #line 813 "grammar.y" 3192 3185 { 3193 3186 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3198 3191 3199 3192 /* Line 1464 of yacc.c */ 3200 #line 8 24"grammar.y"3193 #line 817 "grammar.y" 3201 3194 { 3202 3195 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),NOTEQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3207 3200 3208 3201 /* Line 1464 of yacc.c */ 3209 #line 82 8"grammar.y"3202 #line 821 "grammar.y" 3210 3203 { 3211 3204 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),EQUAL_EQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3216 3209 3217 3210 /* Line 1464 of yacc.c */ 3218 #line 8 32"grammar.y"3211 #line 825 "grammar.y" 3219 3212 { 3220 3213 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),DOTDOT,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3225 3218 3226 3219 /* Line 1464 of yacc.c */ 3227 #line 8 36"grammar.y"3220 #line 829 "grammar.y" 3228 3221 { 3229 3222 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),':',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3234 3227 3235 3228 /* Line 1464 of yacc.c */ 3236 #line 8 40"grammar.y"3229 #line 833 "grammar.y" 3237 3230 { 3238 3231 if (siq>0) … … 3251 3244 3252 3245 /* Line 1464 of yacc.c */ 3253 #line 8 52"grammar.y"3246 #line 845 "grammar.y" 3254 3247 { 3255 3248 if(iiExprArith1(&(yyval.lv),&(yyvsp[(2) - (2)].lv),'-')) YYERROR; … … 3260 3253 3261 3254 /* Line 1464 of yacc.c */ 3262 #line 85 8"grammar.y"3255 #line 851 "grammar.y" 3263 3256 { (yyval.lv) = (yyvsp[(1) - (2)].lv); ;} 3264 3257 break; … … 3267 3260 3268 3261 /* Line 1464 of yacc.c */ 3269 #line 8 60"grammar.y"3262 #line 853 "grammar.y" 3270 3263 { 3271 3264 if ((yyvsp[(1) - (2)].lv).rtyp==0) … … 3287 3280 3288 3281 /* Line 1464 of yacc.c */ 3289 #line 8 80"grammar.y"3282 #line 873 "grammar.y" 3290 3283 { 3291 3284 if ((yyvsp[(2) - (3)].lv).Typ()!=STRING_CMD) … … 3301 3294 3302 3295 /* Line 1464 of yacc.c */ 3303 #line 8 92"grammar.y"3296 #line 885 "grammar.y" 3304 3297 { 3305 3298 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3311 3304 3312 3305 /* Line 1464 of yacc.c */ 3313 #line 89 7"grammar.y"3306 #line 890 "grammar.y" 3314 3307 { 3315 3308 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3321 3314 3322 3315 /* Line 1464 of yacc.c */ 3323 #line 902"grammar.y"3316 #line 895 "grammar.y" 3324 3317 { 3325 3318 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR; … … 3330 3323 3331 3324 /* Line 1464 of yacc.c */ 3332 #line 906"grammar.y"3325 #line 899 "grammar.y" 3333 3326 { 3334 3327 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR; … … 3339 3332 3340 3333 /* Line 1464 of yacc.c */ 3341 #line 9 10"grammar.y"3334 #line 903 "grammar.y" 3342 3335 { 3343 3336 int r; TESTSETINT((yyvsp[(4) - (8)].lv),r); … … 3380 3373 3381 3374 /* Line 1464 of yacc.c */ 3382 #line 9 46"grammar.y"3375 #line 939 "grammar.y" 3383 3376 { 3384 3377 if ((yyvsp[(1) - (2)].i) == MATRIX_CMD) … … 3411 3404 3412 3405 /* Line 1464 of yacc.c */ 3413 #line 9 72"grammar.y"3406 #line 965 "grammar.y" 3414 3407 { 3415 3408 int t=(yyvsp[(1) - (3)].lv).Typ(); … … 3437 3430 3438 3431 /* Line 1464 of yacc.c */ 3439 #line 9 93"grammar.y"3432 #line 986 "grammar.y" 3440 3433 { 3441 3434 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3447 3440 3448 3441 /* Line 1464 of yacc.c */ 3449 #line 1006"grammar.y"3442 #line 999 "grammar.y" 3450 3443 { 3451 3444 leftv v = &(yyvsp[(2) - (5)].lv); … … 3463 3456 3464 3457 /* Line 1464 of yacc.c */ 3465 #line 10 20"grammar.y"3458 #line 1013 "grammar.y" 3466 3459 { 3467 3460 // let rInit take care of any errors … … 3473 3466 3474 3467 /* Line 1464 of yacc.c */ 3475 #line 102 8"grammar.y"3468 #line 1021 "grammar.y" 3476 3469 { 3477 3470 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 3487 3480 3488 3481 /* Line 1464 of yacc.c */ 3489 #line 103 7"grammar.y"3482 #line 1030 "grammar.y" 3490 3483 { 3491 3484 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 3534 3527 3535 3528 /* Line 1464 of yacc.c */ 3536 #line 10 83"grammar.y"3529 #line 1076 "grammar.y" 3537 3530 { 3538 3531 (yyval.lv) = (yyvsp[(1) - (3)].lv); … … 3545 3538 3546 3539 /* Line 1464 of yacc.c */ 3547 #line 10 93"grammar.y"3540 #line 1086 "grammar.y" 3548 3541 { 3549 3542 (yyval.lv) = (yyvsp[(2) - (3)].lv); … … 3554 3547 3555 3548 /* Line 1464 of yacc.c */ 3549 #line 1092 "grammar.y" 3550 { 3551 expected_parms = TRUE; 3552 ;} 3553 break; 3554 3555 case 124: 3556 3557 /* Line 1464 of yacc.c */ 3556 3558 #line 1099 "grammar.y" 3557 {3558 expected_parms = TRUE;3559 ;}3560 break;3561 3562 case 124:3563 3564 /* Line 1464 of yacc.c */3565 #line 1106 "grammar.y"3566 3559 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3567 3560 break; … … 3570 3563 3571 3564 /* Line 1464 of yacc.c */ 3572 #line 110 8"grammar.y"3565 #line 1101 "grammar.y" 3573 3566 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3574 3567 break; … … 3577 3570 3578 3571 /* Line 1464 of yacc.c */ 3579 #line 11 10"grammar.y"3572 #line 1103 "grammar.y" 3580 3573 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3581 3574 break; … … 3584 3577 3585 3578 /* Line 1464 of yacc.c */ 3586 #line 111 9"grammar.y"3579 #line 1112 "grammar.y" 3587 3580 { if ((yyvsp[(1) - (2)].i) != '<') YYERROR; 3588 3581 if((feFilePending=feFopen((yyvsp[(2) - (2)].name),"r",NULL,TRUE))==NULL) YYERROR; ;} … … 3592 3585 3593 3586 /* Line 1464 of yacc.c */ 3594 #line 11 22"grammar.y"3587 #line 1115 "grammar.y" 3595 3588 { newFile((yyvsp[(2) - (4)].name),feFilePending); ;} 3596 3589 break; … … 3599 3592 3600 3593 /* Line 1464 of yacc.c */ 3601 #line 112 7"grammar.y"3594 #line 1120 "grammar.y" 3602 3595 { 3603 3596 feHelp((yyvsp[(2) - (3)].name)); … … 3609 3602 3610 3603 /* Line 1464 of yacc.c */ 3604 #line 1125 "grammar.y" 3605 { 3606 feHelp(NULL); 3607 ;} 3608 break; 3609 3610 case 131: 3611 3612 /* Line 1464 of yacc.c */ 3611 3613 #line 1132 "grammar.y" 3612 {3613 feHelp(NULL);3614 ;}3615 break;3616 3617 case 131:3618 3619 /* Line 1464 of yacc.c */3620 #line 1139 "grammar.y"3621 3614 { 3622 3615 singular_example((yyvsp[(2) - (3)].name)); … … 3628 3621 3629 3622 /* Line 1464 of yacc.c */ 3630 #line 114 7"grammar.y"3623 #line 1140 "grammar.y" 3631 3624 { 3632 3625 if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl) … … 3642 3635 3643 3636 /* Line 1464 of yacc.c */ 3644 #line 115 9"grammar.y"3637 #line 1152 "grammar.y" 3645 3638 { 3646 3639 leftv v=&(yyvsp[(2) - (2)].lv); … … 3663 3656 3664 3657 /* Line 1464 of yacc.c */ 3665 #line 11 75"grammar.y"3658 #line 1168 "grammar.y" 3666 3659 { 3667 3660 leftv v=&(yyvsp[(3) - (3)].lv); … … 3684 3677 3685 3678 /* Line 1464 of yacc.c */ 3686 #line 11 94"grammar.y"3679 #line 1187 "grammar.y" 3687 3680 { 3688 3681 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3693 3686 3694 3687 /* Line 1464 of yacc.c */ 3695 #line 119 8"grammar.y"3688 #line 1191 "grammar.y" 3696 3689 { 3697 3690 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3702 3695 3703 3696 /* Line 1464 of yacc.c */ 3704 #line 1 202"grammar.y"3697 #line 1195 "grammar.y" 3705 3698 { 3706 3699 if ((yyvsp[(3) - (4)].i)==QRING_CMD) (yyvsp[(3) - (4)].i)=RING_CMD; … … 3712 3705 3713 3706 /* Line 1464 of yacc.c */ 3714 #line 120 7"grammar.y"3707 #line 1200 "grammar.y" 3715 3708 { 3716 3709 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3721 3714 3722 3715 /* Line 1464 of yacc.c */ 3723 #line 12 11"grammar.y"3716 #line 1204 "grammar.y" 3724 3717 { 3725 3718 list_cmd(RING_CMD,NULL,"// ",TRUE); … … 3730 3723 3731 3724 /* Line 1464 of yacc.c */ 3732 #line 12 15"grammar.y"3725 #line 1208 "grammar.y" 3733 3726 { 3734 3727 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3739 3732 3740 3733 /* Line 1464 of yacc.c */ 3741 #line 121 9"grammar.y"3734 #line 1212 "grammar.y" 3742 3735 { 3743 3736 list_cmd(PROC_CMD,NULL,"// ",TRUE); … … 3748 3741 3749 3742 /* Line 1464 of yacc.c */ 3750 #line 12 23"grammar.y"3743 #line 1216 "grammar.y" 3751 3744 { 3752 3745 list_cmd(0,(yyvsp[(3) - (4)].lv).Fullname(),"// ",TRUE); … … 3758 3751 3759 3752 /* Line 1464 of yacc.c */ 3760 #line 122 8"grammar.y"3753 #line 1221 "grammar.y" 3761 3754 { 3762 3755 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3769 3762 3770 3763 /* Line 1464 of yacc.c */ 3771 #line 12 34"grammar.y"3764 #line 1227 "grammar.y" 3772 3765 { 3773 3766 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3780 3773 3781 3774 /* Line 1464 of yacc.c */ 3782 #line 12 40"grammar.y"3775 #line 1233 "grammar.y" 3783 3776 { 3784 3777 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3791 3784 3792 3785 /* Line 1464 of yacc.c */ 3793 #line 12 46"grammar.y"3786 #line 1239 "grammar.y" 3794 3787 { 3795 3788 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3802 3795 3803 3796 /* Line 1464 of yacc.c */ 3804 #line 12 52"grammar.y"3797 #line 1245 "grammar.y" 3805 3798 { 3806 3799 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3813 3806 3814 3807 /* Line 1464 of yacc.c */ 3815 #line 125 8"grammar.y"3808 #line 1251 "grammar.y" 3816 3809 { 3817 3810 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3824 3817 3825 3818 /* Line 1464 of yacc.c */ 3826 #line 12 64"grammar.y"3819 #line 1257 "grammar.y" 3827 3820 { 3828 3821 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3835 3828 3836 3829 /* Line 1464 of yacc.c */ 3837 #line 12 76"grammar.y"3830 #line 1269 "grammar.y" 3838 3831 { 3839 3832 list_cmd(-1,NULL,"// ",TRUE); … … 3844 3837 3845 3838 /* Line 1464 of yacc.c */ 3846 #line 12 82"grammar.y"3839 #line 1275 "grammar.y" 3847 3840 { yyInRingConstruction = TRUE; ;} 3848 3841 break; … … 3851 3844 3852 3845 /* Line 1464 of yacc.c */ 3853 #line 12 91"grammar.y"3846 #line 1284 "grammar.y" 3854 3847 { 3855 3848 const char *ring_name = (yyvsp[(2) - (8)].lv).name; … … 3889 3882 3890 3883 /* Line 1464 of yacc.c */ 3891 #line 13 24"grammar.y"3884 #line 1317 "grammar.y" 3892 3885 { 3893 3886 const char *ring_name = (yyvsp[(2) - (2)].lv).name; … … 3901 3894 3902 3895 /* Line 1464 of yacc.c */ 3903 #line 13 31"grammar.y"3896 #line 1324 "grammar.y" 3904 3897 { 3905 3898 yyInRingConstruction = FALSE; … … 3911 3904 3912 3905 /* Line 1464 of yacc.c */ 3913 #line 13 36"grammar.y"3914 { 3915 3916 3917 3918 3919 3920 3921 3906 #line 1329 "grammar.y" 3907 { 3908 #ifdef SINGULAR_4_1 3909 yyInRingConstruction = FALSE; 3910 sleftv tmp; 3911 (yyvsp[(4) - (7)].lv).next=(leftv)omAlloc(sizeof(sleftv)); 3912 memcpy((yyvsp[(4) - (7)].lv).next,&(yyvsp[(6) - (7)].lv),sizeof(sleftv)); 3913 memset(&(yyvsp[(6) - (7)].lv),0,sizeof(sleftv)); 3914 if (iiExprArithM(&tmp,&(yyvsp[(4) - (7)].lv),'[')) YYERROR; 3922 3915 if (iiAssignCR(&(yyvsp[(2) - (7)].lv),&tmp)) YYERROR; 3923 3924 3925 3926 3916 #else 3917 YYERROR; 3918 #endif 3919 ;} 3927 3920 break; 3928 3921 … … 3930 3923 3931 3924 /* Line 1464 of yacc.c */ 3932 #line 13 53"grammar.y"3925 #line 1346 "grammar.y" 3933 3926 { 3934 3927 if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(jjLOAD((yyvsp[(2) - (2)].name),TRUE))) YYERROR; … … 3939 3932 3940 3933 /* Line 1464 of yacc.c */ 3941 #line 13 62"grammar.y"3934 #line 1355 "grammar.y" 3942 3935 { 3943 3936 if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0)) … … 4009 4002 4010 4003 /* Line 1464 of yacc.c */ 4011 #line 14 30"grammar.y"4004 #line 1423 "grammar.y" 4012 4005 { 4013 4006 type_cmd(&((yyvsp[(2) - (2)].lv))); … … 4018 4011 4019 4012 /* Line 1464 of yacc.c */ 4020 #line 14 34"grammar.y"4013 #line 1427 "grammar.y" 4021 4014 { 4022 4015 //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp); … … 4046 4039 4047 4040 /* Line 1464 of yacc.c */ 4048 #line 14 63"grammar.y"4041 #line 1456 "grammar.y" 4049 4042 { 4050 4043 int i; TESTSETINT((yyvsp[(3) - (5)].lv),i); … … 4064 4057 4065 4058 /* Line 1464 of yacc.c */ 4066 #line 14 76"grammar.y"4059 #line 1469 "grammar.y" 4067 4060 { 4068 4061 if (currentVoice->ifsw==1) … … 4086 4079 4087 4080 /* Line 1464 of yacc.c */ 4088 #line 14 93"grammar.y"4081 #line 1486 "grammar.y" 4089 4082 { 4090 4083 int i; TESTSETINT((yyvsp[(3) - (5)].lv),i); … … 4100 4093 4101 4094 /* Line 1464 of yacc.c */ 4102 #line 1 502"grammar.y"4095 #line 1495 "grammar.y" 4103 4096 { 4104 4097 if (exitBuffer(BT_break)) YYERROR; … … 4110 4103 4111 4104 /* Line 1464 of yacc.c */ 4112 #line 150 7"grammar.y"4105 #line 1500 "grammar.y" 4113 4106 { 4114 4107 if (contBuffer(BT_break)) YYERROR; … … 4120 4113 4121 4114 /* Line 1464 of yacc.c */ 4122 #line 15 15"grammar.y"4115 #line 1508 "grammar.y" 4123 4116 { 4124 4117 /* -> if(!$2) break; $3; continue;*/ … … 4134 4127 4135 4128 /* Line 1464 of yacc.c */ 4136 #line 152 7"grammar.y"4129 #line 1520 "grammar.y" 4137 4130 { 4138 4131 /* $2 */ … … 4155 4148 4156 4149 /* Line 1464 of yacc.c */ 4157 #line 15 46"grammar.y"4150 #line 1539 "grammar.y" 4158 4151 { 4159 4152 idhdl h = enterid((yyvsp[(2) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE); … … 4170 4163 4171 4164 /* Line 1464 of yacc.c */ 4172 #line 15 56"grammar.y"4165 #line 1549 "grammar.y" 4173 4166 { 4174 4167 idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE); … … 4194 4187 4195 4188 /* Line 1464 of yacc.c */ 4196 #line 15 75"grammar.y"4189 #line 1568 "grammar.y" 4197 4190 { 4198 4191 omFree((ADDRESS)(yyvsp[(3) - (4)].name)); … … 4219 4212 4220 4213 /* Line 1464 of yacc.c */ 4221 #line 159 8"grammar.y"4214 #line 1591 "grammar.y" 4222 4215 { 4223 4216 // decl. of type proc p(int i) … … 4230 4223 4231 4224 /* Line 1464 of yacc.c */ 4232 #line 1 604"grammar.y"4225 #line 1597 "grammar.y" 4233 4226 { 4234 4227 // decl. of type proc p(i) … … 4244 4237 4245 4238 /* Line 1464 of yacc.c */ 4246 #line 16 16"grammar.y"4239 #line 1609 "grammar.y" 4247 4240 { 4248 4241 iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv)); … … 4255 4248 4256 4249 /* Line 1464 of yacc.c */ 4257 #line 16 22"grammar.y"4250 #line 1615 "grammar.y" 4258 4251 { 4259 4252 if ((yyvsp[(1) - (3)].i)==RETURN) … … 4269 4262 4270 4263 /* Line 1464 of yacc.c */ 4271 #line 42 70"grammar.cc"4264 #line 4263 "grammar.cc" 4272 4265 default: break; 4273 4266 } -
Singular/grammar.y
r0f36a0 rf7d268 538 538 { 539 539 memset(&$$,0,sizeof($$)); 540 if ($1!=LIB_CMD) 541 { 542 $$.rtyp = $1; 543 $$.data = $$.Data(); 544 } 545 else 546 { 547 $$.rtyp=NONE; 548 } 540 $$.rtyp = $1; 541 $$.data = $$.Data(); 549 542 } 550 543 | stringexpr … … 1333 1326 if (iiAssignCR(&$2,&$4)) YYERROR; 1334 1327 } 1335 1336 1337 1338 1339 1340 1341 1342 1343 1328 | ringcmd1 elemexpr cmdeq elemexpr '[' exprlist ']' 1329 { 1330 #ifdef SINGULAR_4_1 1331 yyInRingConstruction = FALSE; 1332 sleftv tmp; 1333 $4.next=(leftv)omAlloc(sizeof(sleftv)); 1334 memcpy($4.next,&$6,sizeof(sleftv)); 1335 memset(&$6,0,sizeof(sleftv)); 1336 if (iiExprArithM(&tmp,&$4,'[')) YYERROR; 1344 1337 if (iiAssignCR(&$2,&tmp)) YYERROR; 1345 1346 1347 1348 1338 #else 1339 YYERROR; 1340 #endif 1341 } 1349 1342 ; 1350 1343 -
Singular/subexpr.cc
r0f36a0 rf7d268 368 368 case VNOETHER: 369 369 case VMINPOLY: 370 case LIB_CMD: 370 371 case 0: 371 372 //attribute=NULL; // will be done by Init() at the end … … 644 645 case VNOETHER: 645 646 case VMINPOLY: 647 case LIB_CMD: 646 648 case 0: /* type in error case */ 647 649 break; /* error recovery: do nothing */ … … 738 740 //{ 739 741 //if ((rtyp!=IDHDL)&&(e==NULL) 740 //&&(rtyp!=VNOETHER)&&(rtyp!= VMINPOLY))742 //&&(rtyp!=VNOETHER)&&(rtyp!=LIB_CMD)&&(rtyp!=VMINPOLY)) 741 743 //{ 742 744 // void *x=data;
Note: See TracChangeset
for help on using the changeset viewer.