From 021bf69d6b5d389ab00bd7043a37b6300c79dcfa Mon Sep 17 00:00:00 2001
From: Vitaly Davydov <vitprof@gmail.com>
Date: Mon, 20 May 2024 16:41:21 +0300
Subject: [PATCH 1/3] Re-generate parser source files

---
 src/sparse.c | 180 +++++++++++++++++++++++++--------------------------
 src/sparse.h |  10 +--
 src/sscan.c  |  60 ++++++++---------
 3 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/src/sparse.c b/src/sparse.c
index f220086..9eb7d57 100644
--- a/src/sparse.c
+++ b/src/sparse.c
@@ -74,7 +74,7 @@
 #define yychar          sphere_yychar
 
 /* First part of user prologue.  */
-#line 1 "sparse.y"
+#line 1 "src/sparse.y"
 
 #include <stdio.h>
 #include <string.h>
@@ -110,7 +110,7 @@ static double human2dec(double d, double m, double s)
 }
 
 
-#line 114 "sparse.c"
+#line 114 "src/sparse.c"
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
@@ -134,8 +134,8 @@ static double human2dec(double d, double m, double s)
 
 /* Use api.header.include to #include this header
    instead of duplicating it here.  */
-#ifndef YY_SPHERE_YY_SPARSE_H_INCLUDED
-# define YY_SPHERE_YY_SPARSE_H_INCLUDED
+#ifndef YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
+# define YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -187,13 +187,13 @@ extern int sphere_yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 41 "sparse.y"
+#line 41 "src/sparse.y"
 
 	int		i;
 	double	d;
 	char	c[3];
 
-#line 197 "sparse.c"
+#line 197 "src/sparse.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -206,7 +206,7 @@ extern YYSTYPE sphere_yylval;
 
 int sphere_yyparse (void);
 
-#endif /* !YY_SPHERE_YY_SPARSE_H_INCLUDED  */
+#endif /* !YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED  */
 
 
 
