Changeset d2fc5c5 in git
- Timestamp:
- Aug 18, 2016, 2:48:17 PM (8 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 41ca4108284bcffa9bcdb7119787136373b9b0ae
- Parents:
- c12c262fa453caf878bfa90e7935d683d92be8ff
- Location:
- Singular
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/attrib.cc
rc12c262 rd2fc5c5 159 159 { 160 160 if ((IDTYP(root)!=RING_CMD) 161 && (IDTYP(root)!=QRING_CMD)162 161 && (!RingDependend(IDTYP(root)))&&(RingDependend(typ))) 163 162 WerrorS("cannot set ring-dependend objects at this type"); … … 176 175 WerrorS("cannot set attributes of this object"); 177 176 else if ((rt!=RING_CMD) 178 && (rt!=QRING_CMD)179 177 && (!RingDependend(rt))&&(RingDependend(typ))) 180 178 WerrorS("cannot set ring-dependend objects at this type"); … … 241 239 BOOLEAN atATTRIB1(leftv res,leftv v) 242 240 { 243 int t;244 241 attr *aa=(v->Attribute()); 245 242 if (aa==NULL) … … 262 259 haveNoAttribute=FALSE; 263 260 } 264 if ( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD))261 if (v->Typ()==RING_CMD) 265 262 { 266 263 PrintS("attr:cf_class, type int\n"); … … 287 284 { 288 285 char *name=(char *)b->Data(); 289 int t ;286 int t=v->Typ(); 290 287 leftv at=NULL; 291 288 if (v->e!=NULL) … … 297 294 if (at!=NULL) res->data=(void *)(long)(hasFlag(v,FLAG_STD)||(hasFlag(at,FLAG_STD))); 298 295 } 299 else if ((strcmp(name,"rank")==0)&&( v->Typ()==MODUL_CMD))296 else if ((strcmp(name,"rank")==0)&&(/*v->Typ()*/t==MODUL_CMD)) 300 297 { 301 298 res->rtyp=INT_CMD; … … 303 300 } 304 301 else if ((strcmp(name,"global")==0) 305 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))302 &&(/*v->Typ()*/t==RING_CMD)) 306 303 { 307 304 res->rtyp=INT_CMD; … … 309 306 } 310 307 else if ((strcmp(name,"maxExp")==0) 311 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))308 &&(/*v->Typ()*/t==RING_CMD)) 312 309 { 313 310 res->rtyp=INT_CMD; … … 315 312 } 316 313 else if ((strcmp(name,"ring_cf")==0) 317 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))314 &&(/*v->Typ()*/t==RING_CMD)) 318 315 { 319 316 res->rtyp=INT_CMD; … … 321 318 } 322 319 else if ((strcmp(name,"cf_class")==0) 323 &&( ((t=v->Typ())==RING_CMD)||(t==CRING_CMD)))320 &&(/*v->Typ()*/t==RING_CMD)) 324 321 { 325 322 res->rtyp=INT_CMD; … … 337 334 #ifdef HAVE_SHIFTBBA 338 335 else if ((strcmp(name,"isLPring")==0) 339 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))336 &&(/*v->Typ()*/t==RING_CMD)) 340 337 { 341 338 res->rtyp=INT_CMD; … … 369 366 { 370 367 idhdl h=(idhdl)v->data; 371 int t;372 368 if (v->e!=NULL) 373 369 { … … 377 373 } 378 374 else if (v->rtyp!=IDHDL) h=NULL; 375 int t=v->Typ(); 379 376 380 377 char *name=(char *)b->Data(); … … 415 412 } 416 413 } 417 else if ((strcmp(name,"rank")==0)&&( v->Typ()==MODUL_CMD))414 else if ((strcmp(name,"rank")==0)&&(/*v->Typ()*/t==MODUL_CMD)) 418 415 { 419 416 if (c->Typ()!=INT_CMD) … … 430 427 || (strcmp(name,"ring_cf")==0) 431 428 || (strcmp(name,"maxExp")==0)) 432 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))429 &&(/*v->Typ()*/t==RING_CMD)) 433 430 { 434 431 Werror("can not set attribute `%s`",name); … … 437 434 #ifdef HAVE_SHIFTBBA 438 435 else if ((strcmp(name,"isLPring")==0) 439 &&( ((t=v->Typ())==RING_CMD)||(t==QRING_CMD)))436 &&(/*v->Typ()*/t==RING_CMD)) 440 437 { 441 438 if (c->Typ()==INT_CMD) -
Singular/grammar.cc
rc12c262 rd2fc5c5 126 126 { 127 127 if ((IDTYP(r)==PACKAGE_CMD) 128 || (IDTYP(r)==RING_CMD) 129 || (IDTYP(r)==QRING_CMD)) 128 || (IDTYP(r)==RING_CMD)) 130 129 { 131 130 h=IDPACKAGE(r)->idroot->get(nn,myynest); … … 239 238 240 239 /* Line 189 of yacc.c */ 241 #line 24 2"grammar.cc"240 #line 241 "grammar.cc" 242 241 243 242 /* Enabling traces. */ … … 365 364 366 365 /* Line 264 of yacc.c */ 367 #line 36 8"grammar.cc"366 #line 367 "grammar.cc" 368 367 369 368 #ifdef short … … 742 741 static const yytype_uint16 yyrline[] = 743 742 { 744 0, 31 7, 317, 319, 353, 354, 356, 358, 362, 367,745 36 9, 420, 421, 422, 423, 424, 425, 426, 427, 431,746 43 4, 435, 436, 437, 438, 439, 440, 441, 442, 445,747 45 2, 457, 461, 465, 469, 473, 486, 514, 538, 544,748 5 50, 554, 558, 562, 566, 570, 574, 578, 582, 586,749 5 90, 594, 598, 602, 606, 610, 614, 618, 622, 626,750 6 30, 636, 640, 644, 648, 652, 659, 670, 676, 681,751 68 2, 683, 687, 691, 695, 699, 703, 707, 711, 715,752 71 9, 736, 743, 742, 760, 768, 776, 785, 789, 793,753 79 7, 801, 805, 809, 813, 817, 821, 825, 829, 833,754 84 5, 852, 853, 872, 873, 885, 890, 895, 899, 903,755 93 9, 965, 986, 994, 998, 999, 1013, 1021, 1030, 1075,756 107 6, 1085, 1086, 1092, 1099, 1101, 1103, 1113, 1112, 1120,757 112 5, 1132, 1140, 1152, 1168, 1187, 1191, 1195, 1200, 1204,758 120 8, 1212, 1216, 1221, 1227, 1233, 1239, 1245, 1251, 1257,759 126 9, 1276, 1280, 1317, 1324, 1329, 1346, 1352, 1352, 1355,760 142 3, 1427, 1456, 1469, 1486, 1495, 1500, 1508, 1520, 1539,761 154 9, 1568, 1591, 1597, 1609, 1615743 0, 316, 316, 318, 352, 353, 355, 357, 361, 366, 744 368, 419, 420, 421, 422, 423, 424, 425, 426, 430, 745 433, 434, 435, 436, 437, 438, 439, 440, 441, 444, 746 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 762 761 }; 763 762 #endif … … 2361 2360 2362 2361 /* Line 1464 of yacc.c */ 2363 #line 3 20"grammar.y"2362 #line 319 "grammar.y" 2364 2363 { 2365 2364 if (timerv) … … 2397 2396 2398 2397 /* Line 1464 of yacc.c */ 2399 #line 35 5"grammar.y"2398 #line 354 "grammar.y" 2400 2399 {currentVoice->ifsw=0;;} 2401 2400 break; … … 2404 2403 2405 2404 /* Line 1464 of yacc.c */ 2406 #line 35 7"grammar.y"2405 #line 356 "grammar.y" 2407 2406 { (yyvsp[(1) - (2)].lv).CleanUp(); currentVoice->ifsw=0;;} 2408 2407 break; … … 2411 2410 2412 2411 /* Line 1464 of yacc.c */ 2413 #line 35 9"grammar.y"2412 #line 358 "grammar.y" 2414 2413 { 2415 2414 YYACCEPT; … … 2420 2419 2421 2420 /* Line 1464 of yacc.c */ 2422 #line 36 3"grammar.y"2421 #line 362 "grammar.y" 2423 2422 { 2424 2423 currentVoice->ifsw=0; … … 2430 2429 2431 2430 /* Line 1464 of yacc.c */ 2432 #line 36 8"grammar.y"2431 #line 367 "grammar.y" 2433 2432 {currentVoice->ifsw=0;;} 2434 2433 break; … … 2437 2436 2438 2437 /* Line 1464 of yacc.c */ 2439 #line 3 70"grammar.y"2438 #line 369 "grammar.y" 2440 2439 { 2441 2440 #ifdef SIQ … … 2491 2490 2492 2491 /* Line 1464 of yacc.c */ 2493 #line 42 8"grammar.y"2492 #line 427 "grammar.y" 2494 2493 {if (currentVoice!=NULL) currentVoice->ifsw=0;;} 2495 2494 break; … … 2498 2497 2499 2498 /* Line 1464 of yacc.c */ 2500 #line 43 1"grammar.y"2499 #line 430 "grammar.y" 2501 2500 { omFree((ADDRESS)(yyvsp[(2) - (2)].name)); ;} 2502 2501 break; … … 2505 2504 2506 2505 /* Line 1464 of yacc.c */ 2507 #line 44 6"grammar.y"2506 #line 445 "grammar.y" 2508 2507 { 2509 2508 if(iiAssign(&(yyvsp[(1) - (2)].lv),&(yyvsp[(2) - (2)].lv))) YYERROR; … … 2514 2513 2515 2514 /* Line 1464 of yacc.c */ 2516 #line 45 3"grammar.y"2515 #line 452 "grammar.y" 2517 2516 { 2518 2517 if (currRing==NULL) MYYERROR("no ring active"); … … 2524 2523 2525 2524 /* Line 1464 of yacc.c */ 2526 #line 45 8"grammar.y"2525 #line 457 "grammar.y" 2527 2526 { 2528 2527 syMake(&(yyval.lv),(yyvsp[(1) - (1)].name)); … … 2533 2532 2534 2533 /* Line 1464 of yacc.c */ 2535 #line 46 2"grammar.y"2534 #line 461 "grammar.y" 2536 2535 { 2537 2536 if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), COLONCOLON, &(yyvsp[(3) - (3)].lv))) YYERROR; … … 2542 2541 2543 2542 /* Line 1464 of yacc.c */ 2544 #line 46 6"grammar.y"2543 #line 465 "grammar.y" 2545 2544 { 2546 2545 if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), '.', &(yyvsp[(3) - (3)].lv))) YYERROR; … … 2551 2550 2552 2551 /* Line 1464 of yacc.c */ 2553 #line 4 70"grammar.y"2552 #line 469 "grammar.y" 2554 2553 { 2555 2554 if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'(')) YYERROR; … … 2560 2559 2561 2560 /* Line 1464 of yacc.c */ 2562 #line 47 4"grammar.y"2561 #line 473 "grammar.y" 2563 2562 { 2564 2563 if ((yyvsp[(1) - (4)].lv).rtyp==UNKNOWN) … … 2578 2577 2579 2578 /* Line 1464 of yacc.c */ 2580 #line 48 7"grammar.y"2579 #line 486 "grammar.y" 2581 2580 { 2582 2581 if (currRingHdl==NULL) MYYERROR("no ring active"); … … 2611 2610 2612 2611 /* Line 1464 of yacc.c */ 2613 #line 51 5"grammar.y"2612 #line 514 "grammar.y" 2614 2613 { 2615 2614 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 2640 2639 2641 2640 /* Line 1464 of yacc.c */ 2642 #line 53 9"grammar.y"2641 #line 538 "grammar.y" 2643 2642 { 2644 2643 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 2651 2650 2652 2651 /* Line 1464 of yacc.c */ 2653 #line 54 5"grammar.y"2652 #line 544 "grammar.y" 2654 2653 { 2655 2654 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 2662 2661 2663 2662 /* Line 1464 of yacc.c */ 2664 #line 55 1"grammar.y"2663 #line 550 "grammar.y" 2665 2664 { 2666 2665 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2671 2670 2672 2671 /* Line 1464 of yacc.c */ 2673 #line 55 5"grammar.y"2672 #line 554 "grammar.y" 2674 2673 { 2675 2674 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2680 2679 2681 2680 /* Line 1464 of yacc.c */ 2682 #line 55 9"grammar.y"2681 #line 558 "grammar.y" 2683 2682 { 2684 2683 if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2689 2688 2690 2689 /* Line 1464 of yacc.c */ 2691 #line 56 3"grammar.y"2690 #line 562 "grammar.y" 2692 2691 { 2693 2692 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2698 2697 2699 2698 /* Line 1464 of yacc.c */ 2700 #line 56 7"grammar.y"2699 #line 566 "grammar.y" 2701 2700 { 2702 2701 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2707 2706 2708 2707 /* Line 1464 of yacc.c */ 2709 #line 57 1"grammar.y"2708 #line 570 "grammar.y" 2710 2709 { 2711 2710 if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2716 2715 2717 2716 /* Line 1464 of yacc.c */ 2718 #line 57 5"grammar.y"2717 #line 574 "grammar.y" 2719 2718 { 2720 2719 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2725 2724 2726 2725 /* Line 1464 of yacc.c */ 2727 #line 57 9"grammar.y"2726 #line 578 "grammar.y" 2728 2727 { 2729 2728 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2734 2733 2735 2734 /* Line 1464 of yacc.c */ 2736 #line 58 3"grammar.y"2735 #line 582 "grammar.y" 2737 2736 { 2738 2737 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2743 2742 2744 2743 /* Line 1464 of yacc.c */ 2745 #line 58 7"grammar.y"2744 #line 586 "grammar.y" 2746 2745 { 2747 2746 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2752 2751 2753 2752 /* Line 1464 of yacc.c */ 2754 #line 59 1"grammar.y"2753 #line 590 "grammar.y" 2755 2754 { 2756 2755 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2761 2760 2762 2761 /* Line 1464 of yacc.c */ 2763 #line 59 5"grammar.y"2762 #line 594 "grammar.y" 2764 2763 { 2765 2764 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2770 2769 2771 2770 /* Line 1464 of yacc.c */ 2772 #line 59 9"grammar.y"2771 #line 598 "grammar.y" 2773 2772 { 2774 2773 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2779 2778 2780 2779 /* Line 1464 of yacc.c */ 2781 #line 60 3"grammar.y"2780 #line 602 "grammar.y" 2782 2781 { 2783 2782 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2788 2787 2789 2788 /* Line 1464 of yacc.c */ 2790 #line 60 7"grammar.y"2789 #line 606 "grammar.y" 2791 2790 { 2792 2791 if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR; … … 2797 2796 2798 2797 /* Line 1464 of yacc.c */ 2799 #line 61 1"grammar.y"2798 #line 610 "grammar.y" 2800 2799 { 2801 2800 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2806 2805 2807 2806 /* Line 1464 of yacc.c */ 2808 #line 61 5"grammar.y"2807 #line 614 "grammar.y" 2809 2808 { 2810 2809 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2815 2814 2816 2815 /* Line 1464 of yacc.c */ 2817 #line 61 9"grammar.y"2816 #line 618 "grammar.y" 2818 2817 { 2819 2818 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2824 2823 2825 2824 /* Line 1464 of yacc.c */ 2826 #line 62 3"grammar.y"2825 #line 622 "grammar.y" 2827 2826 { 2828 2827 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2833 2832 2834 2833 /* Line 1464 of yacc.c */ 2835 #line 62 7"grammar.y"2834 #line 626 "grammar.y" 2836 2835 { 2837 2836 if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR; … … 2842 2841 2843 2842 /* Line 1464 of yacc.c */ 2844 #line 63 1"grammar.y"2843 #line 630 "grammar.y" 2845 2844 { 2846 2845 int b=iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i)); // handle branchTo … … 2853 2852 2854 2853 /* Line 1464 of yacc.c */ 2855 #line 63 7"grammar.y"2854 #line 636 "grammar.y" 2856 2855 { 2857 2856 if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2862 2861 2863 2862 /* Line 1464 of yacc.c */ 2864 #line 64 1"grammar.y"2863 #line 640 "grammar.y" 2865 2864 { 2866 2865 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR; … … 2871 2870 2872 2871 /* Line 1464 of yacc.c */ 2873 #line 64 5"grammar.y"2872 #line 644 "grammar.y" 2874 2873 { 2875 2874 if(iiExprArith3(&(yyval.lv),RING_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR; … … 2880 2879 2881 2880 /* Line 1464 of yacc.c */ 2882 #line 64 9"grammar.y"2881 #line 648 "grammar.y" 2883 2882 { 2884 2883 if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),RING_CMD)) YYERROR; … … 2889 2888 2890 2889 /* Line 1464 of yacc.c */ 2891 #line 65 3"grammar.y"2890 #line 652 "grammar.y" 2892 2891 { 2893 2892 if (iiARROW(&(yyval.lv),(yyvsp[(1) - (3)].name),(yyvsp[(3) - (3)].name))) YYERROR; … … 2898 2897 2899 2898 /* Line 1464 of yacc.c */ 2900 #line 6 60"grammar.y"2899 #line 659 "grammar.y" 2901 2900 { 2902 2901 leftv v = &(yyvsp[(1) - (3)].lv); … … 2914 2913 2915 2914 /* Line 1464 of yacc.c */ 2916 #line 67 1"grammar.y"2915 #line 670 "grammar.y" 2917 2916 { 2918 2917 (yyval.lv) = (yyvsp[(1) - (1)].lv); … … 2923 2922 2924 2923 /* Line 1464 of yacc.c */ 2925 #line 67 7"grammar.y"2924 #line 676 "grammar.y" 2926 2925 { 2927 2926 /*if ($1.typ == eunknown) YYERROR;*/ … … 2933 2932 2934 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 */ 2935 2941 #line 681 "grammar.y" 2936 { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}2937 break;2938 2939 case 70:2940 2941 /* Line 1464 of yacc.c */2942 #line 682 "grammar.y"2943 2942 { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;} 2944 2943 break; … … 2947 2946 2948 2947 /* Line 1464 of yacc.c */ 2949 #line 68 4"grammar.y"2948 #line 683 "grammar.y" 2950 2949 { 2951 2950 if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR; … … 2956 2955 2957 2956 /* Line 1464 of yacc.c */ 2958 #line 68 8"grammar.y"2957 #line 687 "grammar.y" 2959 2958 { 2960 2959 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (4)].lv),'[',&(yyvsp[(3) - (4)].lv))) YYERROR; … … 2965 2964 2966 2965 /* Line 1464 of yacc.c */ 2967 #line 69 2"grammar.y"2966 #line 691 "grammar.y" 2968 2967 { 2969 2968 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2974 2973 2975 2974 /* Line 1464 of yacc.c */ 2976 #line 69 6"grammar.y"2975 #line 695 "grammar.y" 2977 2976 { 2978 2977 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2983 2982 2984 2983 /* Line 1464 of yacc.c */ 2985 #line 700"grammar.y"2984 #line 699 "grammar.y" 2986 2985 { 2987 2986 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 2992 2991 2993 2992 /* Line 1464 of yacc.c */ 2994 #line 70 4"grammar.y"2993 #line 703 "grammar.y" 2995 2994 { 2996 2995 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 3001 3000 3002 3001 /* Line 1464 of yacc.c */ 3003 #line 70 8"grammar.y"3002 #line 707 "grammar.y" 3004 3003 { 3005 3004 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR; … … 3010 3009 3011 3010 /* Line 1464 of yacc.c */ 3012 #line 71 2"grammar.y"3011 #line 711 "grammar.y" 3013 3012 { 3014 3013 if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), 0, &(yyvsp[(5) - (6)].lv))) YYERROR; … … 3019 3018 3020 3019 /* Line 1464 of yacc.c */ 3021 #line 71 6"grammar.y"3020 #line 715 "grammar.y" 3022 3021 { 3023 3022 (yyval.lv)=(yyvsp[(2) - (3)].lv); … … 3028 3027 3029 3028 /* Line 1464 of yacc.c */ 3030 #line 7 20"grammar.y"3029 #line 719 "grammar.y" 3031 3030 { 3032 3031 #ifdef SIQ … … 3050 3049 3051 3050 /* Line 1464 of yacc.c */ 3052 #line 73 7"grammar.y"3051 #line 736 "grammar.y" 3053 3052 { 3054 3053 iiTestAssume(&(yyvsp[(2) - (5)].lv),&(yyvsp[(4) - (5)].lv)); … … 3061 3060 3062 3061 /* Line 1464 of yacc.c */ 3063 #line 74 3"grammar.y"3062 #line 742 "grammar.y" 3064 3063 { 3065 3064 #ifdef SIQ … … 3072 3071 3073 3072 /* Line 1464 of yacc.c */ 3074 #line 74 9"grammar.y"3073 #line 748 "grammar.y" 3075 3074 { 3076 3075 #ifdef SIQ … … 3087 3086 3088 3087 /* Line 1464 of yacc.c */ 3089 #line 76 1"grammar.y"3088 #line 760 "grammar.y" 3090 3089 { 3091 3090 #ifdef SIQ … … 3098 3097 3099 3098 /* Line 1464 of yacc.c */ 3100 #line 76 9"grammar.y"3099 #line 768 "grammar.y" 3101 3100 { 3102 3101 #ifdef SIQ … … 3109 3108 3110 3109 /* Line 1464 of yacc.c */ 3111 #line 77 7"grammar.y"3110 #line 776 "grammar.y" 3112 3111 { 3113 3112 #ifdef SIQ … … 3120 3119 3121 3120 /* Line 1464 of yacc.c */ 3122 #line 78 6"grammar.y"3121 #line 785 "grammar.y" 3123 3122 { 3124 3123 if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),PLUSPLUS)) YYERROR; … … 3129 3128 3130 3129 /* Line 1464 of yacc.c */ 3131 #line 7 90"grammar.y"3130 #line 789 "grammar.y" 3132 3131 { 3133 3132 if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),MINUSMINUS)) YYERROR; … … 3138 3137 3139 3138 /* Line 1464 of yacc.c */ 3140 #line 79 4"grammar.y"3139 #line 793 "grammar.y" 3141 3140 { 3142 3141 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'+',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3147 3146 3148 3147 /* Line 1464 of yacc.c */ 3149 #line 79 8"grammar.y"3148 #line 797 "grammar.y" 3150 3149 { 3151 3150 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'-',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3156 3155 3157 3156 /* Line 1464 of yacc.c */ 3158 #line 80 2"grammar.y"3157 #line 801 "grammar.y" 3159 3158 { 3160 3159 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3165 3164 3166 3165 /* Line 1464 of yacc.c */ 3167 #line 80 6"grammar.y"3166 #line 805 "grammar.y" 3168 3167 { 3169 3168 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'^',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3174 3173 3175 3174 /* Line 1464 of yacc.c */ 3176 #line 8 10"grammar.y"3175 #line 809 "grammar.y" 3177 3176 { 3178 3177 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3183 3182 3184 3183 /* Line 1464 of yacc.c */ 3185 #line 81 4"grammar.y"3184 #line 813 "grammar.y" 3186 3185 { 3187 3186 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3192 3191 3193 3192 /* Line 1464 of yacc.c */ 3194 #line 81 8"grammar.y"3193 #line 817 "grammar.y" 3195 3194 { 3196 3195 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),NOTEQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3201 3200 3202 3201 /* Line 1464 of yacc.c */ 3203 #line 82 2"grammar.y"3202 #line 821 "grammar.y" 3204 3203 { 3205 3204 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),EQUAL_EQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3210 3209 3211 3210 /* Line 1464 of yacc.c */ 3212 #line 82 6"grammar.y"3211 #line 825 "grammar.y" 3213 3212 { 3214 3213 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),DOTDOT,&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3219 3218 3220 3219 /* Line 1464 of yacc.c */ 3221 #line 8 30"grammar.y"3220 #line 829 "grammar.y" 3222 3221 { 3223 3222 if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),':',&(yyvsp[(3) - (3)].lv))) YYERROR; … … 3228 3227 3229 3228 /* Line 1464 of yacc.c */ 3230 #line 83 4"grammar.y"3229 #line 833 "grammar.y" 3231 3230 { 3232 3231 if (siq>0) … … 3245 3244 3246 3245 /* Line 1464 of yacc.c */ 3247 #line 84 6"grammar.y"3246 #line 845 "grammar.y" 3248 3247 { 3249 3248 if(iiExprArith1(&(yyval.lv),&(yyvsp[(2) - (2)].lv),'-')) YYERROR; … … 3254 3253 3255 3254 /* Line 1464 of yacc.c */ 3256 #line 85 2"grammar.y"3255 #line 851 "grammar.y" 3257 3256 { (yyval.lv) = (yyvsp[(1) - (2)].lv); ;} 3258 3257 break; … … 3261 3260 3262 3261 /* Line 1464 of yacc.c */ 3263 #line 85 4"grammar.y"3262 #line 853 "grammar.y" 3264 3263 { 3265 3264 if ((yyvsp[(1) - (2)].lv).rtyp==0) … … 3281 3280 3282 3281 /* Line 1464 of yacc.c */ 3283 #line 87 4"grammar.y"3282 #line 873 "grammar.y" 3284 3283 { 3285 3284 if ((yyvsp[(2) - (3)].lv).Typ()!=STRING_CMD) … … 3295 3294 3296 3295 /* Line 1464 of yacc.c */ 3297 #line 88 6"grammar.y"3296 #line 885 "grammar.y" 3298 3297 { 3299 3298 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3305 3304 3306 3305 /* Line 1464 of yacc.c */ 3307 #line 89 1"grammar.y"3306 #line 890 "grammar.y" 3308 3307 { 3309 3308 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3315 3314 3316 3315 /* Line 1464 of yacc.c */ 3317 #line 89 6"grammar.y"3316 #line 895 "grammar.y" 3318 3317 { 3319 3318 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR; … … 3324 3323 3325 3324 /* Line 1464 of yacc.c */ 3326 #line 900"grammar.y"3325 #line 899 "grammar.y" 3327 3326 { 3328 3327 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR; … … 3333 3332 3334 3333 /* Line 1464 of yacc.c */ 3335 #line 90 4"grammar.y"3334 #line 903 "grammar.y" 3336 3335 { 3337 3336 int r; TESTSETINT((yyvsp[(4) - (8)].lv),r); … … 3374 3373 3375 3374 /* Line 1464 of yacc.c */ 3376 #line 9 40"grammar.y"3375 #line 939 "grammar.y" 3377 3376 { 3378 3377 if ((yyvsp[(1) - (2)].i) == MATRIX_CMD) … … 3405 3404 3406 3405 /* Line 1464 of yacc.c */ 3407 #line 96 6"grammar.y"3406 #line 965 "grammar.y" 3408 3407 { 3409 3408 int t=(yyvsp[(1) - (3)].lv).Typ(); … … 3431 3430 3432 3431 /* Line 1464 of yacc.c */ 3433 #line 98 7"grammar.y"3432 #line 986 "grammar.y" 3434 3433 { 3435 3434 if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot))) … … 3441 3440 3442 3441 /* Line 1464 of yacc.c */ 3443 #line 1000"grammar.y"3442 #line 999 "grammar.y" 3444 3443 { 3445 3444 leftv v = &(yyvsp[(2) - (5)].lv); … … 3457 3456 3458 3457 /* Line 1464 of yacc.c */ 3459 #line 101 4"grammar.y"3458 #line 1013 "grammar.y" 3460 3459 { 3461 3460 // let rInit take care of any errors … … 3467 3466 3468 3467 /* Line 1464 of yacc.c */ 3469 #line 102 2"grammar.y"3468 #line 1021 "grammar.y" 3470 3469 { 3471 3470 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 3481 3480 3482 3481 /* Line 1464 of yacc.c */ 3483 #line 103 1"grammar.y"3482 #line 1030 "grammar.y" 3484 3483 { 3485 3484 memset(&(yyval.lv),0,sizeof((yyval.lv))); … … 3528 3527 3529 3528 /* Line 1464 of yacc.c */ 3530 #line 107 7"grammar.y"3529 #line 1076 "grammar.y" 3531 3530 { 3532 3531 (yyval.lv) = (yyvsp[(1) - (3)].lv); … … 3539 3538 3540 3539 /* Line 1464 of yacc.c */ 3541 #line 108 7"grammar.y"3540 #line 1086 "grammar.y" 3542 3541 { 3543 3542 (yyval.lv) = (yyvsp[(2) - (3)].lv); … … 3548 3547 3549 3548 /* Line 1464 of yacc.c */ 3550 #line 109 3"grammar.y"3549 #line 1092 "grammar.y" 3551 3550 { 3552 3551 expected_parms = TRUE; … … 3557 3556 3558 3557 /* Line 1464 of yacc.c */ 3559 #line 1 100"grammar.y"3558 #line 1099 "grammar.y" 3560 3559 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3561 3560 break; … … 3564 3563 3565 3564 /* Line 1464 of yacc.c */ 3566 #line 110 2"grammar.y"3565 #line 1101 "grammar.y" 3567 3566 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3568 3567 break; … … 3571 3570 3572 3571 /* Line 1464 of yacc.c */ 3573 #line 110 4"grammar.y"3572 #line 1103 "grammar.y" 3574 3573 { (yyval.i) = (yyvsp[(1) - (1)].i); ;} 3575 3574 break; … … 3578 3577 3579 3578 /* Line 1464 of yacc.c */ 3580 #line 111 3"grammar.y"3579 #line 1112 "grammar.y" 3581 3580 { if ((yyvsp[(1) - (2)].i) != '<') YYERROR; 3582 3581 if((feFilePending=feFopen((yyvsp[(2) - (2)].name),"r",NULL,TRUE))==NULL) YYERROR; ;} … … 3586 3585 3587 3586 /* Line 1464 of yacc.c */ 3588 #line 111 6"grammar.y"3587 #line 1115 "grammar.y" 3589 3588 { newFile((yyvsp[(2) - (4)].name),feFilePending); ;} 3590 3589 break; … … 3593 3592 3594 3593 /* Line 1464 of yacc.c */ 3595 #line 112 1"grammar.y"3594 #line 1120 "grammar.y" 3596 3595 { 3597 3596 feHelp((yyvsp[(2) - (3)].name)); … … 3603 3602 3604 3603 /* Line 1464 of yacc.c */ 3605 #line 112 6"grammar.y"3604 #line 1125 "grammar.y" 3606 3605 { 3607 3606 feHelp(NULL); … … 3612 3611 3613 3612 /* Line 1464 of yacc.c */ 3614 #line 113 3"grammar.y"3613 #line 1132 "grammar.y" 3615 3614 { 3616 3615 singular_example((yyvsp[(2) - (3)].name)); … … 3622 3621 3623 3622 /* Line 1464 of yacc.c */ 3624 #line 114 1"grammar.y"3623 #line 1140 "grammar.y" 3625 3624 { 3626 3625 if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl) … … 3636 3635 3637 3636 /* Line 1464 of yacc.c */ 3638 #line 115 3"grammar.y"3637 #line 1152 "grammar.y" 3639 3638 { 3640 3639 leftv v=&(yyvsp[(2) - (2)].lv); … … 3657 3656 3658 3657 /* Line 1464 of yacc.c */ 3659 #line 116 9"grammar.y"3658 #line 1168 "grammar.y" 3660 3659 { 3661 3660 leftv v=&(yyvsp[(3) - (3)].lv); … … 3678 3677 3679 3678 /* Line 1464 of yacc.c */ 3680 #line 118 8"grammar.y"3679 #line 1187 "grammar.y" 3681 3680 { 3682 3681 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3687 3686 3688 3687 /* Line 1464 of yacc.c */ 3689 #line 119 2"grammar.y"3688 #line 1191 "grammar.y" 3690 3689 { 3691 3690 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3696 3695 3697 3696 /* Line 1464 of yacc.c */ 3698 #line 119 6"grammar.y"3697 #line 1195 "grammar.y" 3699 3698 { 3700 3699 if ((yyvsp[(3) - (4)].i)==QRING_CMD) (yyvsp[(3) - (4)].i)=RING_CMD; … … 3706 3705 3707 3706 /* Line 1464 of yacc.c */ 3708 #line 120 1"grammar.y"3707 #line 1200 "grammar.y" 3709 3708 { 3710 3709 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3715 3714 3716 3715 /* Line 1464 of yacc.c */ 3717 #line 120 5"grammar.y"3716 #line 1204 "grammar.y" 3718 3717 { 3719 3718 list_cmd(RING_CMD,NULL,"// ",TRUE); … … 3724 3723 3725 3724 /* Line 1464 of yacc.c */ 3726 #line 120 9"grammar.y"3725 #line 1208 "grammar.y" 3727 3726 { 3728 3727 list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE); … … 3733 3732 3734 3733 /* Line 1464 of yacc.c */ 3735 #line 121 3"grammar.y"3734 #line 1212 "grammar.y" 3736 3735 { 3737 3736 list_cmd(PROC_CMD,NULL,"// ",TRUE); … … 3742 3741 3743 3742 /* Line 1464 of yacc.c */ 3744 #line 121 7"grammar.y"3743 #line 1216 "grammar.y" 3745 3744 { 3746 3745 list_cmd(0,(yyvsp[(3) - (4)].lv).Fullname(),"// ",TRUE); … … 3752 3751 3753 3752 /* Line 1464 of yacc.c */ 3754 #line 122 2"grammar.y"3753 #line 1221 "grammar.y" 3755 3754 { 3756 3755 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3763 3762 3764 3763 /* Line 1464 of yacc.c */ 3765 #line 122 8"grammar.y"3764 #line 1227 "grammar.y" 3766 3765 { 3767 3766 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3774 3773 3775 3774 /* Line 1464 of yacc.c */ 3776 #line 123 4"grammar.y"3775 #line 1233 "grammar.y" 3777 3776 { 3778 3777 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3785 3784 3786 3785 /* Line 1464 of yacc.c */ 3787 #line 12 40"grammar.y"3786 #line 1239 "grammar.y" 3788 3787 { 3789 3788 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3796 3795 3797 3796 /* Line 1464 of yacc.c */ 3798 #line 124 6"grammar.y"3797 #line 1245 "grammar.y" 3799 3798 { 3800 3799 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3807 3806 3808 3807 /* Line 1464 of yacc.c */ 3809 #line 125 2"grammar.y"3808 #line 1251 "grammar.y" 3810 3809 { 3811 3810 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3818 3817 3819 3818 /* Line 1464 of yacc.c */ 3820 #line 125 8"grammar.y"3819 #line 1257 "grammar.y" 3821 3820 { 3822 3821 if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD) … … 3829 3828 3830 3829 /* Line 1464 of yacc.c */ 3831 #line 12 70"grammar.y"3830 #line 1269 "grammar.y" 3832 3831 { 3833 3832 list_cmd(-1,NULL,"// ",TRUE); … … 3838 3837 3839 3838 /* Line 1464 of yacc.c */ 3840 #line 127 6"grammar.y"3839 #line 1275 "grammar.y" 3841 3840 { yyInRingConstruction = TRUE; ;} 3842 3841 break; … … 3845 3844 3846 3845 /* Line 1464 of yacc.c */ 3847 #line 128 5"grammar.y"3846 #line 1284 "grammar.y" 3848 3847 { 3849 3848 const char *ring_name = (yyvsp[(2) - (8)].lv).name; … … 3883 3882 3884 3883 /* Line 1464 of yacc.c */ 3885 #line 131 8"grammar.y"3884 #line 1317 "grammar.y" 3886 3885 { 3887 3886 const char *ring_name = (yyvsp[(2) - (2)].lv).name; … … 3895 3894 3896 3895 /* Line 1464 of yacc.c */ 3897 #line 132 5"grammar.y"3896 #line 1324 "grammar.y" 3898 3897 { 3899 3898 yyInRingConstruction = FALSE; … … 3905 3904 3906 3905 /* Line 1464 of yacc.c */ 3907 #line 13 30"grammar.y"3906 #line 1329 "grammar.y" 3908 3907 { 3909 3908 #ifdef SINGULAR_4_1 … … 3924 3923 3925 3924 /* Line 1464 of yacc.c */ 3926 #line 134 7"grammar.y"3925 #line 1346 "grammar.y" 3927 3926 { 3928 3927 if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(jjLOAD((yyvsp[(2) - (2)].name),TRUE))) YYERROR; … … 3933 3932 3934 3933 /* Line 1464 of yacc.c */ 3935 #line 135 6"grammar.y"3934 #line 1355 "grammar.y" 3936 3935 { 3937 3936 if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0)) 3938 3937 MYYERROR("only inside a proc allowed"); 3939 3938 const char * n=(yyvsp[(2) - (2)].lv).Name(); 3940 if ((( (yyvsp[(2) - (2)].lv).Typ()==RING_CMD)||((yyvsp[(2) - (2)].lv).Typ()==QRING_CMD))3939 if (((yyvsp[(2) - (2)].lv).Typ()==RING_CMD) 3941 3940 && ((yyvsp[(2) - (2)].lv).rtyp==IDHDL)) 3942 3941 { … … 4003 4002 4004 4003 /* Line 1464 of yacc.c */ 4005 #line 142 4"grammar.y"4004 #line 1423 "grammar.y" 4006 4005 { 4007 4006 type_cmd(&((yyvsp[(2) - (2)].lv))); … … 4012 4011 4013 4012 /* Line 1464 of yacc.c */ 4014 #line 142 8"grammar.y"4013 #line 1427 "grammar.y" 4015 4014 { 4016 4015 //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp); … … 4040 4039 4041 4040 /* Line 1464 of yacc.c */ 4042 #line 145 7"grammar.y"4041 #line 1456 "grammar.y" 4043 4042 { 4044 4043 int i; TESTSETINT((yyvsp[(3) - (5)].lv),i); … … 4058 4057 4059 4058 /* Line 1464 of yacc.c */ 4060 #line 14 70"grammar.y"4059 #line 1469 "grammar.y" 4061 4060 { 4062 4061 if (currentVoice->ifsw==1) … … 4080 4079 4081 4080 /* Line 1464 of yacc.c */ 4082 #line 148 7"grammar.y"4081 #line 1486 "grammar.y" 4083 4082 { 4084 4083 int i; TESTSETINT((yyvsp[(3) - (5)].lv),i); … … 4094 4093 4095 4094 /* Line 1464 of yacc.c */ 4096 #line 149 6"grammar.y"4095 #line 1495 "grammar.y" 4097 4096 { 4098 4097 if (exitBuffer(BT_break)) YYERROR; … … 4104 4103 4105 4104 /* Line 1464 of yacc.c */ 4106 #line 150 1"grammar.y"4105 #line 1500 "grammar.y" 4107 4106 { 4108 4107 if (contBuffer(BT_break)) YYERROR; … … 4114 4113 4115 4114 /* Line 1464 of yacc.c */ 4116 #line 150 9"grammar.y"4115 #line 1508 "grammar.y" 4117 4116 { 4118 4117 /* -> if(!$2) break; $3; continue;*/ … … 4128 4127 4129 4128 /* Line 1464 of yacc.c */ 4130 #line 152 1"grammar.y"4129 #line 1520 "grammar.y" 4131 4130 { 4132 4131 /* $2 */ … … 4149 4148 4150 4149 /* Line 1464 of yacc.c */ 4151 #line 15 40"grammar.y"4150 #line 1539 "grammar.y" 4152 4151 { 4153 4152 idhdl h = enterid((yyvsp[(2) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE); … … 4164 4163 4165 4164 /* Line 1464 of yacc.c */ 4166 #line 15 50"grammar.y"4165 #line 1549 "grammar.y" 4167 4166 { 4168 4167 idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE); … … 4188 4187 4189 4188 /* Line 1464 of yacc.c */ 4190 #line 156 9"grammar.y"4189 #line 1568 "grammar.y" 4191 4190 { 4192 4191 omFree((ADDRESS)(yyvsp[(3) - (4)].name)); … … 4213 4212 4214 4213 /* Line 1464 of yacc.c */ 4215 #line 159 2"grammar.y"4214 #line 1591 "grammar.y" 4216 4215 { 4217 4216 // decl. of type proc p(int i) … … 4224 4223 4225 4224 /* Line 1464 of yacc.c */ 4226 #line 159 8"grammar.y"4225 #line 1597 "grammar.y" 4227 4226 { 4228 4227 // decl. of type proc p(i) … … 4238 4237 4239 4238 /* Line 1464 of yacc.c */ 4240 #line 16 10"grammar.y"4239 #line 1609 "grammar.y" 4241 4240 { 4242 4241 iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv)); … … 4249 4248 4250 4249 /* Line 1464 of yacc.c */ 4251 #line 161 6"grammar.y"4250 #line 1615 "grammar.y" 4252 4251 { 4253 4252 if ((yyvsp[(1) - (3)].i)==RETURN) … … 4263 4262 4264 4263 /* Line 1464 of yacc.c */ 4265 #line 426 4"grammar.cc"4264 #line 4263 "grammar.cc" 4266 4265 default: break; 4267 4266 } -
Singular/grammar.y
rc12c262 rd2fc5c5 62 62 { 63 63 if ((IDTYP(r)==PACKAGE_CMD) 64 || (IDTYP(r)==RING_CMD) 65 || (IDTYP(r)==QRING_CMD)) 64 || (IDTYP(r)==RING_CMD)) 66 65 { 67 66 h=IDPACKAGE(r)->idroot->get(nn,myynest); … … 1358 1357 MYYERROR("only inside a proc allowed"); 1359 1358 const char * n=$2.Name(); 1360 if (( ($2.Typ()==RING_CMD)||($2.Typ()==QRING_CMD))1359 if (($2.Typ()==RING_CMD) 1361 1360 && ($2.rtyp==IDHDL)) 1362 1361 { -
Singular/iparith.cc
rc12c262 rd2fc5c5 5178 5178 if (rIsPluralRing(r)) 5179 5179 { 5180 // ideal i;5181 // if (a->rtyp == QRING_CMD)5182 // {5183 // i = r->qideal;5184 // r->qideal = NULL;5185 // }5186 5180 ring s = rEnvelope(r); 5187 // if (a->rtyp == QRING_CMD)5188 // {5189 // ideal is = idOppose(r,i); /* twostd? */5190 // is = idAdd(is,i);5191 // s->qideal = i;5192 // }5193 5181 res->data = s; 5194 5182 } … … 5225 5213 case PROC_CMD: 5226 5214 case RING_CMD: 5227 case QRING_CMD:5215 //case QRING_CMD: 5228 5216 case INTMAT_CMD: 5229 5217 case BIGINTMAT_CMD: … … 6997 6985 if ((perm_var_l->Typ()!=INTVEC_CMD) 6998 6986 ||((perm_par_l!=NULL)&&(perm_par_l->Typ()!=INTVEC_CMD)) 6999 ||( (u->Typ()!=RING_CMD)&&(u->Typ()!=QRING_CMD)))6987 ||(u->Typ()!=RING_CMD)) 7000 6988 { 7001 6989 WerrorS("fetch(<ring>,<name>[,<intvec>[,<intvec>])"); … … 7529 7517 return TRUE; 7530 7518 } 7531 if ( (rt==RING_CMD)||(rt==QRING_CMD))7519 if (rt==RING_CMD) 7532 7520 { 7533 7521 L->m[i].rtyp=rt; L->m[i].data=h->Data(); -
Singular/ipassign.cc
rc12c262 rd2fc5c5 1100 1100 if (TEST_V_ALLWARN 1101 1101 && (rt!=RING_CMD) 1102 && (rt!=QRING_CMD)1103 1102 && (l->name!=NULL) 1104 1103 && (l->e==NULL) … … 1133 1132 if (l->rtyp==IDHDL) 1134 1133 { 1135 if ( (lt!=QRING_CMD)&&(lt!=RING_CMD))1134 if (lt!=RING_CMD) 1136 1135 ld=(leftv)l->data; 1137 1136 } … … 1409 1408 goto err; 1410 1409 } 1411 //if ( (rt==RING_CMD)||(rt==QRING_CMD))1410 //if (rt==RING_CMD) 1412 1411 //{ 1413 1412 // L->m[i].rtyp=rt; … … 1971 1970 { 1972 1971 // first element in the list sl (r) must be a ring 1973 if (( (rt == RING_CMD)||(rt == QRING_CMD))&&(r->e==NULL))1972 if ((rt == RING_CMD)&&(r->e==NULL)) 1974 1973 { 1975 1974 omFree((ADDRESS)IDMAP((idhdl)l->data)->preimage); -
Singular/ipid.cc
rc12c262 rd2fc5c5 373 373 { 374 374 int t=IDTYP(h); 375 if (((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))375 if (((BEGIN_RING<t) && (t<END_RING)) 376 376 || ((t==LIST_CMD) && (lRingDependend((lists)IDDATA(h))))) 377 377 killhdl2(h,&currRing->idroot,currRing); … … 450 450 iiCheckPack(currPack); 451 451 } 452 else if ( (IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))452 else if (IDTYP(h)==RING_CMD) 453 453 rKill(h); 454 454 else if (IDDATA(h)!=NULL) … … 606 606 if ((currRing!=NULL)&&(tomove!=NULL)) 607 607 { 608 if ( ((QRING_CMD!=IDTYP(tomove)) && RingDependend(IDTYP(tomove)))608 if (RingDependend(IDTYP(tomove)) 609 609 || ((IDTYP(tomove)==LIST_CMD) && (lRingDependend(IDLIST(tomove))))) 610 610 { -
Singular/ipprint.cc
rc12c262 rd2fc5c5 5 5 * ABSTRACT: interpreter: printing 6 6 */ 7 8 9 10 7 11 8 #include <kernel/mod2.h> … … 296 293 297 294 case RING_CMD: 298 case QRING_CMD:299 295 bo=ipPrint_RING(u); 300 296 break; -
Singular/ipshell.cc
rc12c262 rd2fc5c5 215 215 case LIST_CMD: Print(", size: %d",IDLIST(h)->nr+1); 216 216 break; 217 case QRING_CMD:218 217 case RING_CMD: 219 218 if ((IDRING(h)==currRing) && (currRingHdl!=h)) … … 267 266 case PROC_CMD: 268 267 case RING_CMD: 269 case IDEAL_CMD: 270 case QRING_CMD: PrintLn(); break; 268 case IDEAL_CMD: PrintLn(); break; 271 269 272 270 //case INT_CMD: … … 339 337 h=IDNEXT(h); 340 338 } 341 else if ((IDTYP(h)==RING_CMD) 342 ||(IDTYP(h)==QRING_CMD)) 339 else if (IDTYP(h)==RING_CMD) 343 340 { 344 341 if ((IDRING(h)!=NULL) && (IDRING(h)->idroot!=NULL)) … … 366 363 leftv h=&(L->m[n]); 367 364 void *d=h->data; 368 if (( (h->rtyp==RING_CMD) || (h->rtyp==QRING_CMD))365 if ((h->rtyp==RING_CMD) 369 366 && (((ring)d)->idroot!=NULL)) 370 367 { … … 390 387 { 391 388 int t=iiRETURNEXPR.Typ(); 392 if ((/*iiRETURNEXPR.Typ()*/ t==RING_CMD) 393 || (/*iiRETURNEXPR.Typ()*/ t==QRING_CMD)) 389 if (/*iiRETURNEXPR.Typ()*/ t==RING_CMD) 394 390 { 395 391 leftv h=&iiRETURNEXPR; … … 441 437 if (IDTYP(h)==ALIAS_CMD) PrintS("A"); 442 438 if ((IDTYP(h)==RING_CMD) 443 || (IDTYP(h)==QRING_CMD)444 439 //|| (IDTYP(h)==PACKE_CMD) 445 440 ) … … 488 483 #ifdef SINGULAR_4_1 489 484 || ((IDTYP(h)==CRING_CMD) && (typ==RING_CMD)) 490 #else491 || ((IDTYP(h)==QRING_CMD) && (typ==RING_CMD))492 485 #endif 493 486 ) 494 487 { 495 488 list1(prefix,h,start==currRingHdl, fullname); 496 if (( (IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))489 if ((IDTYP(h)==RING_CMD) 497 490 && (really_all || (all && (h==currRingHdl))) 498 491 && ((IDLEV(h)==0)||(IDLEV(h)==myynest))) … … 623 616 r=IDROOT->get(theMap->preimage,myynest); 624 617 if ((currPack!=basePack) 625 &&((r==NULL) || ((r->typ != RING_CMD) && (r->typ != QRING_CMD))))618 &&((r==NULL) || ((r->typ != RING_CMD) ))) 626 619 r=basePack->idroot->get(theMap->preimage,myynest); 627 620 if ((r==NULL) && (currRingHdl!=NULL) … … 630 623 r=currRingHdl; 631 624 } 632 if ((r!=NULL) && ( (r->typ == RING_CMD) || (r->typ== QRING_CMD)))625 if ((r!=NULL) && (r->typ == RING_CMD)) 633 626 { 634 627 ring src_ring=IDRING(r); … … 1314 1307 if (IDTYP(h)==v->Typ()) 1315 1308 { 1316 if (( (IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))1309 if ((IDTYP(h)==RING_CMD) 1317 1310 && (v->Data()==IDDATA(h))) 1318 1311 { … … 5776 5769 cf = nInitChar(n_transExt, &extParam); 5777 5770 } 5778 else if ((pn->Typ()==QRING_CMD) && (P == 1)) // same for qrings - which should be fields!?5779 {5780 AlgExtInfo extParam;5781 extParam.r = (ring)pn->Data();5782 5783 cf = nInitChar(n_algExt, &extParam); // Q[a]/<minideal>5784 }5771 //else if ((pn->Typ()==QRING_CMD) && (P == 1)) // same for qrings - which should be fields!? 5772 //{ 5773 // AlgExtInfo extParam; 5774 // extParam.r = (ring)pn->Data(); 5775 5776 // cf = nInitChar(n_algExt, &extParam); // Q[a]/<minideal> 5777 //} 5785 5778 else 5786 5779 { … … 6131 6124 while (h!=NULL) 6132 6125 { 6133 if (( (IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))6126 if ((IDTYP(h)==RING_CMD) 6134 6127 && (h!=n) 6135 6128 && (IDRING(h)==r) … … 6409 6402 BOOLEAN iiAssignCR(leftv r, leftv arg) 6410 6403 { 6404 char* ring_name=omStrDup((char*)r->Name()); 6411 6405 int t=arg->Typ(); 6412 char* ring_name=omStrDup((char*)r->Name()); 6413 if ((t==RING_CMD) ||(t==QRING_CMD)) 6406 if (t==RING_CMD) 6414 6407 { 6415 6408 sleftv tmp; -
Singular/links/asciiLink.cc
rc12c262 rd2fc5c5 248 248 // need to set the ring before writing it, otherwise we get in 249 249 // trouble with minpoly 250 if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)250 if (IDTYP(h) == RING_CMD) 251 251 rSetHdl(h); 252 252 253 253 if (DumpAsciiIdhdl(fd, h,list_of_libs)) return TRUE; 254 254 255 if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)255 if (IDTYP(h) == RING_CMD) 256 256 return DumpAscii(fd, IDRING(h)->idroot,list_of_libs); 257 257 else … … 264 264 if (DumpAsciiMaps(fd, IDNEXT(h), rhdl)) return TRUE; 265 265 266 if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)266 if (IDTYP(h) == RING_CMD) 267 267 return DumpAsciiMaps(fd, IDRING(h)->idroot, h); 268 268 else if (IDTYP(h) == MAP_CMD) … … 524 524 omFree(rhs); 525 525 526 if ((type_id == RING_CMD || type_id == QRING_CMD) &&526 if ((type_id == RING_CMD) && 527 527 IDRING(h)->cf->type==n_algExt) 528 528 { -
Singular/links/ssiLink.cc
rc12c262 rd2fc5c5 1448 1448 ssiWriteNumber(d,(number)dd); 1449 1449 break; 1450 case QRING_CMD:1451 1450 case RING_CMD:fputs("5 ",d->f_write); 1452 1451 ssiWriteRing(d,(ring)dd); … … 2022 2021 } 2023 2022 2024 // handle qrings separately2025 //if (type_id == QRING_CMD)2026 // return DumpSsiQringQring(l, h);2027 2028 2023 // put type and name 2029 2024 //Print("generic dump:%s,%s\n",IDID(h),Tok2Cmdname(IDTYP(h))); … … 2046 2041 // need to set the ring before writing it, otherwise we get in 2047 2042 // trouble with minpoly 2048 if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)2043 if (IDTYP(h) == RING_CMD) 2049 2044 rSetHdl(h); 2050 2045 … … 2053 2048 // do not dump ssi internal rings: ssiRing* 2054 2049 // but dump objects of all other rings 2055 if ((IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)2050 if ((IDTYP(h) == RING_CMD) 2056 2051 && (strncmp(IDID(h),"ssiRing",7)!=0)) 2057 2052 return ssiDumpIter(l, IDRING(h)->idroot); -
Singular/lists.cc
rc12c262 rd2fc5c5 203 203 while (i<=L->nr) 204 204 { 205 if ((L->m[i].rtyp!=QRING_CMD) 206 && (BEGIN_RING<L->m[i].rtyp) 205 if ((BEGIN_RING<L->m[i].rtyp) 207 206 && (L->m[i].rtyp<END_RING)) 208 207 return TRUE; -
Singular/misc_ip.cc
rc12c262 rd2fc5c5 970 970 Print("::%s, typ %s level %d data %lx", 971 971 IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh),(long)IDDATA(hh)); 972 if ((IDTYP(hh)==RING_CMD) 973 || (IDTYP(hh)==QRING_CMD)) 972 if (IDTYP(hh)==RING_CMD) 974 973 Print(" ref: %d\n",IDRING(hh)->ref); 975 974 else … … 986 985 else 987 986 if ((IDTYP(hh)==RING_CMD) 988 || (IDTYP(hh)==QRING_CMD)989 987 || (IDTYP(hh)==PACKAGE_CMD)) 990 988 { … … 996 994 { 997 995 if ((IDDATA(h2)==(void *)currRing) 998 && ( (IDTYP(h2)==RING_CMD)||(IDTYP(h2)==QRING_CMD)))996 && (IDTYP(h2)==RING_CMD)) 999 997 PrintS("(R)"); 1000 998 else if (IDDATA(h2)==(void *)currPack) PrintS("(P)"); -
Singular/subexpr.cc
rc12c262 rd2fc5c5 134 134 break; 135 135 case RING_CMD: 136 case QRING_CMD:137 136 { 138 137 PrintNSpaces(spaces); … … 393 392 { 394 393 int rt=Typ(); 395 if(::RingDependend(rt) && (rt!=QRING_CMD))394 if(::RingDependend(rt)) 396 395 return TRUE; 397 396 if (rt==LIST_CMD) … … 449 448 return (void *)slCopy((si_link) d); 450 449 case RING_CMD: 451 case QRING_CMD:452 450 { 453 451 ring r=(ring)d; … … 567 565 } 568 566 case RING_CMD: 569 case QRING_CMD:570 567 { 571 568 ring R=(ring)d; … … 905 902 906 903 case RING_CMD: 907 case QRING_CMD:908 904 s = rString((ring)d); 909 905
Note: See TracChangeset
for help on using the changeset viewer.