Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ac1d4ff

Browse files
committed
Fix build under mingw64
Add TOK_ prefix to INT, FLOAT, SIGN token names to distinguist these names from macro directives under mingw64.
1 parent 59ae179 commit ac1d4ff

File tree

5 files changed

+89
-88
lines changed

5 files changed

+89
-88
lines changed

‎src/sparse.c‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ extern int sphere_yydebug;
160160
CLOSEPOINT = 266,
161161
OPENARR = 267,
162162
CLOSEARR = 268,
163-
SIGN = 269,
164-
INT = 270,
165-
FLOAT = 271,
163+
TOK_SIGN = 269,
164+
TOK_INT = 270,
165+
TOK_FLOAT = 271,
166166
EULERAXIS = 272
167167
};
168168
#endif
@@ -178,9 +178,9 @@ extern int sphere_yydebug;
178178
#define CLOSEPOINT 266
179179
#define OPENARR 267
180180
#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
184184
#define EULERAXIS 272
185185

186186
/* Value type. */
@@ -515,10 +515,11 @@ static const char *const yytname[] =
515515
{
516516
"$end", "error", "$undefined", "HOUR", "DEG", "MIN", "SEC", "COMMA",
517517
"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
522523
};
523524
#endif
524525

@@ -1351,263 +1352,263 @@ yyparse (void)
13511352
case 4:
13521353
#line 70 "src/sparse.y"
13531354
{ set_spheretype( STYPE_POINT ); }
1354-
#line 1355 "src/sparse.c"
1355+
#line 1356 "src/sparse.c"
13551356
break;
13561357

13571358
case 5:
13581359
#line 71 "src/sparse.y"
13591360
{ set_spheretype( STYPE_CIRCLE ); }
1360-
#line 1361 "src/sparse.c"
1361+
#line 1362 "src/sparse.c"
13611362
break;
13621363

13631364
case 6:
13641365
#line 72 "src/sparse.y"
13651366
{ set_spheretype( STYPE_LINE ); }
1366-
#line 1367 "src/sparse.c"
1367+
#line 1368 "src/sparse.c"
13671368
break;
13681369

13691370
case 7:
13701371
#line 73 "src/sparse.y"
13711372
{ set_spheretype( STYPE_EULER ); }
1372-
#line 1373 "src/sparse.c"
1373+
#line 1374 "src/sparse.c"
13731374
break;
13741375

13751376
case 8:
13761377
#line 74 "src/sparse.y"
13771378
{ set_spheretype( STYPE_PATH ); }
1378-
#line 1379 "src/sparse.c"
1379+
#line 1380 "src/sparse.c"
13791380
break;
13801381

13811382
case 9:
13821383
#line 75 "src/sparse.y"
13831384
{ set_spheretype( STYPE_ELLIPSE ); }
1384-
#line 1385 "src/sparse.c"
1385+
#line 1386 "src/sparse.c"
13851386
break;
13861387

13871388
case 10:
13881389
#line 76 "src/sparse.y"
13891390
{ set_spheretype( STYPE_BOX ); }
1390-
#line 1391 "src/sparse.c"
1391+
#line 1392 "src/sparse.c"
13911392
break;
13921393

13931394
case 11:
13941395
#line 81 "src/sparse.y"
13951396
{ (yyval.d) = (yyvsp[0].d); }
1396-
#line 1397 "src/sparse.c"
1397+
#line 1398 "src/sparse.c"
13971398
break;
13981399

13991400
case 12:
14001401
#line 82 "src/sparse.y"
14011402
{ (yyval.d) = (yyvsp[0].i); }
1402-
#line 1403 "src/sparse.c"
1403+
#line 1404 "src/sparse.c"
14031404
break;
14041405

14051406
case 13:
14061407
#line 87 "src/sparse.y"
14071408
{ (yyval.i) = set_angle(0, (yyvsp[0].d) ); }
1408-
#line 1409 "src/sparse.c"
1409+
#line 1410 "src/sparse.c"
14091410
break;
14101411

14111412
case 14:
14121413
#line 88 "src/sparse.y"
14131414
{ (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0) ); }
1414-
#line 1415 "src/sparse.c"
1415+
#line 1416 "src/sparse.c"
14151416
break;
14161417

14171418
case 15:
14181419
#line 89 "src/sparse.y"
14191420
{ (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0) ); }
1420-
#line 1421 "src/sparse.c"
1421+
#line 1422 "src/sparse.c"
14211422
break;
14221423