@@ -1349,265 +1349,265 @@ yyparse (void)
   switch (yyn)
     {
   case 4:
-#line 70 "sparse.y"
+#line 70 "src/sparse.y"
     { set_spheretype( STYPE_POINT   ); }
-#line 1355 "sparse.c"
+#line 1355 "src/sparse.c"
     break;
 
   case 5:
-#line 71 "sparse.y"
+#line 71 "src/sparse.y"
     { set_spheretype( STYPE_CIRCLE  ); }
-#line 1361 "sparse.c"
+#line 1361 "src/sparse.c"
     break;
 
   case 6:
-#line 72 "sparse.y"
+#line 72 "src/sparse.y"
     { set_spheretype( STYPE_LINE    ); }
-#line 1367 "sparse.c"
+#line 1367 "src/sparse.c"
     break;
 
   case 7:
-#line 73 "sparse.y"
+#line 73 "src/sparse.y"
     { set_spheretype( STYPE_EULER   ); }
-#line 1373 "sparse.c"
+#line 1373 "src/sparse.c"
     break;
 
   case 8:
-#line 74 "sparse.y"
+#line 74 "src/sparse.y"
     { set_spheretype( STYPE_PATH    ); }
-#line 1379 "sparse.c"
+#line 1379 "src/sparse.c"
     break;
 
   case 9:
-#line 75 "sparse.y"
+#line 75 "src/sparse.y"
     { set_spheretype( STYPE_ELLIPSE ); }
-#line 1385 "sparse.c"
+#line 1385 "src/sparse.c"
     break;
 
   case 10:
-#line 76 "sparse.y"
+#line 76 "src/sparse.y"
     { set_spheretype( STYPE_BOX     ); }
-#line 1391 "sparse.c"
+#line 1391 "src/sparse.c"
     break;
 
   case 11:
-#line 81 "sparse.y"
+#line 81 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].d); }
-#line 1397 "sparse.c"
+#line 1397 "src/sparse.c"
     break;
 
   case 12:
-#line 82 "sparse.y"
+#line 82 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].i); }
-#line 1403 "sparse.c"
+#line 1403 "src/sparse.c"
     break;
 
   case 13:
-#line 87 "sparse.y"
+#line 87 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d) ); }
-#line 1409 "sparse.c"
+#line 1409 "src/sparse.c"
     break;
 
   case 14:
-#line 88 "sparse.y"
+#line 88 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0) ); }
-#line 1415 "sparse.c"
+#line 1415 "src/sparse.c"
     break;
 
   case 15:
-#line 89 "sparse.y"
+#line 89 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0) ); }
-#line 1421 "sparse.c"
+#line 1421 "src/sparse.c"
     break;
 
   case 16:
-#line 90 "sparse.y"
+#line 90 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0) ); }
-#line 1427 "sparse.c"
+#line 1427 "src/sparse.c"
     break;
 
   case 17:
-#line 91 "sparse.y"
+#line 91 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0) ); }
-#line 1433 "sparse.c"
+#line 1433 "src/sparse.c"
     break;
 
   case 18:
-#line 92 "sparse.y"
+#line 92 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0) ); }
-#line 1439 "sparse.c"
+#line 1439 "src/sparse.c"
     break;
 
   case 19:
-#line 93 "sparse.y"
+#line 93 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d)) ); }
-#line 1445 "sparse.c"
+#line 1445 "src/sparse.c"
     break;
 
   case 20:
-#line 94 "sparse.y"
+#line 94 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d)) ); }
-#line 1451 "sparse.c"
+#line 1451 "src/sparse.c"
     break;
 
   case 21:
-#line 99 "sparse.y"
+#line 99 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d)); }
-#line 1457 "sparse.c"
+#line 1457 "src/sparse.c"
     break;
 
   case 22:
-#line 100 "sparse.y"
+#line 100 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0)); }
-#line 1463 "sparse.c"
+#line 1463 "src/sparse.c"
     break;
 
   case 23:
-#line 101 "sparse.y"
+#line 101 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0)); }
-#line 1469 "sparse.c"
+#line 1469 "src/sparse.c"
     break;
 
   case 24:
-#line 102 "sparse.y"
+#line 102 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1475 "sparse.c"
+#line 1475 "src/sparse.c"
     break;
 
   case 25:
-#line 103 "sparse.y"
+#line 103 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0)); }
-#line 1481 "sparse.c"
+#line 1481 "src/sparse.c"
     break;
 
   case 26:
-#line 104 "sparse.y"
+#line 104 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0)); }
-#line 1487 "sparse.c"
+#line 1487 "src/sparse.c"
     break;
 
   case 27:
-#line 105 "sparse.y"
+#line 105 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1493 "sparse.c"
+#line 1493 "src/sparse.c"
     break;
 
   case 28:
-#line 106 "sparse.y"
+#line 106 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1499 "sparse.c"
+#line 1499 "src/sparse.c"
     break;
 
   case 29:
-#line 107 "sparse.y"
+#line 107 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1505 "sparse.c"
+#line 1505 "src/sparse.c"
     break;
 
   case 30:
-#line 108 "sparse.y"
+#line 108 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1511 "sparse.c"
+#line 1511 "src/sparse.c"
     break;
 
   case 31:
-#line 109 "sparse.y"
+#line 109 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1517 "sparse.c"
+#line 1517 "src/sparse.c"
     break;
 
   case 32:
-#line 114 "sparse.y"
+#line 114 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1523 "sparse.c"
+#line 1523 "src/sparse.c"
     break;
 
   case 33:
-#line 115 "sparse.y"
+#line 115 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1529 "sparse.c"
+#line 1529 "src/sparse.c"
     break;
 
   case 34:
-#line 120 "sparse.y"
+#line 120 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1535 "sparse.c"
+#line 1535 "src/sparse.c"
     break;
 
   case 35:
-#line 121 "sparse.y"
+#line 121 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1541 "sparse.c"
+#line 1541 "src/sparse.c"
     break;
 
   case 36:
-#line 128 "sparse.y"
+#line 128 "src/sparse.y"
     {
 			(yyval.i) = set_point((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1549 "sparse.c"
+#line 1549 "src/sparse.c"
     break;
 
   case 37:
-#line 136 "sparse.y"
+#line 136 "src/sparse.y"
     {
 			set_circle((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1557 "sparse.c"
+#line 1557 "src/sparse.c"
     break;
 
   case 38:
-#line 144 "sparse.y"
+#line 144 "src/sparse.y"
     {
 			set_euler((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].i), "ZXZ");
 		}
-#line 1565 "sparse.c"
+#line 1565 "src/sparse.c"
     break;
 
   case 39:
-#line 148 "sparse.y"
+#line 148 "src/sparse.y"
     {
 			set_euler((yyvsp[-6].i), (yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].c));
 		}
-#line 1573 "sparse.c"
+#line 1573 "src/sparse.c"
     break;
 
   case 40:
-#line 156 "sparse.y"
+#line 156 "src/sparse.y"
     {
 			set_line ((yyvsp[0].i));
 		}
-#line 1581 "sparse.c"
+#line 1581 "src/sparse.c"
     break;
 
   case 43:
-#line 168 "sparse.y"
+#line 168 "src/sparse.y"
     { }
-#line 1587 "sparse.c"
+#line 1587 "src/sparse.c"
     break;
 
   case 44:
-#line 174 "sparse.y"
+#line 174 "src/sparse.y"
     {
 			set_ellipse((yyvsp[-8].i), (yyvsp[-6].i), (yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1595 "sparse.c"
+#line 1595 "src/sparse.c"
     break;
 
   case 45:
-#line 181 "sparse.y"
+#line 181 "src/sparse.y"
     { }
-#line 1601 "sparse.c"
+#line 1601 "src/sparse.c"
     break;
 
   case 46:
-#line 182 "sparse.y"
+#line 182 "src/sparse.y"
     { }
-#line 1607 "sparse.c"
+#line 1607 "src/sparse.c"
     break;
 
 
-#line 1611 "sparse.c"
+#line 1611 "src/sparse.c"
 
       default: break;
     }
diff --git a/src/sparse.h b/src/sparse.h
index 032b5fd..e6a1000 100644
--- a/src/sparse.h
+++ b/src/sparse.h
@@ -34,8 +34,8 @@
 /* Undocumented macros, especially those whose name start with YY_,
    are private implementation details.  Do not rely on them.  */
 
-#ifndef YY_SPHERE_YY_SPARSE_H_INCLUDED
-# define YY_SPHERE_YY_SPARSE_H_INCLUDED
+#ifndef YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
+# define YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -87,13 +87,13 @@ extern int sphere_yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 41 "sparse.y"
+#line 41 "src/sparse.y"
 
 	int		i;
 	double	d;
 	char	c[3];
 
-#line 97 "sparse.h"
+#line 97 "src/sparse.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -106,4 +106,4 @@ extern YYSTYPE sphere_yylval;
 
 int sphere_yyparse (void);
 
-#endif /* !YY_SPHERE_YY_SPARSE_H_INCLUDED  */
+#endif /* !YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED  */
diff --git a/src/sscan.c b/src/sscan.c
index 3d904c6..0df711e 100644
--- a/src/sscan.c
+++ b/src/sscan.c
@@ -1,6 +1,6 @@
-#line 2 "sscan.c"
+#line 2 "src/sscan.c"
 
-#line 4 "sscan.c"
+#line 4 "src/sscan.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -722,8 +722,8 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "sscan.l"
-#line 2 "sscan.l"
+#line 1 "src/sscan.l"
+#line 2 "src/sscan.l"
 #include <stdio.h>
 #include "string.h"
 #include "sparse.h"
@@ -745,8 +745,8 @@ void sphere_flush_scanner_buffer(void)
 {
 	YY_FLUSH_BUFFER;
 }
-#line 749 "sscan.c"
-#line 750 "sscan.c"
+#line 749 "src/sscan.c"
+#line 750 "src/sscan.c"
 
 #define INITIAL 0
 
@@ -961,9 +961,9 @@ YY_DECL
 		}
 
 	{
-#line 35 "sscan.l"
+#line 35 "src/sscan.l"
 
-#line 967 "sscan.c"
+#line 967 "src/sscan.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1018,106 +1018,106 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 36 "sscan.l"
+#line 36 "src/sscan.l"
 sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return SIGN;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 37 "sscan.l"
+#line 37 "src/sscan.l"
 sphere_yylval.i = atoi(yytext); return INT;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 38 "sscan.l"
+#line 38 "src/sscan.l"
 sphere_yylval.d = atof(yytext); return FLOAT;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 39 "sscan.l"
+#line 39 "src/sscan.l"
 memcpy(&sphere_yylval.c[0], yytext, 3); return EULERAXIS;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 40 "sscan.l"
+#line 40 "src/sscan.l"
 return HOUR;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 41 "sscan.l"
+#line 41 "src/sscan.l"
 return DEG;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 42 "sscan.l"
+#line 42 "src/sscan.l"
 return MIN;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 43 "sscan.l"
+#line 43 "src/sscan.l"
 return MIN;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 44 "sscan.l"
+#line 44 "src/sscan.l"
 return SEC;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 45 "sscan.l"
+#line 45 "src/sscan.l"
 return SEC;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 46 "sscan.l"
+#line 46 "src/sscan.l"
 return COMMA;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 47 "sscan.l"
+#line 47 "src/sscan.l"
 return OPENCIRC;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 48 "sscan.l"
+#line 48 "src/sscan.l"
 return CLOSECIRC;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 49 "sscan.l"
+#line 49 "src/sscan.l"
 return OPENPOINT;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 50 "sscan.l"
+#line 50 "src/sscan.l"
 return CLOSEPOINT;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 51 "sscan.l"
+#line 51 "src/sscan.l"
 return OPENARR;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 52 "sscan.l"
+#line 52 "src/sscan.l"
 return CLOSEARR;
 	YY_BREAK
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 53 "sscan.l"
+#line 53 "src/sscan.l"
 /* discard spaces */
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 54 "sscan.l"
+#line 54 "src/sscan.l"
 /* alert parser of the garbage */
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 55 "sscan.l"
+#line 55 "src/sscan.l"
 ECHO;
 	YY_BREAK
-#line 1121 "sscan.c"
+#line 1121 "src/sscan.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2086,6 +2086,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 55 "sscan.l"
+#line 55 "src/sscan.l"
 
 

From 78a38a32b279f45f0f1d2e9a4099b87515770f13 Mon Sep 17 00:00:00 2001
From: Vitaly Davydov <vitprof@gmail.com>
Date: Mon, 20 May 2024 16:50:32 +0300
Subject: [PATCH 2/3] Fix build under mingw64

Add TOK_ prefix to INT, FLOAT, SIGN token names to distinguist these
names from macro directives under mingw64.
---
 src/sparse.c | 105 ++++++++++++++++++++++++++-------------------------
 src/sparse.h |  12 +++---
 src/sparse.y |  48 +++++++++++------------
 src/sscan.c  |   6 +--
 src/sscan.l  |   6 +--
 5 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/src/sparse.c b/src/sparse.c
index 9eb7d57..16a65d1 100644
--- a/src/sparse.c
+++ b/src/sparse.c
@@ -160,9 +160,9 @@ extern int sphere_yydebug;
     CLOSEPOINT = 266,
     OPENARR = 267,
     CLOSEARR = 268,
-    SIGN = 269,
-    INT = 270,
-    FLOAT = 271,
+    TOK_SIGN = 269,
+    TOK_INT = 270,
+    TOK_FLOAT = 271,
     EULERAXIS = 272
   };
 #endif
@@ -178,9 +178,9 @@ extern int sphere_yydebug;
 #define CLOSEPOINT 266
 #define OPENARR 267
 #define CLOSEARR 268
-#define SIGN 269
-#define INT 270
-#define FLOAT 271
+#define TOK_SIGN 269
+#define TOK_INT 270
+#define TOK_FLOAT 271
 #define EULERAXIS 272
 
 /* Value type.  */
@@ -515,10 +515,11 @@ static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "HOUR", "DEG", "MIN", "SEC", "COMMA",
   "OPENCIRC", "CLOSECIRC", "OPENPOINT", "CLOSEPOINT", "OPENARR",
-  "CLOSEARR", "SIGN", "INT", "FLOAT", "EULERAXIS", "$accept", "commands",
-  "command", "number", "angle_lat_us", "angle_long_us", "angle_long",
-  "angle_lat", "spherepoint", "spherecircle", "eulertrans", "sphereline",
-  "spherepointlist", "spherepath", "sphereellipse", "spherebox", YY_NULLPTR
+  "CLOSEARR", "TOK_SIGN", "TOK_INT", "TOK_FLOAT", "EULERAXIS", "$accept",
+  "commands", "command", "number", "angle_lat_us", "angle_long_us",
+  "angle_long", "angle_lat", "spherepoint", "spherecircle", "eulertrans",
+  "sphereline", "spherepointlist", "spherepath", "sphereellipse",
+  "spherebox", YY_NULLPTR
 };
 #endif
 
@@ -1351,193 +1352,193 @@ yyparse (void)
   case 4:
 #line 70 "src/sparse.y"
     { set_spheretype( STYPE_POINT   ); }
-#line 1355 "src/sparse.c"
+#line 1356 "src/sparse.c"
     break;
 
   case 5:
 #line 71 "src/sparse.y"
     { set_spheretype( STYPE_CIRCLE  ); }
-#line 1361 "src/sparse.c"
+#line 1362 "src/sparse.c"
     break;
 
   case 6:
 #line 72 "src/sparse.y"
     { set_spheretype( STYPE_LINE    ); }
-#line 1367 "src/sparse.c"
+#line 1368 "src/sparse.c"
     break;
 
   case 7:
 #line 73 "src/sparse.y"
     { set_spheretype( STYPE_EULER   ); }
-#line 1373 "src/sparse.c"
+#line 1374 "src/sparse.c"
     break;
 
   case 8:
 #line 74 "src/sparse.y"
     { set_spheretype( STYPE_PATH    ); }
-#line 1379 "src/sparse.c"
+#line 1380 "src/sparse.c"
     break;
 
   case 9:
 #line 75 "src/sparse.y"
     { set_spheretype( STYPE_ELLIPSE ); }
-#line 1385 "src/sparse.c"
+#line 1386 "src/sparse.c"
     break;
 
   case 10:
 #line 76 "src/sparse.y"
     { set_spheretype( STYPE_BOX     ); }
-#line 1391 "src/sparse.c"
+#line 1392 "src/sparse.c"
     break;
 
   case 11:
 #line 81 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].d); }
-#line 1397 "src/sparse.c"
+#line 1398 "src/sparse.c"
     break;
 
   case 12:
 #line 82 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].i); }
-#line 1403 "src/sparse.c"
+#line 1404 "src/sparse.c"
     break;
 
   case 13:
 #line 87 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d) ); }
-#line 1409 "src/sparse.c"
+#line 1410 "src/sparse.c"
     break;
 
   case 14:
 #line 88 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0) ); }
-#line 1415 "src/sparse.c"
+#line 1416 "src/sparse.c"
     break;
 
   case 15:
 #line 89 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0) ); }
-#line 1421 "src/sparse.c"
+#line 1422 "src/sparse.c"
     break;
 
   case 16:
 #line 90 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0) ); }
-#line 1427 "src/sparse.c"
+#line 1428 "src/sparse.c"
     break;
 
   case 17:
 #line 91 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0) ); }
-#line 1433 "src/sparse.c"
+#line 1434 "src/sparse.c"
     break;
 
   case 18:
 #line 92 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0) ); }
-#line 1439 "src/sparse.c"
+#line 1440 "src/sparse.c"
     break;
 
   case 19:
 #line 93 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d)) ); }
-#line 1445 "src/sparse.c"
+#line 1446 "src/sparse.c"
     break;
 
   case 20:
 #line 94 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d)) ); }
-#line 1451 "src/sparse.c"
+#line 1452 "src/sparse.c"
     break;
 
   case 21:
 #line 99 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d)); }
-#line 1457 "src/sparse.c"
+#line 1458 "src/sparse.c"
     break;
 
   case 22:
 #line 100 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0)); }
-#line 1463 "src/sparse.c"
+#line 1464 "src/sparse.c"
     break;
 
   case 23:
 #line 101 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0)); }
-#line 1469 "src/sparse.c"
+#line 1470 "src/sparse.c"
     break;
 
   case 24:
 #line 102 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1475 "src/sparse.c"
+#line 1476 "src/sparse.c"
     break;
 
   case 25:
 #line 103 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0)); }
-#line 1481 "src/sparse.c"
+#line 1482 "src/sparse.c"
     break;
 
   case 26:
 #line 104 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0)); }
-#line 1487 "src/sparse.c"
+#line 1488 "src/sparse.c"
     break;
 
   case 27:
 #line 105 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1493 "src/sparse.c"
+#line 1494 "src/sparse.c"
     break;
 
   case 28:
 #line 106 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1499 "src/sparse.c"
+#line 1500 "src/sparse.c"
     break;
 
   case 29:
 #line 107 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1505 "src/sparse.c"
+#line 1506 "src/sparse.c"
     break;
 
   case 30:
 #line 108 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1511 "src/sparse.c"
+#line 1512 "src/sparse.c"
     break;
 
   case 31:
 #line 109 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1517 "src/sparse.c"
+#line 1518 "src/sparse.c"
     break;
 
   case 32:
 #line 114 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1523 "src/sparse.c"
+#line 1524 "src/sparse.c"
     break;
 
   case 33:
 #line 115 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1529 "src/sparse.c"
+#line 1530 "src/sparse.c"
     break;
 
   case 34:
 #line 120 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1535 "src/sparse.c"
+#line 1536 "src/sparse.c"
     break;
 
   case 35:
 #line 121 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1541 "src/sparse.c"
+#line 1542 "src/sparse.c"
     break;
 
   case 36:
@@ -1545,7 +1546,7 @@ yyparse (void)
     {
 			(yyval.i) = set_point((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1549 "src/sparse.c"
+#line 1550 "src/sparse.c"
     break;
 
   case 37:
@@ -1553,7 +1554,7 @@ yyparse (void)
     {
 			set_circle((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1557 "src/sparse.c"
+#line 1558 "src/sparse.c"
     break;
 
   case 38:
@@ -1561,7 +1562,7 @@ yyparse (void)
     {
 			set_euler((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].i), "ZXZ");
 		}
-#line 1565 "src/sparse.c"
+#line 1566 "src/sparse.c"
     break;
 
   case 39:
@@ -1569,7 +1570,7 @@ yyparse (void)
     {
 			set_euler((yyvsp[-6].i), (yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].c));
 		}
-#line 1573 "src/sparse.c"
+#line 1574 "src/sparse.c"
     break;
 
   case 40:
@@ -1577,13 +1578,13 @@ yyparse (void)
     {
 			set_line ((yyvsp[0].i));
 		}
-#line 1581 "src/sparse.c"
+#line 1582 "src/sparse.c"
     break;
 
   case 43:
 #line 168 "src/sparse.y"
     { }
-#line 1587 "src/sparse.c"
+#line 1588 "src/sparse.c"
     break;
 
   case 44:
@@ -1591,23 +1592,23 @@ yyparse (void)
     {
 			set_ellipse((yyvsp[-8].i), (yyvsp[-6].i), (yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1595 "src/sparse.c"
+#line 1596 "src/sparse.c"
     break;
 
   case 45:
 #line 181 "src/sparse.y"
     { }
-#line 1601 "src/sparse.c"
+#line 1602 "src/sparse.c"
     break;
 
   case 46:
 #line 182 "src/sparse.y"
     { }
-#line 1607 "src/sparse.c"
+#line 1608 "src/sparse.c"
     break;
 
 
-#line 1611 "src/sparse.c"
+#line 1612 "src/sparse.c"
 
       default: break;
     }
diff --git a/src/sparse.h b/src/sparse.h
index e6a1000..c6607ba 100644
--- a/src/sparse.h
+++ b/src/sparse.h
@@ -60,9 +60,9 @@ extern int sphere_yydebug;
     CLOSEPOINT = 266,
     OPENARR = 267,
     CLOSEARR = 268,
-    SIGN = 269,
-    INT = 270,
-    FLOAT = 271,
+    TOK_SIGN = 269,
+    TOK_INT = 270,
+    TOK_FLOAT = 271,
     EULERAXIS = 272
   };
 #endif
@@ -78,9 +78,9 @@ extern int sphere_yydebug;
 #define CLOSEPOINT 266
 #define OPENARR 267
 #define CLOSEARR 268
-#define SIGN 269
-#define INT 270
-#define FLOAT 271
+#define TOK_SIGN 269
+#define TOK_INT 270
+#define TOK_FLOAT 271
 #define EULERAXIS 272
 
 /* Value type.  */
diff --git a/src/sparse.y b/src/sparse.y
index 22e8778..0b65d9f 100644
--- a/src/sparse.y
+++ b/src/sparse.y
@@ -44,9 +44,9 @@ static double human2dec(double d, double m, double s)
 	char	c[3];
 }
 
-%token <i> SIGN
-%token <i> INT
-%token <d> FLOAT
+%token <i> TOK_SIGN
+%token <i> TOK_INT
+%token <d> TOK_FLOAT
 %token <c> EULERAXIS
 %left      COMMA
 
@@ -78,47 +78,47 @@ command:
 
 /* unsigned number */
 number :
-	FLOAT	{ $$ = $1; }
-	| INT	{ $$ = $1; }
+	TOK_FLOAT	{ $$ = $1; }
+	| TOK_INT	{ $$ = $1; }
 	;
 
 /* unsigned longitude */
 angle_lat_us :
 	number							{ $$ = set_angle(0, $1 ); }
-	| FLOAT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0) ); }
-	| INT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0) ); }
-	| INT DEG number				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
-	| INT DEG FLOAT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
-	| INT DEG INT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
-	| INT DEG INT MIN number		{ $$ = set_angle(1, human2dec($1, $3, $5) ); }
-	| INT DEG INT MIN number SEC	{ $$ = set_angle(1, human2dec($1, $3, $5) ); }
+	| TOK_FLOAT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0) ); }
+	| TOK_INT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0) ); }
+	| TOK_INT DEG number				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
+	| TOK_INT DEG TOK_FLOAT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
+	| TOK_INT DEG TOK_INT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0) ); }
+	| TOK_INT DEG TOK_INT MIN number		{ $$ = set_angle(1, human2dec($1, $3, $5) ); }
+	| TOK_INT DEG TOK_INT MIN number SEC	{ $$ = set_angle(1, human2dec($1, $3, $5) ); }
 	;
 
 /* unsigned latitude */
 angle_long_us :
 	number							{ $$ = set_angle(0, $1); }
