Changeset 254a326 in git for Singular/grammar.cc
- Timestamp:
- Nov 12, 2008, 1:51:53 PM (15 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 6bd405f611d9e3d1ccbd34fdf122aa98e8474bc6
- Parents:
- f13d949e655e53400261250ef5a9a2c2f11e2585
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/grammar.cc
rf13d949 r254a326 473 473 738, 742, 759, 765, 777, 785, 793, 798, 802, 806, 474 474 810, 814, 818, 822, 826, 830, 834, 838, 842, 849, 475 855, 857, 8 69, 871, 882, 883, 887, 897, 906, 910,476 9 14, 930, 934, 954, 972, 997, 1008, 1012, 1014, 1027,477 10 35, 1045, 1089, 1091, 1099, 1101, 1107, 1118, 1123, 1126,478 113 2, 1138, 1146, 1160, 1181, 1203, 1208, 1212, 1217, 1221,479 12 25, 1229, 1233, 1237, 1242, 1251, 1260, 1269, 1278, 1287,480 1 296, 1305, 1323, 1329, 1333, 1376, 1385, 1399, 1399, 1401,481 14 77, 1484, 1513, 1526, 1543, 1552, 1557, 1564, 1576, 1595,482 16 07, 1627, 1650, 1657, 1668, 1676475 855, 857, 875, 877, 888, 889, 893, 903, 912, 916, 476 920, 936, 940, 960, 978, 1003, 1014, 1018, 1020, 1033, 477 1041, 1051, 1095, 1097, 1105, 1107, 1113, 1124, 1129, 1132, 478 1138, 1144, 1152, 1166, 1187, 1209, 1214, 1218, 1223, 1227, 479 1231, 1235, 1239, 1243, 1248, 1257, 1266, 1275, 1284, 1293, 480 1302, 1311, 1329, 1335, 1339, 1382, 1391, 1405, 1405, 1407, 481 1483, 1490, 1519, 1532, 1549, 1558, 1563, 1570, 1582, 1601, 482 1613, 1633, 1656, 1663, 1674, 1682 483 483 }; 484 484 #endif … … 2181 2181 YYERROR; 2182 2182 } 2183 else if ((yyvsp[-1].lv.rtyp==MODUL_CMD) 2184 // matrix m; m[2]=... 2185 && (yyvsp[-1].lv.e!=NULL) && (yyvsp[-1].lv.e->next==NULL)) 2186 { 2187 MYYERROR("matrix must have 2 indices"); 2188 } 2183 2189 yyval.lv = yyvsp[-1].lv; 2184 2190 ; 2185 2191 break;} 2186 2192 case 94: 2187 #line 87 2"grammar.y"2193 #line 878 "grammar.y" 2188 2194 { 2189 2195 if (yyvsp[-1].lv.Typ()!=STRING_CMD) … … 2196 2202 break;} 2197 2203 case 97: 2198 #line 8 89"grammar.y"2204 #line 895 "grammar.y" 2199 2205 { 2200 2206 #ifdef HAVE_NS … … 2207 2213 break;} 2208 2214 case 98: 2209 #line 898"grammar.y"2215 #line 904 "grammar.y" 2210 2216 { 2211 2217 #ifdef HAVE_NS … … 2218 2224 break;} 2219 2225 case 99: 2220 #line 9 07"grammar.y"2226 #line 913 "grammar.y" 2221 2227 { 2222 2228 if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR; … … 2224 2230 break;} 2225 2231 case 100: 2226 #line 91 1"grammar.y"2232 #line 917 "grammar.y" 2227 2233 { 2228 2234 if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR; … … 2230 2236 break;} 2231 2237 case 101: 2232 #line 9 15"grammar.y"2238 #line 921 "grammar.y" 2233 2239 { 2234 2240 if (iiDeclCommand(&yyval.lv,&yyvsp[-6].lv,myynest,yyvsp[-7].i,&(currRing->idroot), TRUE)) YYERROR; … … 2248 2254 break;} 2249 2255 case 102: 2250 #line 93 1"grammar.y"2256 #line 937 "grammar.y" 2251 2257 { 2252 2258 if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR; … … 2254 2260 break;} 2255 2261 case 103: 2256 #line 9 35"grammar.y"2262 #line 941 "grammar.y" 2257 2263 { 2258 2264 int r; TESTSETINT(yyvsp[-4].lv,r); … … 2276 2282 break;} 2277 2283 case 104: 2278 #line 9 55"grammar.y"2284 #line 961 "grammar.y" 2279 2285 { 2280 2286 #ifdef HAVE_NS … … 2296 2302 break;} 2297 2303 case 105: 2298 #line 97 3"grammar.y"2304 #line 979 "grammar.y" 2299 2305 { 2300 2306 int t=yyvsp[-2].lv.Typ(); … … 2323 2329 break;} 2324 2330 case 106: 2325 #line 998"grammar.y"2331 #line 1004 "grammar.y" 2326 2332 { 2327 2333 #ifdef HAVE_NS … … 2334 2340 break;} 2335 2341 case 109: 2336 #line 10 15"grammar.y"2342 #line 1021 "grammar.y" 2337 2343 { 2338 2344 leftv v = &yyvsp[-3].lv; … … 2347 2353 break;} 2348 2354 case 110: 2349 #line 10 29"grammar.y"2355 #line 1035 "grammar.y" 2350 2356 { 2351 2357 // let rInit take care of any errors … … 2354 2360 break;} 2355 2361 case 111: 2356 #line 10 37"grammar.y"2362 #line 1043 "grammar.y" 2357 2363 { 2358 2364 memset(&yyval.lv,0,sizeof(yyval.lv)); … … 2365 2371 break;} 2366 2372 case 112: 2367 #line 10 46"grammar.y"2373 #line 1052 "grammar.y" 2368 2374 { 2369 2375 memset(&yyval.lv,0,sizeof(yyval.lv)); … … 2409 2415 break;} 2410 2416 case 114: 2411 #line 109 2"grammar.y"2417 #line 1098 "grammar.y" 2412 2418 { 2413 2419 yyval.lv = yyvsp[-2].lv; … … 2417 2423 break;} 2418 2424 case 116: 2419 #line 110 2"grammar.y"2425 #line 1108 "grammar.y" 2420 2426 { 2421 2427 yyval.lv = yyvsp[-1].lv; … … 2423 2429 break;} 2424 2430 case 117: 2425 #line 11 08"grammar.y"2431 #line 1114 "grammar.y" 2426 2432 { 2427 2433 expected_parms = TRUE; … … 2429 2435 break;} 2430 2436 case 118: 2431 #line 112 0"grammar.y"2437 #line 1126 "grammar.y" 2432 2438 { if (yyvsp[-1].i != '<') YYERROR; 2433 2439 if((feFilePending=feFopen(yyvsp[0].name,"r",NULL,TRUE))==NULL) YYERROR; ; 2434 2440 break;} 2435 2441 case 119: 2436 #line 112 3"grammar.y"2442 #line 1129 "grammar.y" 2437 2443 { newFile(yyvsp[-2].name,feFilePending); ; 2438 2444 break;} 2439 2445 case 120: 2440 #line 11 28"grammar.y"2446 #line 1134 "grammar.y" 2441 2447 { 2442 2448 feHelp(yyvsp[-1].name); … … 2445 2451 break;} 2446 2452 case 121: 2447 #line 113 3"grammar.y"2453 #line 1139 "grammar.y" 2448 2454 { 2449 2455 feHelp(NULL); … … 2451 2457 break;} 2452 2458 case 122: 2453 #line 114 0"grammar.y"2459 #line 1146 "grammar.y" 2454 2460 { 2455 2461 singular_example(yyvsp[-1].name); … … 2458 2464 break;} 2459 2465 case 123: 2460 #line 11 48"grammar.y"2466 #line 1154 "grammar.y" 2461 2467 { 2462 2468 #ifdef HAVE_NS … … 2471 2477 break;} 2472 2478 case 124: 2473 #line 116 2"grammar.y"2479 #line 1168 "grammar.y" 2474 2480 { 2475 2481 leftv v=&yyvsp[0].lv; … … 2493 2499 break;} 2494 2500 case 125: 2495 #line 118 2"grammar.y"2501 #line 1188 "grammar.y" 2496 2502 { 2497 2503 leftv v=&yyvsp[0].lv; … … 2515 2521 break;} 2516 2522 case 126: 2517 #line 12 05"grammar.y"2523 #line 1211 "grammar.y" 2518 2524 { 2519 2525 list_cmd(yyvsp[-1].i,NULL,"// ",TRUE); … … 2521 2527 break;} 2522 2528 case 127: 2523 #line 12 09"grammar.y"2529 #line 1215 "grammar.y" 2524 2530 { 2525 2531 list_cmd(yyvsp[-1].i,NULL,"// ",TRUE); … … 2527 2533 break;} 2528 2534 case 128: 2529 #line 121 3"grammar.y"2535 #line 1219 "grammar.y" 2530 2536 { 2531 2537 if (yyvsp[-1].i==QRING_CMD) yyvsp[-1].i=RING_CMD; … … 2534 2540 break;} 2535 2541 case 129: 2536 #line 12 18"grammar.y"2542 #line 1224 "grammar.y" 2537 2543 { 2538 2544 list_cmd(yyvsp[-1].i,NULL,"// ",TRUE); … … 2540 2546 break;} 2541 2547 case 130: 2542 #line 122 2"grammar.y"2548 #line 1228 "grammar.y" 2543 2549 { 2544 2550 list_cmd(RING_CMD,NULL,"// ",TRUE); … … 2546 2552 break;} 2547 2553 case 131: 2548 #line 12 26"grammar.y"2554 #line 1232 "grammar.y" 2549 2555 { 2550 2556 list_cmd(MATRIX_CMD,NULL,"// ",TRUE); … … 2552 2558 break;} 2553 2559 case 132: 2554 #line 123 0"grammar.y"2560 #line 1236 "grammar.y" 2555 2561 { 2556 2562 list_cmd(INTMAT_CMD,NULL,"// ",TRUE); … … 2558 2564 break;} 2559 2565 case 133: 2560 #line 12 34"grammar.y"2566 #line 1240 "grammar.y" 2561 2567 { 2562 2568 list_cmd(PROC_CMD,NULL,"// ",TRUE); … … 2564 2570 break;} 2565 2571 case 134: 2566 #line 12 38"grammar.y"2572 #line 1244 "grammar.y" 2567 2573 { 2568 2574 list_cmd(0,yyvsp[-1].lv.Fullname(),"// ",TRUE); … … 2571 2577 break;} 2572 2578 case 135: 2573 #line 124 3"grammar.y"2579 #line 1249 "grammar.y" 2574 2580 { 2575 2581 #ifdef HAVE_NS … … 2582 2588 break;} 2583 2589 case 136: 2584 #line 125 2"grammar.y"2590 #line 1258 "grammar.y" 2585 2591 { 2586 2592 #ifdef HAVE_NS … … 2593 2599 break;} 2594 2600 case 137: 2595 #line 126 1"grammar.y"2601 #line 1267 "grammar.y" 2596 2602 { 2597 2603 #ifdef HAVE_NS … … 2604 2610 break;} 2605 2611 case 138: 2606 #line 127 0"grammar.y"2612 #line 1276 "grammar.y" 2607 2613 { 2608 2614 #ifdef HAVE_NS … … 2615 2621 break;} 2616 2622 case 139: 2617 #line 12 79"grammar.y"2623 #line 1285 "grammar.y" 2618 2624 { 2619 2625 #ifdef HAVE_NS … … 2626 2632 break;} 2627 2633 case 140: 2628 #line 12 88"grammar.y"2634 #line 1294 "grammar.y" 2629 2635 { 2630 2636 #ifdef HAVE_NS … … 2637 2643 break;} 2638 2644 case 141: 2639 #line 1 297"grammar.y"2645 #line 1303 "grammar.y" 2640 2646 { 2641 2647 #ifdef HAVE_NS … … 2648 2654 break;} 2649 2655 case 142: 2650 #line 13 06"grammar.y"2656 #line 1312 "grammar.y" 2651 2657 { 2652 2658 #ifdef HAVE_NS … … 2659 2665 break;} 2660 2666 case 143: 2661 #line 13 24"grammar.y"2667 #line 1330 "grammar.y" 2662 2668 { 2663 2669 list_cmd(-1,NULL,"// ",TRUE); … … 2665 2671 break;} 2666 2672 case 144: 2667 #line 133 0"grammar.y"2673 #line 1336 "grammar.y" 2668 2674 { yyInRingConstruction = TRUE; ; 2669 2675 break;} 2670 2676 case 145: 2671 #line 13 39"grammar.y"2677 #line 1345 "grammar.y" 2672 2678 { 2673 2679 const char *ring_name = yyvsp[-6].lv.name; … … 2681 2687 { 2682 2688 #ifdef HAVE_NS 2683 newRingHdl=enterid(ring_name, myynest, RING_CMD, 2689 newRingHdl=enterid(ring_name, myynest, RING_CMD, 2684 2690 &(yyvsp[-6].lv.req_packhdl->idroot)); 2685 2691 #else … … 2709 2715 break;} 2710 2716 case 146: 2711 #line 13 77"grammar.y"2717 #line 1383 "grammar.y" 2712 2718 { 2713 2719 const char *ring_name = yyvsp[0].lv.name; … … 2718 2724 break;} 2719 2725 case 147: 2720 #line 13 87"grammar.y"2726 #line 1393 "grammar.y" 2721 2727 { 2722 2728 if ((yyvsp[-1].i!=LIB_CMD)||(iiLibCmd(yyvsp[0].name,TRUE,TRUE,TRUE))) … … 2731 2737 break;} 2732 2738 case 150: 2733 #line 140 3"grammar.y"2739 #line 1409 "grammar.y" 2734 2740 { 2735 2741 if ((yyvsp[-1].i==KEEPRING_CMD) && (myynest==0)) … … 2806 2812 break;} 2807 2813 case 151: 2808 #line 14 79"grammar.y"2814 #line 1485 "grammar.y" 2809 2815 { 2810 2816 if (yyvsp[0].lv.rtyp!=IDHDL) MYYERROR("identifier expected"); … … 2814 2820 break;} 2815 2821 case 152: 2816 #line 14 85"grammar.y"2822 #line 1491 "grammar.y" 2817 2823 { 2818 2824 //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp); … … 2839 2845 break;} 2840 2846 case 153: 2841 #line 15 14"grammar.y"2847 #line 1520 "grammar.y" 2842 2848 { 2843 2849 int i; TESTSETINT(yyvsp[-2].lv,i); … … 2854 2860 break;} 2855 2861 case 154: 2856 #line 15 27"grammar.y"2862 #line 1533 "grammar.y" 2857 2863 { 2858 2864 if (currentVoice->ifsw==1) … … 2873 2879 break;} 2874 2880 case 155: 2875 #line 15 44"grammar.y"2881 #line 1550 "grammar.y" 2876 2882 { 2877 2883 int i; TESTSETINT(yyvsp[-2].lv,i); … … 2884 2890 break;} 2885 2891 case 156: 2886 #line 155 3"grammar.y"2892 #line 1559 "grammar.y" 2887 2893 { 2888 2894 if (exitBuffer(BT_break)) YYERROR; … … 2891 2897 break;} 2892 2898 case 157: 2893 #line 15 58"grammar.y"2899 #line 1564 "grammar.y" 2894 2900 { 2895 2901 if (contBuffer(BT_break)) YYERROR; … … 2898 2904 break;} 2899 2905 case 158: 2900 #line 15 66"grammar.y"2906 #line 1572 "grammar.y" 2901 2907 { 2902 2908 /* -> if(!$2) break; $3; continue;*/ … … 2909 2915 break;} 2910 2916 case 159: 2911 #line 15 78"grammar.y"2917 #line 1584 "grammar.y" 2912 2918 { 2913 2919 /* $2 */ … … 2927 2933 break;} 2928 2934 case 160: 2929 #line 1 597"grammar.y"2935 #line 1603 "grammar.y" 2930 2936 { 2931 2937 procinfov pi; … … 2940 2946 break;} 2941 2947 case 161: 2942 #line 16 08"grammar.y"2948 #line 1614 "grammar.y" 2943 2949 { 2944 2950 idhdl h = enterid(yyvsp[-2].name,myynest,PROC_CMD,&IDROOT,TRUE); … … 2962 2968 break;} 2963 2969 case 162: 2964 #line 16 28"grammar.y"2970 #line 1634 "grammar.y" 2965 2971 { 2966 2972 omFree((ADDRESS)yyvsp[-1].name); … … 2985 2991 break;} 2986 2992 case 163: 2987 #line 165 2"grammar.y"2993 #line 1658 "grammar.y" 2988 2994 { 2989 2995 //Print("par:%s, %d\n",$2.Name(),$2.Typ()); … … 2993 2999 break;} 2994 3000 case 164: 2995 #line 16 58"grammar.y"3001 #line 1664 "grammar.y" 2996 3002 { 2997 3003 //Print("par:%s, %d\n",$2.Name(),$2.Typ()); … … 3004 3010 break;} 3005 3011 case 165: 3006 #line 167 0"grammar.y"3012 #line 1676 "grammar.y" 3007 3013 { 3008 3014 if(iiRETURNEXPR==NULL) YYERROR; … … 3013 3019 break;} 3014 3020 case 166: 3015 #line 16 77"grammar.y"3021 #line 1683 "grammar.y" 3016 3022 { 3017 3023 if (yyvsp[-2].i==RETURN) … … 3247 3253 return 1; 3248 3254 } 3249 #line 16 87"grammar.y"3255 #line 1693 "grammar.y"
Note: See TracChangeset
for help on using the changeset viewer.