14231424
case 16:
14241425
#line 90 "src/sparse.y"
14251426
{ (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"
14271428
break;
14281429

14291430
case 17:
14301431
#line 91 "src/sparse.y"
14311432
{ (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"
14331434
break;
14341435

14351436
case 18:
14361437
#line 92 "src/sparse.y"
14371438
{ (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"
14391440
break;
14401441

14411442
case 19:
14421443
#line 93 "src/sparse.y"
14431444
{ (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"
14451446
break;
14461447

14471448
case 20:
14481449
#line 94 "src/sparse.y"
14491450
{ (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"
14511452
break;
14521453

14531454
case 21:
14541455
#line 99 "src/sparse.y"
14551456
{ (yyval.i) = set_angle(0, (yyvsp[0].d)); }
1456-
#line 1457 "src/sparse.c"
1457+
#line 1458 "src/sparse.c"
14571458
break;
14581459

14591460
case 22:
14601461
#line 100 "src/sparse.y"
14611462
{ (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0)); }
1462-
#line 1463 "src/sparse.c"
1463+
#line 1464 "src/sparse.c"
14631464
break;
14641465

14651466
case 23:
14661467
#line 101 "src/sparse.y"
14671468
{ (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0)); }
1468-
#line 1469 "src/sparse.c"
1469+
#line 1470 "src/sparse.c"
14691470
break;
14701471

14711472
case 24:
14721473
#line 102 "src/sparse.y"
14731474
{ (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"
14751476
break;
14761477

14771478
case 25:
14781479
#line 103 "src/sparse.y"
14791480
{ (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"
14811482
break;
14821483

14831484
case 26:
14841485
#line 104 "src/sparse.y"
14851486
{ (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"
14871488
break;
14881489

14891490
case 27:
14901491
#line 105 "src/sparse.y"
14911492
{ (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"
14931494
break;
14941495

14951496
case 28:
14961497
#line 106 "src/sparse.y"
14971498
{ (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"
14991500
break;
15001501

15011502
case 29:
15021503
#line 107 "src/sparse.y"
15031504
{ (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"
15051506
break;
15061507

15071508
case 30:
15081509
#line 108 "src/sparse.y"
15091510
{ (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"
15111512
break;
15121513

15131514
case 31:
15141515
#line 109 "src/sparse.y"
15151516
{ (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"
15171518
break;
15181519

15191520
case 32:
15201521
#line 114 "src/sparse.y"
15211522
{ (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
1522-
#line 1523 "src/sparse.c"
1523+
#line 1524 "src/sparse.c"
15231524
break;
15241525

15251526
case 33:
15261527
#line 115 "src/sparse.y"
15271528
{ (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
1528-
#line 1529 "src/sparse.c"
1529+
#line 1530 "src/sparse.c"
15291530
break;
15301531

15311532
case 34:
15321533
#line 120 "src/sparse.y"
15331534
{ (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
1534-
#line 1535 "src/sparse.c"
1535+
#line 1536 "src/sparse.c"
15351536
break;
15361537

15371538
case 35:
15381539
#line 121 "src/sparse.y"
15391540
{ (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
1540-
#line 1541 "src/sparse.c"
1541+
#line 1542 "src/sparse.c"
15411542
break;
15421543

15431544
case 36:
15441545
#line 128 "src/sparse.y"
15451546
{
15461547
(yyval.i) = set_point((yyvsp[-3].i), (yyvsp[-1].i));
15471548
}
1548-
#line 1549 "src/sparse.c"
1549+
#line 1550 "src/sparse.c"
15491550
break;
15501551

15511552
case 37:
15521553
#line 136 "src/sparse.y"
15531554
{
15541555
set_circle((yyvsp[-3].i), (yyvsp[-1].i));
15551556
}
1556-
#line 1557 "src/sparse.c"
1557+
#line 1558 "src/sparse.c"
15571558
break;
15581559

15591560
case 38:
15601561
#line 144 "src/sparse.y"
15611562
{
15621563
set_euler((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].i), "ZXZ");
15631564
}
1564-
#line 1565 "src/sparse.c"
1565+
#line 1566 "src/sparse.c"
15651566
break;
15661567

15671568
case 39:
15681569
#line 148 "src/sparse.y"
15691570
{
15701571
set_euler((yyvsp[-6].i), (yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].c));
15711572
}
1572-
#line 1573 "src/sparse.c"
1573+
#line 1574 "src/sparse.c"
15731574
break;
15741575

15751576
case 40:
15761577
#line 156 "src/sparse.y"
15771578
{
15781579
set_line ((yyvsp[0].i));
15791580
}
1580-
#line 1581 "src/sparse.c"
1581+
#line 1582 "src/sparse.c"
15811582
break;
15821583

15831584
case 43:
15841585
#line 168 "src/sparse.y"
15851586
{ }
1586-
#line 1587 "src/sparse.c"
1587+
#line 1588 "src/sparse.c"
15871588
break;
15881589

15891590
case 44:
15901591
#line 174 "src/sparse.y"
15911592
{
15921593
set_ellipse((yyvsp[-8].i), (yyvsp[-6].i), (yyvsp[-3].i), (yyvsp[-1].i));
15931594
}
1594-
#line 1595 "src/sparse.c"
1595+
#line 1596 "src/sparse.c"
15951596
break;
15961597

15971598
case 45:
15981599
#line 181 "src/sparse.y"
15991600
{ }
1600-
#line 1601 "src/sparse.c"
1601+
#line 1602 "src/sparse.c"
16011602
break;
16021603

16031604
case 46:
16041605
#line 182 "src/sparse.y"
16051606
{ }
1606-
#line 1607 "src/sparse.c"
1607+
#line 1608 "src/sparse.c"
16071608
break;
16081609

16091610

1610-
#line 1611 "src/sparse.c"
1611+
#line 1612 "src/sparse.c"
16111612

16121613
default: break;
16131614
}

‎src/sparse.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ extern int sphere_yydebug;
6060
CLOSEPOINT = 266,
6161
OPENARR = 267,
6262
CLOSEARR = 268,
63-
SIGN = 269,
64-
INT = 270,
65-
FLOAT = 271,
63+
TOK_SIGN = 269,
64+
TOK_INT = 270,
65+
TOK_FLOAT = 271,
6666
EULERAXIS = 272
6767
};
6868
#endif
@@ -78,9 +78,9 @@ extern int sphere_yydebug;
7878
#define CLOSEPOINT 266
7979
#define OPENARR 267
8080
#define CLOSEARR 268
81-
#define SIGN 269
82-
#define INT 270
83-
#define FLOAT 271
81+
#define TOK_SIGN 269
82+
#define TOK_INT 270
83+
#define TOK_FLOAT 271
8484
#define EULERAXIS 272
8585

8686
/* Value type. */

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /