@@ -160,9 +160,9 @@ extern int sphere_yydebug;
160
160
CLOSEPOINT = 266 ,
161
161
OPENARR = 267 ,
162
162
CLOSEARR = 268 ,
163
- SIGN = 269 ,
164
- INT = 270 ,
165
- FLOAT = 271 ,
163
+ TOK_SIGN = 269 ,
164
+ TOK_INT = 270 ,
165
+ TOK_FLOAT = 271 ,
166
166
EULERAXIS = 272
167
167
};
168
168
#endif
@@ -178,9 +178,9 @@ extern int sphere_yydebug;
178
178
#define CLOSEPOINT 266
179
179
#define OPENARR 267
180
180
#define CLOSEARR 268
181
- #define SIGN 269
182
- #define INT 270
183
- #define FLOAT 271
181
+ #define TOK_SIGN 269
182
+ #define TOK_INT 270
183
+ #define TOK_FLOAT 271
184
184
#define EULERAXIS 272
185
185
186
186
/* Value type. */
@@ -515,10 +515,11 @@ static const char *const yytname[] =
515
515
{
516
516
"$end" , "error" , "$undefined" , "HOUR" , "DEG" , "MIN" , "SEC" , "COMMA" ,
517
517
"OPENCIRC" , "CLOSECIRC" , "OPENPOINT" , "CLOSEPOINT" , "OPENARR" ,
518
- "CLOSEARR" , "SIGN" , "INT" , "FLOAT" , "EULERAXIS" , "$accept" , "commands" ,
519
- "command" , "number" , "angle_lat_us" , "angle_long_us" , "angle_long" ,
520
- "angle_lat" , "spherepoint" , "spherecircle" , "eulertrans" , "sphereline" ,
521
- "spherepointlist" , "spherepath" , "sphereellipse" , "spherebox" , YY_NULLPTR
518
+ "CLOSEARR" , "TOK_SIGN" , "TOK_INT" , "TOK_FLOAT" , "EULERAXIS" , "$accept" ,
519
+ "commands" , "command" , "number" , "angle_lat_us" , "angle_long_us" ,
520
+ "angle_long" , "angle_lat" , "spherepoint" , "spherecircle" , "eulertrans" ,
521
+ "sphereline" , "spherepointlist" , "spherepath" , "sphereellipse" ,
522
+ "spherebox" , YY_NULLPTR
522
523
};
523
524
#endif
524
525
@@ -1351,263 +1352,263 @@ yyparse (void)
1351
1352
case 4 :
1352
1353
#line 70 "src/sparse.y"
1353
1354
{ set_spheretype ( STYPE_POINT ); }
1354
- #line 1355 "src/sparse.c"
1355
+ #line 1356 "src/sparse.c"
1355
1356
break ;
1356
1357
1357
1358
case 5 :
1358
1359
#line 71 "src/sparse.y"
1359
1360
{ set_spheretype ( STYPE_CIRCLE ); }
1360
- #line 1361 "src/sparse.c"
1361
+ #line 1362 "src/sparse.c"
1361
1362
break ;
1362
1363
1363
1364
case 6 :
1364
1365
#line 72 "src/sparse.y"
1365
1366
{ set_spheretype ( STYPE_LINE ); }
1366
- #line 1367 "src/sparse.c"
1367
+ #line 1368 "src/sparse.c"
1367
1368
break ;
1368
1369
1369
1370
case 7 :
1370
1371
#line 73 "src/sparse.y"
1371
1372
{ set_spheretype ( STYPE_EULER ); }
1372
- #line 1373 "src/sparse.c"
1373
+ #line 1374 "src/sparse.c"
1373
1374
break ;
1374
1375
1375
1376
case 8 :
1376
1377
#line 74 "src/sparse.y"
1377
1378
{ set_spheretype ( STYPE_PATH ); }
1378
- #line 1379 "src/sparse.c"
1379
+ #line 1380 "src/sparse.c"
1379
1380
break ;
1380
1381
1381
1382
case 9 :
1382
1383
#line 75 "src/sparse.y"
1383
1384
{ set_spheretype ( STYPE_ELLIPSE ); }
1384
- #line 1385 "src/sparse.c"
1385
+ #line 1386 "src/sparse.c"
1385
1386
break ;
1386
1387
1387
1388
case 10 :
1388
1389
#line 76 "src/sparse.y"
1389
1390
{ set_spheretype ( STYPE_BOX ); }
1390
- #line 1391 "src/sparse.c"
1391
+ #line 1392 "src/sparse.c"
1391
1392
break ;
1392
1393
1393
1394
case 11 :
1394
1395
#line 81 "src/sparse.y"
1395
1396
{ (yyval .d ) = (yyvsp [0 ].d ); }
1396
- #line 1397 "src/sparse.c"
1397
+ #line 1398 "src/sparse.c"
1397
1398
break ;
1398
1399
1399
1400
case 12 :
1400
1401
#line 82 "src/sparse.y"
1401
1402
{ (yyval .d ) = (yyvsp [0 ].i ); }
1402
- #line 1403 "src/sparse.c"
1403
+ #line 1404 "src/sparse.c"
1403
1404
break ;
1404
1405
1405
1406
case 13 :
1406
1407
#line 87 "src/sparse.y"
1407
1408
{ (yyval .i ) = set_angle (0 , (yyvsp [0 ].d ) ); }
1408
- #line 1409 "src/sparse.c"
1409
+ #line 1410 "src/sparse.c"
1409
1410
break ;
1410
1411
1411
1412
case 14 :
1412
1413
#line 88 "src/sparse.y"
1413
1414
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-1 ].d ), 0 , 0 ) ); }
1414
- #line 1415 "src/sparse.c"
1415
+ #line 1416 "src/sparse.c"
1415
1416
break ;
1416
1417
1417
1418
case 15 :
1418
1419
#line 89 "src/sparse.y"
1419
1420
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-1 ].i ), 0 , 0 ) ); }
1420
- #line 1421 "src/sparse.c"
1421
+ #line 1422 "src/sparse.c"
1421
1422
break ;
1422
1423
1423
1424
case 16 :
1424
1425
#line 90 "src/sparse.y"
1425
1426
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-2 ].i ), (yyvsp [0 ].d ), 0 ) ); }
1426
- #line 1427 "src/sparse.c"
1427
+ #line 1428 "src/sparse.c"
1427
1428
break ;
1428
1429
1429
1430
case 17 :
1430
1431
#line 91 "src/sparse.y"
1431
1432
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-3 ].i ), (yyvsp [-1 ].d ), 0 ) ); }
1432
- #line 1433 "src/sparse.c"
1433
+ #line 1434 "src/sparse.c"
1433
1434
break ;
1434
1435
1435
1436
case 18 :
1436
1437
#line 92 "src/sparse.y"
1437
1438
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-3 ].i ), (yyvsp [-1 ].i ), 0 ) ); }
1438
- #line 1439 "src/sparse.c"
1439
+ #line 1440 "src/sparse.c"
1439
1440
break ;
1440
1441
1441
1442
case 19 :
1442
1443
#line 93 "src/sparse.y"
1443
1444
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-4 ].i ), (yyvsp [-2 ].i ), (yyvsp [0 ].d )) ); }
1444
- #line 1445 "src/sparse.c"
1445
+ #line 1446 "src/sparse.c"
1445
1446
break ;
1446
1447
1447
1448
case 20 :
1448
1449
#line 94 "src/sparse.y"
1449
1450
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-5 ].i ), (yyvsp [-3 ].i ), (yyvsp [-1 ].d )) ); }
1450
- #line 1451 "src/sparse.c"
1451
+ #line 1452 "src/sparse.c"
1451
1452
break ;
1452
1453
1453
1454
case 21 :
1454
1455
#line 99 "src/sparse.y"
1455
1456
{ (yyval .i ) = set_angle (0 , (yyvsp [0 ].d )); }
1456
- #line 1457 "src/sparse.c"
1457
+ #line 1458 "src/sparse.c"
1457
1458
break ;
1458
1459
1459
1460
case 22 :
1460
1461
#line 100 "src/sparse.y"
1461
1462
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-1 ].d ), 0 , 0 )); }
1462
- #line 1463 "src/sparse.c"
1463
+ #line 1464 "src/sparse.c"
1463
1464
break ;
1464
1465
1465
1466
case 23 :
1466
1467
#line 101 "src/sparse.y"
1467
1468
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-1 ].i ), 0 , 0 )); }
1468
- #line 1469 "src/sparse.c"
1469
+ #line 1470 "src/sparse.c"
1469
1470
break ;
1470
1471
1471
1472
case 24 :
1472
1473
#line 102 "src/sparse.y"
1473
1474
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-2 ].i ), (yyvsp [0 ].d ), 0 )); }
1474
- #line 1475 "src/sparse.c"
1475
+ #line 1476 "src/sparse.c"
1475
1476
break ;
1476
1477
1477
1478
case 25 :
1478
1479
#line 103 "src/sparse.y"
1479
1480
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-3 ].i ), (yyvsp [-1 ].d ), 0 )); }
1480
- #line 1481 "src/sparse.c"
1481
+ #line 1482 "src/sparse.c"
1481
1482
break ;
1482
1483
1483
1484
case 26 :
1484
1485
#line 104 "src/sparse.y"
1485
1486
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-3 ].i ), (yyvsp [-1 ].i ), 0 )); }
1486
- #line 1487 "src/sparse.c"
1487
+ #line 1488 "src/sparse.c"
1487
1488
break ;
1488
1489
1489
1490
case 27 :
1490
1491
#line 105 "src/sparse.y"
1491
1492
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-4 ].i ), (yyvsp [-2 ].i ), (yyvsp [0 ].d ))); }
1492
- #line 1493 "src/sparse.c"
1493
+ #line 1494 "src/sparse.c"
1493
1494
break ;
1494
1495
1495
1496
case 28 :
1496
1497
#line 106 "src/sparse.y"
1497
1498
{ (yyval .i ) = set_angle (1 , human2dec ((yyvsp [-5 ].i ), (yyvsp [-3 ].i ), (yyvsp [-1 ].d ))); }
1498
- #line 1499 "src/sparse.c"
1499
+ #line 1500 "src/sparse.c"
1499
1500
break ;
1500
1501
1501
1502
case 29 :
1502
1503
#line 107 "src/sparse.y"
1503
1504
{ (yyval .i ) = set_angle (1 , 15 * human2dec ((yyvsp [-2 ].i ), (yyvsp [0 ].d ), 0 )); }
1504
- #line 1505 "src/sparse.c"
1505
+ #line 1506 "src/sparse.c"
1505
1506
break ;
1506
1507
1507
1508
case 30 :
1508
1509
#line 108 "src/sparse.y"
1509
1510
{ (yyval .i ) = set_angle (1 , 15 * human2dec ((yyvsp [-4 ].i ), (yyvsp [-2 ].i ), (yyvsp [0 ].d ))); }
1510
- #line 1511 "src/sparse.c"
1511
+ #line 1512 "src/sparse.c"
1511
1512
break ;
1512
1513
1513
1514
case 31 :
1514
1515
#line 109 "src/sparse.y"
1515
1516
{ (yyval .i ) = set_angle (1 , 15 * human2dec ((yyvsp [-5 ].i ), (yyvsp [-3 ].i ), (yyvsp [-1 ].d ))); }
1516
- #line 1517 "src/sparse.c"
1517
+ #line 1518 "src/sparse.c"
1517
1518
break ;
1518
1519
1519
1520
case 32 :
1520
1521
#line 114 "src/sparse.y"
1521
1522
{ (yyval .i ) = set_angle_sign ((yyvsp [0 ].i ), 1 ); }
1522
- #line 1523 "src/sparse.c"
1523
+ #line 1524 "src/sparse.c"
1523
1524
break ;
1524
1525
1525
1526
case 33 :
1526
1527
#line 115 "src/sparse.y"
1527
1528
{ (yyval .i ) = set_angle_sign ((yyvsp [0 ].i ), (yyvsp [-1 ].i )); }
1528
- #line 1529 "src/sparse.c"
1529
+ #line 1530 "src/sparse.c"
1529
1530
break ;
1530
1531
1531
1532
case 34 :
1532
1533
#line 120 "src/sparse.y"
1533
1534
{ (yyval .i ) = set_angle_sign ((yyvsp [0 ].i ), 1 ); }
1534
- #line 1535 "src/sparse.c"
1535
+ #line 1536 "src/sparse.c"
1535
1536
break ;
1536
1537
1537
1538
case 35 :
1538
1539
#line 121 "src/sparse.y"
1539
1540
{ (yyval .i ) = set_angle_sign ((yyvsp [0 ].i ), (yyvsp [-1 ].i )); }
1540
- #line 1541 "src/sparse.c"
1541
+ #line 1542 "src/sparse.c"
1541
1542
break ;
1542
1543
1543
1544
case 36 :
1544
1545
#line 128 "src/sparse.y"
1545
1546
{
1546
1547
(yyval .i ) = set_point ((yyvsp [-3 ].i ), (yyvsp [-1 ].i ));
1547
1548
}
1548
- #line 1549 "src/sparse.c"
1549
+ #line 1550 "src/sparse.c"
1549
1550
break ;
1550
1551
1551
1552
case 37 :
1552
1553
#line 136 "src/sparse.y"
1553
1554
{
1554
1555
set_circle ((yyvsp [-3 ].i ), (yyvsp [-1 ].i ));
1555
1556
}
1556
- #line 1557 "src/sparse.c"
1557
+ #line 1558 "src/sparse.c"
1557
1558
break ;
1558
1559
1559
1560
case 38 :
1560
1561
#line 144 "src/sparse.y"
1561
1562
{
1562
1563
set_euler ((yyvsp [-4 ].i ), (yyvsp [-2 ].i ), (yyvsp [0 ].i ), "ZXZ" );
1563
1564
}
1564
- #line 1565 "src/sparse.c"
1565
+ #line 1566 "src/sparse.c"
1565
1566
break ;
1566
1567
1567
1568
case 39 :
1568
1569
#line 148 "src/sparse.y"
1569
1570
{
1570
1571
set_euler ((yyvsp [-6 ].i ), (yyvsp [-4 ].i ), (yyvsp [-2 ].i ), (yyvsp [0 ].c ));
1571
1572
}
1572
- #line 1573 "src/sparse.c"
1573
+ #line 1574 "src/sparse.c"
1573
1574
break ;
1574
1575
1575
1576
case 40 :
1576
1577
#line 156 "src/sparse.y"
1577
1578
{
1578
1579
set_line ((yyvsp [0 ].i ));
1579
1580
}
1580
- #line 1581 "src/sparse.c"
1581
+ #line 1582 "src/sparse.c"
1581
1582
break ;
1582
1583
1583
1584
case 43 :
1584
1585
#line 168 "src/sparse.y"
1585
1586
{ }
1586
- #line 1587 "src/sparse.c"
1587
+ #line 1588 "src/sparse.c"
1587
1588
break ;
1588
1589
1589
1590
case 44 :
1590
1591
#line 174 "src/sparse.y"
1591
1592
{
1592
1593
set_ellipse ((yyvsp [-8 ].i ), (yyvsp [-6 ].i ), (yyvsp [-3 ].i ), (yyvsp [-1 ].i ));
1593
1594
}
1594
- #line 1595 "src/sparse.c"
1595
+ #line 1596 "src/sparse.c"
1595
1596
break ;
1596
1597
1597
1598
case 45 :
1598
1599
#line 181 "src/sparse.y"
1599
1600
{ }
1600
- #line 1601 "src/sparse.c"
1601
+ #line 1602 "src/sparse.c"
1601
1602
break ;
1602
1603
1603
1604
case 46 :
1604
1605
#line 182 "src/sparse.y"
1605
1606
{ }
1606
- #line 1607 "src/sparse.c"
1607
+ #line 1608 "src/sparse.c"
1607
1608
break ;
1608
1609
1609
1610
1610
- #line 1611 "src/sparse.c"
1611
+ #line 1612 "src/sparse.c"
1611
1612
1612
1613
default : break ;
1613
1614
}
0 commit comments