Movatterモバイル変換

[0]ホーム
URL:

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

Commitac1d4ff

Browse files
committed
Fix build under mingw64
Add TOK_ prefix to INT, FLOAT, SIGN token names to distinguist thesenames from macro directives under mingw64.
1 parent59ae179 commitac1d4ff

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
#defineCLOSEPOINT 266
179179
#defineOPENARR 267
180180
#defineCLOSEARR 268
181-
#defineSIGN 269
182-
#defineINT 270
183-
#defineFLOAT 271
181+
#defineTOK_SIGN 269
182+
#defineTOK_INT 270
183+
#defineTOK_FLOAT 271
184184
#defineEULERAXIS 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
case4:
13521353
#line 70 "src/sparse.y"
13531354
{set_spheretype(STYPE_POINT ); }
1354-
#line1355 "src/sparse.c"
1355+
#line1356 "src/sparse.c"
13551356
break;
13561357

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

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

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

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

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

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

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

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

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

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

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

14231424
case16:
14241425
#line 90 "src/sparse.y"
14251426
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-2].i), (yyvsp[0].d),0) ); }
1426-
#line1427 "src/sparse.c"
1427+
#line1428 "src/sparse.c"
14271428
break;
14281429

14291430
case17:
14301431
#line 91 "src/sparse.y"
14311432
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-3].i), (yyvsp[-1].d),0) ); }
1432-
#line1433 "src/sparse.c"
1433+
#line1434 "src/sparse.c"
14331434
break;
14341435

14351436
case18:
14361437
#line 92 "src/sparse.y"
14371438
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-3].i), (yyvsp[-1].i),0) ); }
1438-
#line1439 "src/sparse.c"
1439+
#line1440 "src/sparse.c"
14391440
break;
14401441

14411442
case19:
14421443
#line 93 "src/sparse.y"
14431444
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d)) ); }
1444-
#line1445 "src/sparse.c"
1445+
#line1446 "src/sparse.c"
14451446
break;
14461447

14471448
case20:
14481449
#line 94 "src/sparse.y"
14491450
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d)) ); }
1450-
#line1451 "src/sparse.c"
1451+
#line1452 "src/sparse.c"
14511452
break;
14521453

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

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

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

14711472
case24:
14721473
#line 102 "src/sparse.y"
14731474
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-2].i), (yyvsp[0].d),0)); }
1474-
#line1475 "src/sparse.c"
1475+
#line1476 "src/sparse.c"
14751476
break;
14761477

14771478
case25:
14781479
#line 103 "src/sparse.y"
14791480
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-3].i), (yyvsp[-1].d),0)); }
1480-
#line1481 "src/sparse.c"
1481+
#line1482 "src/sparse.c"
14811482
break;
14821483

14831484
case26:
14841485
#line 104 "src/sparse.y"
14851486
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-3].i), (yyvsp[-1].i),0)); }
1486-
#line1487 "src/sparse.c"
1487+
#line1488 "src/sparse.c"
14871488
break;
14881489

14891490
case27:
14901491
#line 105 "src/sparse.y"
14911492
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
1492-
#line1493 "src/sparse.c"
1493+
#line1494 "src/sparse.c"
14931494
break;
14941495

14951496
case28:
14961497
#line 106 "src/sparse.y"
14971498
{ (yyval.i)=set_angle(1,human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
1498-
#line1499 "src/sparse.c"
1499+
#line1500 "src/sparse.c"
14991500
break;
15001501

15011502
case29:
15021503
#line 107 "src/sparse.y"
15031504
{ (yyval.i)=set_angle(1,15*human2dec((yyvsp[-2].i), (yyvsp[0].d),0)); }
1504-
#line1505 "src/sparse.c"
1505+
#line1506 "src/sparse.c"
15051506
break;
15061507

15071508
case30:
15081509
#line 108 "src/sparse.y"
15091510
{ (yyval.i)=set_angle(1,15*human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
1510-
#line1511 "src/sparse.c"
1511+
#line1512 "src/sparse.c"
15111512
break;
15121513

15131514
case31:
15141515
#line 109 "src/sparse.y"
15151516
{ (yyval.i)=set_angle(1,15*human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
1516-
#line1517 "src/sparse.c"
1517+
#line1518 "src/sparse.c"
15171518
break;
15181519

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

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

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

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

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

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

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

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

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

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

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

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

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

16091610

1610-
#line1611 "src/sparse.c"
1611+
#line1612 "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
#defineCLOSEPOINT 266
7979
#defineOPENARR 267
8080
#defineCLOSEARR 268
81-
#defineSIGN 269
82-
#defineINT 270
83-
#defineFLOAT 271
81+
#defineTOK_SIGN 269
82+
#defineTOK_INT 270
83+
#defineTOK_FLOAT 271
8484
#defineEULERAXIS 272
8585

8686
/* Value type. */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp