Skip to content

Commit

Permalink
backed out of GT/GE token changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjfitzpatrick
mjfitzpatrick committed Sep 28, 2023
1 parent 9125745 commit 7caef6d
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 70 deletions.
2 changes: 1 addition & 1 deletion sys/fmtio/evvexpr.gy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ $/

%token CONSTANT IDENTIFIER NEWLINE YYEOS
%token PLUS MINUS STAR SLASH EXPON CONCAT QUEST COLON
%token LT GT LE GE EQ NE SE LAND LOR LNOT BAND BOR BXOR BNOT AT
%token LT GT LE GT EQ NE SE LAND LOR LNOT BAND BOR BXOR BNOT AT

%nonassoc QUEST
%left LAND LOR
Expand Down
136 changes: 68 additions & 68 deletions sys/fmtio/evvexpr.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,18 +240,18 @@ define COLON 268
define LT 269
define GT 270
define LE 271
define GE 272
define EQ 273
define NE 274
define SE 275
define LAND 276
define LOR 277
define LNOT 278
define BAND 279
define BOR 280
define BXOR 281
define BNOT 282
define AT 283
define EQ 272
define NE 273
define SE 274
define LAND 275
define LOR 276
define LNOT 277
define BAND 278
define BOR 279
define BXOR 280
define BNOT 281
define AT 282
define GE 283
define UMINUS 284
define yyclearin yychar = -1
define yyerrok yyerrflag = 0
Expand Down Expand Up @@ -4523,69 +4523,69 @@ short yyexca[96]
data (yyexca(i),i= 1, 8) / -1, 1, 0, -1, -2, 0, -1, 5/
data (yyexca(i),i= 9, 16) / 40, 33, -2, 5, -1, 6, 40, 32/
data (yyexca(i),i= 17, 24) / -2, 6, -1, 76, 269, 0, 270, 0/
data (yyexca(i),i= 25, 32) / 271, 0, 272, 0, -2, 22, -1, 77/
data (yyexca(i),i= 33, 40) / 269, 0, 270, 0, 271, 0, 272, 0/
data (yyexca(i),i= 25, 32) / 271, 0, 283, 0, -2, 22, -1, 77/
data (yyexca(i),i= 33, 40) / 269, 0, 270, 0, 271, 0, 283, 0/
data (yyexca(i),i= 41, 48) / -2, 23, -1, 78, 269, 0, 270, 0/
data (yyexca(i),i= 49, 56) / 271, 0, 272, 0, -2, 24, -1, 79/
data (yyexca(i),i= 57, 64) / 269, 0, 270, 0, 271, 0, 272, 0/
data (yyexca(i),i= 65, 72) / -2, 25, -1, 80, 273, 0, 274, 0/
data (yyexca(i),i= 73, 80) / 275, 0, -2, 26, -1, 81, 273, 0/
data (yyexca(i),i= 81, 88) / 274, 0, 275, 0, -2, 27, -1, 82/
data (yyexca(i),i= 89, 96) / 273, 0, 274, 0, 275, 0, -2, 28/
data (yyexca(i),i= 49, 56) / 271, 0, 283, 0, -2, 24, -1, 79/
data (yyexca(i),i= 57, 64) / 269, 0, 270, 0, 271, 0, 283, 0/
data (yyexca(i),i= 65, 72) / -2, 25, -1, 80, 272, 0, 273, 0/
data (yyexca(i),i= 73, 80) / 274, 0, -2, 26, -1, 81, 272, 0/
data (yyexca(i),i= 81, 88) / 273, 0, 274, 0, -2, 27, -1, 82/
data (yyexca(i),i= 89, 96) / 272, 0, 273, 0, 274, 0, -2, 28/
short yyact[303]
data (yyact(i),i= 1, 8) / 15, 16, 17, 18, 19, 20, 33, 86/
data (yyact(i),i= 9, 16) / 26, 27, 28, 29, 30, 32, 31, 21/
data (yyact(i),i= 17, 24) / 22, 62, 23, 24, 25, 15, 16, 17/
data (yyact(i),i= 25, 32) / 18, 19, 20, 33, 19, 26, 27, 28/
data (yyact(i),i= 33, 40) / 29, 30, 32, 31, 21, 22, 14, 23/
data (yyact(i),i= 41, 48) / 24, 25, 15, 16, 17, 18, 19, 20/
data (yyact(i),i= 49, 56) / 12, 34, 26, 27, 28, 29, 30, 32/
data (yyact(i),i= 57, 64) / 31, 12, 38, 12, 23, 24, 25, 15/
data (yyact(i),i= 65, 72) / 16, 17, 18, 19, 20, 60, 11, 26/
data (yyact(i),i= 73, 80) / 27, 28, 29, 30, 32, 31, 15, 16/
data (yyact(i),i= 81, 88) / 17, 18, 19, 20, 2, 1, 26, 27/
data (yyact(i),i= 89, 96) / 28, 29, 15, 16, 17, 18, 19, 20/
data (yyact(i),i= 97,104) / 15, 16, 17, 18, 19, 17, 18, 19/
data (yyact(i),i=105,112) / 4, 0, 84, 0, 40, 85, 0, 0/
data (yyact(i),i=113,120) / 0, 35, 36, 37, 0, 39, 0, 0/
data (yyact(i),i=121,128) / 0, 0, 0, 0, 41, 42, 43, 44/
data (yyact(i),i=129,136) / 45, 46, 47, 48, 49, 50, 51, 52/
data (yyact(i),i=137,144) / 53, 54, 55, 56, 57, 58, 59, 61/
data (yyact(i),i=145,152) / 0, 63, 65, 66, 67, 68, 69, 70/
data (yyact(i),i=153,160) / 71, 72, 73, 74, 75, 76, 77, 78/
data (yyact(i),i=161,168) / 79, 80, 81, 82, 83, 0, 0, 0/
data (yyact(i),i=169,176) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i= 9, 16) / 26, 27, 28, 30, 32, 31, 21, 22/
data (yyact(i),i= 17, 24) / 62, 23, 24, 25, 19, 34, 29, 15/
data (yyact(i),i= 25, 32) / 16, 17, 18, 19, 20, 33, 38, 26/
data (yyact(i),i= 33, 40) / 27, 28, 30, 32, 31, 21, 22, 60/
data (yyact(i),i= 41, 48) / 23, 24, 25, 12, 11, 29, 15, 16/
data (yyact(i),i= 49, 56) / 17, 18, 19, 20, 12, 2, 26, 27/
data (yyact(i),i= 57, 64) / 28, 30, 32, 31, 12, 1, 0, 23/
data (yyact(i),i= 65, 72) / 24, 25, 0, 14, 29, 15, 16, 17/
data (yyact(i),i= 73, 80) / 18, 19, 20, 0, 0, 26, 27, 28/
data (yyact(i),i= 81, 88) / 30, 32, 31, 0, 15, 16, 17, 18/
data (yyact(i),i= 89, 96) / 19, 20, 0, 29, 26, 27, 28, 15/
data (yyact(i),i= 97,104) / 16, 17, 18, 19, 20, 15, 16, 17/
data (yyact(i),i=105,112) / 18, 19, 29, 17, 18, 19, 4, 0/
data (yyact(i),i=113,120) / 84, 0, 40, 85, 0, 0, 0, 35/
data (yyact(i),i=121,128) / 36, 37, 0, 39, 0, 0, 0, 0/
data (yyact(i),i=129,136) / 0, 0, 41, 42, 43, 44, 45, 46/
data (yyact(i),i=137,144) / 47, 48, 49, 50, 51, 52, 53, 54/
data (yyact(i),i=145,152) / 55, 56, 57, 58, 59, 61, 0, 63/
data (yyact(i),i=153,160) / 65, 66, 67, 68, 69, 70, 71, 72/
data (yyact(i),i=161,168) / 73, 74, 75, 76, 77, 78, 79, 80/
data (yyact(i),i=169,176) / 81, 82, 83, 0, 0, 0, 0, 0/
data (yyact(i),i=177,184) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=185,192) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=193,200) / 89, 90, 87, 88, 0, 0, 0, 0/
data (yyact(i),i=201,208) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=193,200) / 0, 0, 0, 0, 0, 0, 89, 90/
data (yyact(i),i=201,208) / 87, 88, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=209,216) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=217,224) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=225,232) / 0, 0, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=233,240) / 0, 0, 0, 0, 0, 15, 16, 17/
data (yyact(i),i=241,248) / 18, 19, 20, 33, 0, 26, 27, 28/
data (yyact(i),i=249,256) / 29, 30, 32, 31, 21, 22, 13, 23/
data (yyact(i),i=257,264) / 24, 25, 0, 0, 0, 0, 0, 0/
data (yyact(i),i=265,272) / 0, 5, 6, 64, 0, 0, 8, 0/
data (yyact(i),i=273,280) / 0, 3, 5, 6, 5, 6, 0, 8/
data (yyact(i),i=281,288) / 0, 8, 0, 0, 0, 0, 9, 0/
data (yyact(i),i=289,296) / 0, 0, 10, 7, 0, 0, 0, 9/
data (yyact(i),i=297,303) / 0, 9, 0, 10, 7, 10, 7/
data (yyact(i),i=233,240) / 0, 0, 0, 0, 15, 16, 17, 18/
data (yyact(i),i=241,248) / 19, 20, 33, 0, 26, 27, 28, 30/
data (yyact(i),i=249,256) / 32, 31, 21, 22, 0, 23, 24, 25/
data (yyact(i),i=257,264) / 0, 0, 29, 0, 5, 6, 64, 0/
data (yyact(i),i=265,272) / 0, 8, 0, 0, 3, 5, 6, 0/
data (yyact(i),i=273,280) / 0, 0, 8, 0, 0, 5, 6, 0/
data (yyact(i),i=281,288) / 9, 0, 8, 13, 10, 7, 0, 0/
data (yyact(i),i=289,296) / 0, 9, 0, 0, 0, 10, 7, 0/
data (yyact(i),i=297,303) / 0, 9, 0, 0, 0, 10, 7/
short yypact[91]
data (yypact(i),i= 1, 8) / 17,-1000, -6,-1000,-240,-1000,-1000,-208/
data (yypact(i),i= 9, 16) / 19, 19, 19, 18, 19,-1000,-1000,-1000/
data (yypact(i),i= 1, 8) / 12,-1000, 23,-1000,-238,-1000,-1000,-236/
data (yypact(i),i= 9, 16) / 20, 20, 20, -10, 20,-1000,-1000,-1000/
data (yypact(i),i= 17, 24) /-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000/
data (yypact(i),i= 25, 32) /-1000,-1000,-1000,-1000,-1000,-1000,-1000,-1000/
data (yypact(i),i= 33, 40) /-1000,-1000,-1000,-237,-237,-237, 19, -24/
data (yypact(i),i= 41, 48) / 8, 8, 8, 8, 8, 8, 8, 8/
data (yypact(i),i= 49, 56) / 8, 8, 8, 8, 8, 8, 8, 8/
data (yypact(i),i= 57, 64) / 8, 8, 8, 8, 65,-240,-1000,-240/
data (yypact(i),i= 65, 72) /-1000,-162,-162,-237,-237,-1000,-165,-219/
data (yypact(i),i= 73, 80) /-219,-198,-198,-198,-171,-171,-171,-171/
data (yypact(i),i= 81, 88) /-183,-183,-183,-261,-1000,-1000,-1000, 8/
data (yypact(i),i= 89, 91) / 8,-240,-240/
data (yypact(i),i= 33, 40) /-1000,-1000,-1000,-245,-245,-245, 20, -25/
data (yypact(i),i= 41, 48) / 3, 3, 3, 3, 3, 3, 3, 3/
data (yypact(i),i= 49, 56) / 3, 3, 3, 3, 3, 3, 3, 3/
data (yypact(i),i= 57, 64) / 3, 3, 3, 3, 71,-238,-1000,-238/
data (yypact(i),i= 65, 72) /-1000,-156,-156,-245,-245,-1000,-160,-215/
data (yypact(i),i= 73, 80) /-215,-192,-192,-192,-166,-166,-166,-166/
data (yypact(i),i= 81, 88) /-177,-177,-177,-261,-1000,-1000,-1000, 3/
data (yypact(i),i= 89, 91) / 3,-238,-238/
short yypgo[7]
data (yypgo(i),i= 1, 7) / 0, 85, 84, 104, 108, 70, 69/
data (yypgo(i),i= 1, 7) / 0, 61, 53, 110, 114, 44, 39/
short yyr1[39]
data (yyr1(i),i= 1, 8) / 0, 1, 1, 2, 2, 3, 3, 3/
data (yyr1(i),i= 9, 16) / 3, 3, 3, 3, 3, 3, 3, 3/
Expand All @@ -4599,11 +4599,11 @@ data (yyr2(i),i= 17, 24) / 4, 4, 4, 4, 4, 4, 4, 4/
data (yyr2(i),i= 25, 32) / 4, 4, 4, 4, 4, 7, 4, 3/
data (yyr2(i),i= 33, 39) / 1, 1, 0, 1, 4, 0, 2/
short yychk[91]
data (yychk(i),i= 1, 8) /-1000, -1, -2, 256, -3, 257, 258, 283/
data (yychk(i),i= 9, 16) / 262, 278, 282, -5, 40, 260, 44, 261/
data (yychk(i),i= 17, 24) / 262, 263, 264, 265, 266, 276, 277, 279/
data (yychk(i),i= 25, 32) / 280, 281, 269, 270, 271, 272, 273, 275/
data (yychk(i),i= 33, 40) / 274, 267, 257, -3, -3, -3, 40, -3/
data (yychk(i),i= 1, 8) /-1000, -1, -2, 256, -3, 257, 258, 282/
data (yychk(i),i= 9, 16) / 262, 277, 281, -5, 40, 260, 44, 261/
data (yychk(i),i= 17, 24) / 262, 263, 264, 265, 266, 275, 276, 278/
data (yychk(i),i= 25, 32) / 279, 280, 269, 270, 271, 283, 272, 274/
data (yychk(i),i= 33, 40) / 273, 267, 257, -3, -3, -3, 40, -3/
data (yychk(i),i= 41, 48) / -4, -4, -4, -4, -4, -4, -4, -4/
data (yychk(i),i= 49, 56) / -4, -4, -4, -4, -4, -4, -4, -4/
data (yychk(i),i= 57, 64) / -4, -4, -4, -4, -6, -3, 41, -3/
Expand Down
2 changes: 1 addition & 1 deletion sys/fmtio/evvexpr.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ include "evvexpr.com"

%token CONSTANT IDENTIFIER NEWLINE YYEOS
%token PLUS MINUS STAR SLASH EXPON CONCAT QUEST COLON
%token LT GT LE GE EQ NE SE LAND LOR LNOT BAND BOR BXOR BNOT AT
%token LT GT LE GT EQ NE SE LAND LOR LNOT BAND BOR BXOR BNOT AT

%nonassoc QUEST
%left LAND LOR
Expand Down

0 comments on commit 7caef6d

Please sign in to comment.