From 8b2b1ba83927b343820a3bb05ec1a8aa7fcd2a8a Mon Sep 17 00:00:00 2001 From: Dave Cunningham Date: Sun, 23 Feb 2020 21:24:41 +0000 Subject: [PATCH] Avoid float overflow errors at parse time. --- ast/ast.go | 1 - astgen/stdast.go | 322 -------------------------------------- cpp-jsonnet | 2 +- internal/parser/parser.go | 8 - interpreter.go | 10 +- 5 files changed, 10 insertions(+), 333 deletions(-) diff --git a/ast/ast.go b/ast/ast.go index 6d207f5..2d97a2f 100644 --- a/ast/ast.go +++ b/ast/ast.go @@ -495,7 +495,6 @@ type LiteralNull struct{ NodeBase } // LiteralNumber represents a JSON number type LiteralNumber struct { NodeBase - Value float64 OriginalString string } diff --git a/astgen/stdast.go b/astgen/stdast.go index be80e0f..b7168a1 100644 --- a/astgen/stdast.go +++ b/astgen/stdast.go @@ -6076,7 +6076,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p160, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -6416,7 +6415,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p233, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -8154,7 +8152,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p376, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -9595,7 +9592,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p484, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -9781,7 +9777,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p511, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, RightBracketFodder: ast.Fodder{}, @@ -10036,7 +10031,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p536, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, CommaFodder: nil, @@ -10509,7 +10503,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p553, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -10741,7 +10734,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p587, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -11065,7 +11057,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p616, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -12346,7 +12337,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p704, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -12531,7 +12521,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p704, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, RightBracketFodder: ast.Fodder{}, @@ -12777,7 +12766,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p766, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, CommaFodder: nil, @@ -12855,7 +12843,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p766, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: nil, @@ -12974,7 +12961,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p780, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: nil, @@ -13782,7 +13768,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p823, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -13884,7 +13869,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p857, FreeVars: nil, }, - Value: float64(8), OriginalString: "8", }, CommaFodder: nil, @@ -14532,7 +14516,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p885, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -14634,7 +14617,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p919, FreeVars: nil, }, - Value: float64(16), OriginalString: "16", }, CommaFodder: nil, @@ -15434,7 +15416,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p947, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -15627,7 +15608,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p997, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -16783,7 +16763,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1058, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -17241,7 +17220,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1136, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -17794,7 +17772,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1121, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -18617,7 +18594,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1257, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -22150,7 +22126,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1558, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -22306,7 +22281,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1335, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -22678,7 +22652,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1610, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -22702,7 +22675,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1610, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -23313,7 +23285,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1645, FreeVars: nil, }, - Value: float64(97), OriginalString: "97", }, }, @@ -23439,7 +23410,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1645, FreeVars: nil, }, - Value: float64(123), OriginalString: "123", }, }, @@ -23666,7 +23636,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1681, FreeVars: nil, }, - Value: float64(32), OriginalString: "32", }, }, @@ -24511,7 +24480,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1753, FreeVars: nil, }, - Value: float64(65), OriginalString: "65", }, }, @@ -24637,7 +24605,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1753, FreeVars: nil, }, - Value: float64(91), OriginalString: "91", }, }, @@ -24864,7 +24831,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1789, FreeVars: nil, }, - Value: float64(32), OriginalString: "32", }, }, @@ -25588,7 +25554,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1852, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -26871,7 +26836,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1960, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, ElseFodder: ast.Fodder{ @@ -27317,7 +27281,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1960, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, ElseFodder: ast.Fodder{ @@ -27833,7 +27796,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1949, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -27947,7 +27909,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1949, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -28062,7 +28023,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1949, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -28153,7 +28113,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p1949, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -31146,7 +31105,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p2291, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -31610,7 +31568,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p2291, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -40310,7 +40267,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3116, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -41450,7 +41406,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3214, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -41758,7 +41713,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3240, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -42603,7 +42557,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3316, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -42918,7 +42871,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3342, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -45870,7 +45822,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3598, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -46079,7 +46030,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3618, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -46286,7 +46236,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3633, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -47207,7 +47156,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3715, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -47581,7 +47529,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3746, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -47955,7 +47902,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3777, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -48329,7 +48275,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3808, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -48703,7 +48648,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3839, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -49930,7 +49874,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3937, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -50620,7 +50563,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3997, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -50709,7 +50651,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3997, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -50733,7 +50674,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p3997, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -50990,7 +50930,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4027, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -51079,7 +51018,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4027, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -51103,7 +51041,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4027, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -51360,7 +51297,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4057, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -51449,7 +51385,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4057, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -51473,7 +51408,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4057, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -51730,7 +51664,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4087, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -51819,7 +51752,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4087, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -51843,7 +51775,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4087, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -52100,7 +52031,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4117, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -52189,7 +52119,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4117, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -52213,7 +52142,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4117, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -52470,7 +52398,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4147, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -52559,7 +52486,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4147, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -52583,7 +52509,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4147, FreeVars: nil, }, - Value: float64(5), OriginalString: "5", }, }, @@ -52840,7 +52765,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4177, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -52929,7 +52853,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4177, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -52953,7 +52876,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4177, FreeVars: nil, }, - Value: float64(6), OriginalString: "6", }, }, @@ -53210,7 +53132,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4207, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -53299,7 +53220,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4207, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -53323,7 +53243,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4207, FreeVars: nil, }, - Value: float64(7), OriginalString: "7", }, }, @@ -53580,7 +53499,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4237, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -53669,7 +53587,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4237, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -53693,7 +53610,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4237, FreeVars: nil, }, - Value: float64(8), OriginalString: "8", }, }, @@ -53950,7 +53866,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4267, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -54039,7 +53954,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4267, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -54063,7 +53977,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4267, FreeVars: nil, }, - Value: float64(9), OriginalString: "9", }, }, @@ -54396,7 +54309,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4303, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -55035,7 +54947,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4360, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -55962,7 +55873,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4392, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -56822,7 +56732,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4517, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -57137,7 +57046,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4540, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -57452,7 +57360,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4563, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -57767,7 +57674,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4586, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -58082,7 +57988,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4609, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -58397,7 +58302,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4632, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -58712,7 +58616,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4655, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -59027,7 +58930,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4678, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -59342,7 +59244,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4701, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -59657,7 +59558,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4724, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -59972,7 +59872,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4747, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -60287,7 +60186,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4770, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -60602,7 +60500,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p4793, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -63826,7 +63723,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5066, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -64355,7 +64251,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5111, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -64598,7 +64493,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5137, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -64931,7 +64825,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5164, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -65091,7 +64984,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5182, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -66557,7 +66449,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5315, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -67248,7 +67139,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5367, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -67565,7 +67455,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5406, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -67815,7 +67704,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5416, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, ElseFodder: ast.Fodder{}, @@ -67837,7 +67725,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5416, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -68704,7 +68591,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -68728,7 +68614,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, CommaFodder: ast.Fodder{}, @@ -68752,7 +68637,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, CommaFodder: ast.Fodder{}, @@ -68776,7 +68660,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, CommaFodder: ast.Fodder{}, @@ -68800,7 +68683,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, CommaFodder: ast.Fodder{}, @@ -68824,7 +68706,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(5), OriginalString: "5", }, CommaFodder: ast.Fodder{}, @@ -68848,7 +68729,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(6), OriginalString: "6", }, CommaFodder: ast.Fodder{}, @@ -68872,7 +68752,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(7), OriginalString: "7", }, CommaFodder: ast.Fodder{}, @@ -68896,7 +68775,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(8), OriginalString: "8", }, CommaFodder: ast.Fodder{}, @@ -68920,7 +68798,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5508, FreeVars: nil, }, - Value: float64(9), OriginalString: "9", }, CommaFodder: nil, @@ -69680,7 +69557,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5568, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -69955,7 +69831,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5596, FreeVars: nil, }, - Value: float64(16), OriginalString: "16", }, }, @@ -70162,7 +70037,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5568, FreeVars: nil, }, - Value: float64(16), OriginalString: "16", }, CommaFodder: nil, @@ -70415,7 +70289,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5621, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -70734,7 +70607,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5660, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -71010,7 +70882,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5670, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, ElseFodder: ast.Fodder{}, @@ -71032,7 +70903,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5670, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -71107,7 +70977,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5670, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, ElseFodder: ast.Fodder{}, @@ -71129,7 +70998,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5670, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -72220,7 +72088,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5784, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -72550,7 +72417,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5813, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -72716,7 +72582,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5831, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -72784,7 +72649,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5831, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -73051,7 +72915,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5846, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -73671,7 +73534,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5909, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -73741,7 +73603,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5909, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, ElseFodder: ast.Fodder{}, @@ -73763,7 +73624,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5909, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -74247,7 +74107,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5950, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -74321,7 +74180,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5950, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -74460,7 +74318,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5873, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -74976,7 +74833,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6027, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -75035,7 +74891,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6008, FreeVars: nil, }, - Value: float64(0.5), OriginalString: "0.5", }, }, @@ -75192,7 +75047,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p5873, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -75351,7 +75205,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6054, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -75421,7 +75274,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6054, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -76026,7 +75878,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6106, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -76049,7 +75900,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6106, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, ElseFodder: ast.Fodder{}, @@ -76507,7 +76357,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6154, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: nil, @@ -76789,7 +76638,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6175, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, CommaFodder: ast.Fodder{}, @@ -76813,7 +76661,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6175, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -76883,7 +76730,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6175, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -77071,7 +76917,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6188, FreeVars: nil, }, - Value: float64(324), OriginalString: "324", }, }, @@ -77184,7 +77029,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6188, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -77301,7 +77145,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6215, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -77369,7 +77212,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6215, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -77556,7 +77398,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6236, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -78507,7 +78348,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6309, FreeVars: nil, }, - Value: float64(6), OriginalString: "6", }, }, @@ -78684,7 +78524,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6324, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -78979,7 +78818,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6339, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -80228,7 +80066,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6442, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: ast.Fodder{}, @@ -81400,7 +81237,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6535, FreeVars: nil, }, - Value: float64(8), OriginalString: "8", }, CommaFodder: ast.Fodder{}, @@ -85969,7 +85805,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6930, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, CommaFodder: nil, @@ -86134,7 +85969,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6295, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -86785,7 +86619,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6955, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -86956,7 +86789,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7011, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, CommaFodder: ast.Fodder{}, @@ -87024,7 +86856,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7011, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -88429,7 +88260,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p6295, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -90396,7 +90226,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7295, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -90803,7 +90632,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7333, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -91921,7 +91749,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7421, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -95000,7 +94827,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7664, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -95180,7 +95006,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7691, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -96139,7 +95964,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7775, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -98661,7 +98485,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p7990, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -99040,7 +98863,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8026, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -99064,7 +98886,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8026, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -99383,7 +99204,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8054, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -99580,7 +99400,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8068, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -99604,7 +99423,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8068, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -99910,7 +99728,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8094, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -100277,7 +100094,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8112, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -100595,7 +100411,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8142, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -101331,7 +101146,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8205, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -101500,7 +101314,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8235, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -103939,7 +103752,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8409, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -104547,7 +104359,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8462, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -104577,7 +104388,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8462, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, ElseFodder: ast.Fodder{ @@ -104670,7 +104480,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8462, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -104719,7 +104528,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8462, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -104749,7 +104557,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p8462, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -111966,7 +111773,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9055, FreeVars: nil, }, - Value: float64(32), OriginalString: "32", }, }, @@ -112054,7 +111860,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9055, FreeVars: nil, }, - Value: float64(127), OriginalString: "127", }, }, @@ -112122,7 +111927,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9055, FreeVars: nil, }, - Value: float64(159), OriginalString: "159", }, }, @@ -116997,7 +116801,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9589, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -117169,7 +116972,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9589, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -121549,7 +121351,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9898, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -121741,7 +121542,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9898, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -122385,7 +122185,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10029, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -122557,7 +122356,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10029, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -123358,7 +123156,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9898, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -123813,7 +123610,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10148, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -124406,7 +124202,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10148, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -124855,7 +124650,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10257, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -125027,7 +124821,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10257, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -126603,7 +126396,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p9898, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -127061,7 +126853,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10420, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -127723,7 +127514,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p10420, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -136173,7 +135963,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11216, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, RightBracketFodder: ast.Fodder{}, @@ -136405,7 +136194,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11226, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -136565,7 +136353,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11251, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, RightBracketFodder: ast.Fodder{}, @@ -136727,7 +136514,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11261, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, RightBracketFodder: ast.Fodder{}, @@ -136979,7 +136765,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11276, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, CommaFodder: nil, @@ -137173,7 +136958,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11276, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, CommaFodder: nil, @@ -139663,7 +139447,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11492, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -140067,7 +139850,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11538, FreeVars: nil, }, - Value: float64(252), OriginalString: "252", }, }, @@ -140091,7 +139873,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11538, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -140291,7 +140072,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11538, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -140315,7 +140095,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11538, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -140503,7 +140282,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11587, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -140706,7 +140484,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11492, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -141132,7 +140909,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(252), OriginalString: "252", }, }, @@ -141156,7 +140932,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -141377,7 +141152,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -141401,7 +141175,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -141555,7 +141328,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -141582,7 +141354,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(240), OriginalString: "240", }, }, @@ -141606,7 +141377,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -141825,7 +141595,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -141852,7 +141621,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(15), OriginalString: "15", }, }, @@ -141876,7 +141644,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11626, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -142064,7 +141831,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11715, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -142451,7 +142217,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(252), OriginalString: "252", }, }, @@ -142475,7 +142240,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -142696,7 +142460,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -142720,7 +142483,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -142874,7 +142636,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -142901,7 +142662,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(240), OriginalString: "240", }, }, @@ -142925,7 +142685,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -143165,7 +142924,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -143192,7 +142950,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(15), OriginalString: "15", }, }, @@ -143216,7 +142973,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -143370,7 +143126,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -143397,7 +143152,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(192), OriginalString: "192", }, }, @@ -143421,7 +143175,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(6), OriginalString: "6", }, }, @@ -143619,7 +143372,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -143646,7 +143398,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11734, FreeVars: nil, }, - Value: float64(63), OriginalString: "63", }, }, @@ -143802,7 +143553,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11856, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -144166,7 +143916,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11886, FreeVars: nil, }, - Value: float64(256), OriginalString: "256", }, }, @@ -144461,7 +144210,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11916, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -144853,7 +144601,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11926, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, CommaFodder: nil, @@ -144886,7 +144633,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p11926, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -145648,7 +145394,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12007, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -145827,7 +145572,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12007, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -145857,7 +145601,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12007, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -146073,7 +145816,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12045, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -146377,7 +146119,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12065, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -146407,7 +146148,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12065, FreeVars: nil, }, - Value: float64(15), OriginalString: "15", }, }, @@ -146431,7 +146171,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12065, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -146610,7 +146349,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12065, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -146640,7 +146378,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12065, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -146858,7 +146595,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12109, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -147162,7 +146898,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12129, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -147192,7 +146927,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12129, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -147216,7 +146950,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12129, FreeVars: nil, }, - Value: float64(6), OriginalString: "6", }, }, @@ -147373,7 +147106,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12129, FreeVars: nil, }, - Value: float64(3), OriginalString: "3", }, }, @@ -147541,7 +147273,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12170, FreeVars: nil, }, - Value: float64(4), OriginalString: "4", }, }, @@ -147827,7 +147558,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12198, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -149048,7 +148778,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12297, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -149617,7 +149346,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12328, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -149713,7 +149441,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12372, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, Fun: nil, @@ -150083,7 +149810,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12404, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -150391,7 +150117,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12413, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -153071,7 +152796,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12674, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -153410,7 +153134,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12703, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -153651,7 +153374,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12731, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -153675,7 +153397,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12731, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -154083,7 +153804,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12316, FreeVars: nil, }, - Value: float64(30), OriginalString: "30", }, }, @@ -154403,7 +154123,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12794, FreeVars: nil, }, - Value: float64(2), OriginalString: "2", }, }, @@ -155603,7 +155322,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12886, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -155977,7 +155695,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p12920, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -157248,7 +156965,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13015, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -158980,7 +158696,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13193, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -159049,7 +158764,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13193, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -159485,7 +159199,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13237, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -159875,7 +159588,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13270, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -160171,7 +159883,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13302, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -160195,7 +159906,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13302, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -161347,7 +161057,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13401, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -161416,7 +161125,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13401, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -162064,7 +161772,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13465, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -162331,7 +162038,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13486, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -162501,7 +162207,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13506, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -162525,7 +162230,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13506, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -163936,7 +163640,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13625, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -164005,7 +163708,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13625, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -164530,7 +164232,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13677, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -164920,7 +164621,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13710, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -165091,7 +164791,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13730, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -165115,7 +164814,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p13730, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -171096,7 +170794,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14252, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -171240,7 +170937,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14268, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -172713,7 +172409,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14398, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -172857,7 +172552,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14414, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -173705,7 +173399,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14478, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -174465,7 +174158,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14523, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -174797,7 +174489,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14523, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -177945,7 +177636,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14756, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -178013,7 +177703,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14756, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -178676,7 +178365,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p14926, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -179592,7 +179280,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15005, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -179764,7 +179451,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15005, FreeVars: nil, }, - Value: float64(1), OriginalString: "1", }, }, @@ -180027,7 +179713,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15045, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -180095,7 +179780,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15053, FreeVars: nil, }, - Value: float64(16), OriginalString: "16", }, }, @@ -181093,7 +180777,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15164, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -181312,7 +180995,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15192, FreeVars: nil, }, - Value: float64(10), OriginalString: "10", }, }, @@ -181512,7 +181194,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15216, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, }, @@ -182219,7 +181900,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15292, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: nil, @@ -182930,7 +182610,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15359, FreeVars: nil, }, - Value: float64(0), OriginalString: "0", }, CommaFodder: ast.Fodder{}, @@ -182954,7 +182633,6 @@ var _StdAst = &ast.DesugaredObject{ Ctx: p15361, FreeVars: nil, }, - Value: float64(63), OriginalString: "63", }, CommaFodder: nil, diff --git a/cpp-jsonnet b/cpp-jsonnet index 7d624c1..76d6ecd 160000 --- a/cpp-jsonnet +++ b/cpp-jsonnet @@ -1 +1 @@ -Subproject commit 7d624c1cb2ef095c1585bd25a8be883fb16f9e73 +Subproject commit 76d6ecd32e253a5429ad9568538df7ec07f470fc diff --git a/internal/parser/parser.go b/internal/parser/parser.go index b47d071..3ec97e9 100644 --- a/internal/parser/parser.go +++ b/internal/parser/parser.go @@ -19,7 +19,6 @@ package parser import ( "fmt" - "strconv" "github.com/google/go-jsonnet/ast" "github.com/google/go-jsonnet/internal/errors" @@ -870,15 +869,8 @@ func (p *parser) parseTerminal() (ast.Node, error) { // Literals case tokenNumber: - // This shouldn't fail as the lexer should make sure we have good input but - // we handle the error regardless. - num, err := strconv.ParseFloat(tok.data, 64) - if err != nil { - return nil, errors.MakeStaticError("Could not parse floating point number.", tok.loc) - } return &ast.LiteralNumber{ NodeBase: ast.NewNodeBaseLoc(tok.loc, tok.fodder), - Value: num, OriginalString: tok.data, }, nil case tokenStringDouble, tokenStringSingle, diff --git a/interpreter.go b/interpreter.go index 9986eda..81abff9 100644 --- a/interpreter.go +++ b/interpreter.go @@ -22,6 +22,7 @@ import ( "math" "reflect" "sort" + "strconv" "github.com/google/go-jsonnet/ast" "github.com/google/go-jsonnet/astgen" @@ -476,7 +477,14 @@ func (i *interpreter) evaluate(a ast.Node, tc tailCallStatus) (value, error) { return makeValueNull(), nil case *ast.LiteralNumber: - return makeValueNumber(node.Value), nil + // Since the lexer ensures that OriginalString is of + // the right form, this will only fail if the number is + // too large to fit in a double. + num, err := strconv.ParseFloat(node.OriginalString, 64) + if err != nil { + return nil, i.Error(fmt.Sprintf("overflow"), trace) + } + return makeValueNumber(num), nil case *ast.LiteralString: return makeValueString(node.Value), nil