-	| FLOAT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0)); }
-	| INT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0)); }
-	| INT DEG number				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
-	| INT DEG FLOAT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
-	| INT DEG INT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
-	| INT DEG INT MIN number		{ $$ = set_angle(1, human2dec($1, $3, $5)); }
-	| INT DEG INT MIN number SEC	{ $$ = set_angle(1, human2dec($1, $3, $5)); }
-	| INT HOUR number				{ $$ = set_angle(1, 15 * human2dec($1, $3, 0)); }
-	| INT HOUR INT MIN number		{ $$ = set_angle(1, 15 * human2dec($1, $3, $5)); }
-	| INT HOUR INT MIN number SEC	{ $$ = set_angle(1, 15 * human2dec($1, $3, $5)); }
+	| TOK_FLOAT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0)); }
+	| TOK_INT DEG						{ $$ = set_angle(1, human2dec($1, 0, 0)); }
+	| TOK_INT DEG number				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
+	| TOK_INT DEG TOK_FLOAT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
+	| TOK_INT DEG TOK_INT MIN				{ $$ = set_angle(1, human2dec($1, $3, 0)); }
+	| TOK_INT DEG TOK_INT MIN number		{ $$ = set_angle(1, human2dec($1, $3, $5)); }
+	| TOK_INT DEG TOK_INT MIN number SEC	{ $$ = set_angle(1, human2dec($1, $3, $5)); }
+	| TOK_INT HOUR number				{ $$ = set_angle(1, 15 * human2dec($1, $3, 0)); }
+	| TOK_INT HOUR TOK_INT MIN number		{ $$ = set_angle(1, 15 * human2dec($1, $3, $5)); }
+	| TOK_INT HOUR TOK_INT MIN number SEC	{ $$ = set_angle(1, 15 * human2dec($1, $3, $5)); }
 	;
 
 /* longitude */
 angle_long :
 	angle_long_us			{ $$ = set_angle_sign($1, 1); }
