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