-	| SIGN angle_long_us	{ $$ = set_angle_sign($2, $1); }
+	| TOK_SIGN angle_long_us	{ $$ = set_angle_sign($2, $1); }
 	;
 
 /* latitude */
 angle_lat :
 	angle_lat_us			{ $$ = set_angle_sign($1, 1); }
-	| SIGN angle_lat_us		{ $$ = set_angle_sign($2, $1); }
+	| TOK_SIGN angle_lat_us		{ $$ = set_angle_sign($2, $1); }
 	;
 
 
diff --git a/src/sscan.c b/src/sscan.c
index 0df711e..50e0e70 100644
--- a/src/sscan.c
+++ b/src/sscan.c
@@ -1019,17 +1019,17 @@ YY_DECL
 case 1:
 YY_RULE_SETUP
 #line 36 "src/sscan.l"
-sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return SIGN;
+sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return TOK_SIGN;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
 #line 37 "src/sscan.l"
-sphere_yylval.i = atoi(yytext); return INT;
+sphere_yylval.i = atoi(yytext); return TOK_INT;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
 #line 38 "src/sscan.l"
-sphere_yylval.d = atof(yytext); return FLOAT;
+sphere_yylval.d = atof(yytext); return TOK_FLOAT;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
diff --git a/src/sscan.l b/src/sscan.l
index 99bd8ac..d3103b6 100644
--- a/src/sscan.l
+++ b/src/sscan.l
@@ -33,9 +33,9 @@ real			({int})?\.({int})
 float			({int}|{real})([eE]{sign}{int})?
 
 %%
-{sign}			sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return SIGN;
-{int}			sphere_yylval.i = atoi(yytext); return INT;
-{float}			sphere_yylval.d = atof(yytext); return FLOAT;
+{sign}			sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return TOK_SIGN;
+{int}			sphere_yylval.i = atoi(yytext); return TOK_INT;
+{float}			sphere_yylval.d = atof(yytext); return TOK_FLOAT;
 [x-zX-Z]{3}		memcpy(&sphere_yylval.c[0], yytext, 3); return EULERAXIS;
 h				return HOUR;
 d				return DEG;

From 9b91c347ad0073fdef80a301e5f117498314462c Mon Sep 17 00:00:00 2001
From: Vitaly Davydov <vitprof@gmail.com>
Date: Sat, 25 May 2024 17:29:15 +0300
Subject: [PATCH 3/3] Bump version up to 1.5.2

---
 Makefile                                       | 3 +++
 Makefile.common.mk                             | 2 +-
 expected/version.out                           | 2 +-
 pg_sphere.control                              | 2 +-
 upgrade_scripts/pg_sphere--1.5.1--1.5.2.sql.in | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 upgrade_scripts/pg_sphere--1.5.1--1.5.2.sql.in

diff --git a/Makefile b/Makefile
index 78f2dc5..782961c 100644
--- a/Makefile
+++ b/Makefile
@@ -218,6 +218,9 @@ pg_sphere--1.4.2--1.5.0.sql:
 pg_sphere--1.5.0--1.5.1.sql:
 	cat upgrade_scripts/$@.in $^ > $@
 
+pg_sphere--1.5.1--1.5.2.sql:
+	cat upgrade_scripts/$@.in $^ > $@
+
 # end of local stuff
 
 src/sscan.o : src/sparse.c
diff --git a/Makefile.common.mk b/Makefile.common.mk
index be82047..8963227 100644
--- a/Makefile.common.mk
+++ b/Makefile.common.mk
@@ -5,4 +5,4 @@
 #----------------------------------------------------------------------------
 
 EXTENSION        	:= pg_sphere
-PGSPHERE_VERSION 	:= 1.5.1
+PGSPHERE_VERSION 	:= 1.5.2
diff --git a/expected/version.out b/expected/version.out
index ffad8f5..c1f0efe 100644
--- a/expected/version.out
+++ b/expected/version.out
@@ -2,6 +2,6 @@
 SELECT pg_sphere_version();
  pg_sphere_version 
 -------------------
- 1.5.1
+ 1.5.2
 (1 row)
 
diff --git a/pg_sphere.control b/pg_sphere.control
index 1e73251..85f7589 100644
--- a/pg_sphere.control
+++ b/pg_sphere.control
@@ -1,5 +1,5 @@
 # pg_sphere extension
 comment = 'spherical objects with useful functions, operators and index support'
-default_version = '1.5.1'
+default_version = '1.5.2'
 module_pathname = '$libdir/pg_sphere'
 relocatable = true
diff --git a/upgrade_scripts/pg_sphere--1.5.1--1.5.2.sql.in b/upgrade_scripts/pg_sphere--1.5.1--1.5.2.sql.in
new file mode 100644
index 0000000..3ff6a66
--- /dev/null
+++ b/upgrade_scripts/pg_sphere--1.5.1--1.5.2.sql.in
@@ -0,0 +1,2 @@
+-- Upgrade: 1.5.1 -> 1.5.2
+-- Nothing to do yet