ref: 198328642e47b87793c3ef30345fe5037ddd3901
parent: 13fc8b87e859b6e2aabb9b6dcd5698699858d624
author: Lennart Augustsson <augustss@Lennarts-Mini.augustsson.net>
date: Sat Nov 16 16:58:13 EST 2024
Work around cabal problem.
--- a/MicroHs.cabal
+++ b/MicroHs.cabal
@@ -41,13 +41,15 @@
data-files:
src/runtime/*.c
src/runtime/*.h
+-- I would like to have these two only for ghc, but I can't figure out how.
+ lib/**/*.hs --NOT_MHS
+ lib/**/*.hs-boot --NOT_MHS
+-- These files must not be installed for mhs!
-- Cabal doesn't seem to understand this, so it never copies
-- these files.
--if impl(ghc)
--- data-files:
- lib/**/*.hs
- lib/**/*.hs-boot
+--xMHS if !impl(mhs)
source-repository head
type: git
@@ -121,3 +123,4 @@
if impl(mhs)
hs-source-dirs: mhs src
build-depends: base >= 0.1 && < 10.0,
+
--- a/generated/mcabal.c
+++ b/generated/mcabal.c
@@ -1,5 +1,5 @@
static unsigned char data[] = {-122,76,90,49,214,135,0,0,21,118,55,46,48,10,57,51,52,10,65,32,
+122,76,90,49,234,135,0,0,21,118,55,46,48,10,57,51,52,10,65,32,
95,48,32,95,50,51,32,64,95,50,53,160,8,1,54,49,128,5,26,55,
32,64,64,85,32,66,32,80,32,95,54,50,53,32,64,64,66,32,83,32,
67,39,32,83,39,32,96,10,31,64,95,50,54,32,95,51,50,32,64,95,
@@ -10,307 +10,308 @@
99,108,101,97,192,137,224,54,34,4,102,101,116,99,104,224,54,41,3,104,
101,108,112,224,53,41,6,105,110,115,116,97,108,108,224,56,41,4,112,97,
114,115,101,160,54,1,66,32,65,104,1,67,32,224,47,19,4,117,112,100,
-97,116,160,48,161,217,4,64,95,55,51,48,96,7,2,56,52,57,96,7,
-2,57,51,49,96,7,2,54,49,56,128,23,0,56,128,7,0,57,64,84,
-96,15,96,39,23,64,64,58,57,51,51,32,64,10,65,32,90,32,83,32,
-95,53,57,57,32,64,95,53,50,66,59,0,58,96,43,1,10,65,64,192,
-6,67,39,32,95,49,55,57,130,97,192,62,1,95,57,64,116,0,58,96,
-106,128,38,194,140,4,64,95,56,53,50,160,254,224,19,1,1,51,48,64,
-171,6,83,39,32,66,32,64,66,96,83,3,83,32,64,67,192,8,192,24,
-97,1,3,64,66,32,66,224,113,4,64,20,6,66,32,95,54,51,32,64,
-65,29,4,57,53,32,64,35,96,201,64,38,2,52,52,32,225,39,10,25,
-78,111,114,109,97,108,105,122,101,100,32,67,97,98,97,108,32,102,105,108,
-101,58,92,49,48,38,161,59,6,49,54,52,32,95,56,53,97,64,224,98,
-0,64,233,64,101,128,129,2,50,54,56,224,129,1,64,27,0,67,160,25,
-0,83,64,171,128,10,64,1,0,90,96,67,224,13,5,129,250,128,213,192,
-27,64,231,160,10,128,245,225,232,19,8,101,120,101,99,117,116,97,98,108,
-194,29,225,60,2,66,36,64,251,2,50,55,55,64,195,0,54,99,241,67,
-150,2,95,56,53,65,188,65,234,97,197,224,121,0,96,187,226,89,21,6,
-108,105,98,114,97,114,121,224,109,0,224,110,22,65,56,224,110,3,162,81,
-65,89,0,49,196,148,0,49,98,150,64,39,0,55,100,52,2,95,56,55,
-66,136,0,73,129,81,1,66,32,96,91,2,95,55,55,65,215,9,39,32,
-95,55,54,57,32,95,55,56,64,58,2,55,56,52,97,107,3,95,55,56,
-55,66,147,0,48,64,14,0,95,64,122,130,231,98,207,66,125,0,48,98,
-125,129,93,96,87,193,130,225,140,2,224,200,3,226,202,5,226,88,11,131,
-74,226,86,14,0,73,131,231,3,105,110,103,32,161,47,0,32,225,158,3,
-128,2,224,97,3,65,26,1,51,32,224,27,17,0,52,224,27,18,0,53,
-96,27,3,95,57,50,56,193,2,96,225,96,0,0,58,97,113,11,10,65,
-32,85,32,75,51,32,75,52,32,65,64,26,0,58,96,43,225,16,110,226,
-177,1,225,19,91,66,133,225,19,9,0,55,225,19,4,102,162,0,58,96,
-43,97,19,131,183,225,16,3,192,7,227,209,4,97,35,225,46,11,132,5,
-100,165,160,5,0,83,71,23,226,240,9,224,98,7,196,221,224,208,6,225,
-109,11,101,185,228,215,17,225,111,2,0,67,100,211,0,115,161,108,2,95,
-53,54,101,18,161,58,192,232,229,184,4,0,53,100,36,96,22,228,219,2,
-99,222,2,95,53,55,160,187,64,0,160,152,64,131,1,64,67,70,145,0,
-53,69,230,131,127,231,152,2,7,45,115,111,117,114,99,101,115,128,129,224,
-40,32,229,78,0,3,39,32,95,53,104,169,68,73,0,56,231,243,4,2,
-98,105,116,224,45,0,129,196,0,53,225,196,62,97,183,69,201,128,228,134,
-223,225,199,14,224,75,14,230,44,0,198,16,137,88,230,236,0,65,205,1,
-57,50,225,142,0,192,119,225,253,68,6,105,110,99,108,117,100,101,226,3,
-13,226,4,5,98,172,226,10,12,130,196,64,197,2,95,54,48,224,243,1,
-64,147,2,95,55,55,64,140,225,212,1,8,79,32,79,32,35,52,54,32,
-64,67,85,99,89,232,254,3,96,140,3,45,100,105,114,225,181,2,226,69,
-29,169,58,0,45,160,67,226,76,24,224,47,13,226,84,27,160,49,226,86,
-5,0,52,228,27,119,162,63,233,41,1,66,57,225,106,2,224,100,1,226,
-64,69,3,100,97,116,97,228,65,48,136,77,98,51,224,170,5,128,0,225,
-249,29,64,129,0,45,96,129,225,243,23,224,41,7,225,236,26,64,50,225,
-233,5,138,233,160,154,234,171,1,0,57,64,244,193,72,1,95,50,72,131,
-0,50,97,69,104,147,0,53,73,45,128,102,0,57,105,4,2,57,50,48,
-74,252,160,34,64,87,139,39,7,80,32,95,57,49,49,32,64,237,101,10,
-65,86,1,35,52,97,91,0,67,234,245,0,0,66,233,143,0,224,30,2,
-64,95,6,49,50,32,95,56,57,51,64,4,74,161,1,57,53,205,105,224,
-116,1,0,67,167,28,224,94,7,160,219,64,66,64,74,64,64,96,82,1,
-48,49,64,108,0,79,225,164,0,192,73,224,110,13,65,208,0,55,225,208,
-1,224,118,0,0,58,96,8,172,18,128,223,234,79,9,128,53,110,119,3,
-49,54,56,32,225,143,1,11,92,51,52,38,46,46,47,77,105,99,114,111,
-107,145,3,47,115,114,99,224,14,3,7,82,101,103,101,120,46,104,115,64,
-40,5,44,50,52,58,49,50,129,190,128,210,65,117,101,86,65,134,128,150,
-65,247,0,58,96,24,99,192,0,89,132,229,0,85,97,205,65,31,163,49,
-65,39,5,67,32,60,32,64,35,98,194,237,155,6,128,25,74,93,224,25,
-0,161,191,128,25,108,31,96,85,162,32,1,56,57,138,123,192,20,160,22,
-1,57,48,141,98,0,50,130,141,224,30,8,131,253,224,30,1,229,121,0,
-224,137,6,97,106,224,137,12,162,32,0,85,64,15,105,2,79,233,65,6,
-96,188,128,25,224,246,6,129,35,129,230,167,234,162,32,96,141,166,250,0,
-39,66,25,224,37,2,0,67,64,21,64,18,227,210,2,128,119,140,69,96,
-5,1,95,57,78,91,2,95,57,48,64,150,130,249,96,0,0,58,97,160,
-130,36,0,80,66,160,76,51,100,87,3,95,50,55,56,160,10,0,58,96,
-60,105,168,0,83,225,162,9,226,221,0,225,155,1,96,146,225,148,5,80,
-220,131,177,102,167,160,234,64,23,3,95,57,49,54,64,4,161,105,80,184,
-1,55,53,224,16,2,224,95,6,166,229,225,106,7,2,85,32,75,69,83,
-160,83,196,208,1,53,52,225,85,0,224,97,3,2,75,32,95,143,130,96,
-219,138,132,64,158,64,117,109,40,97,247,0,58,64,152,64,26,3,95,50,
-55,50,192,76,64,98,0,58,96,37,65,52,75,178,196,30,69,101,3,67,
-32,61,61,193,251,99,166,160,224,97,243,0,58,96,7,100,211,65,146,228,
-121,2,2,95,50,55,166,20,64,130,103,217,161,170,224,20,15,225,18,0,
-224,29,4,97,214,227,238,1,224,29,11,0,64,103,30,128,121,96,182,134,
-208,192,185,130,23,132,146,195,19,64,38,226,107,0,194,154,64,0,107,202,
-96,4,128,152,0,58,96,27,172,206,1,80,32,128,76,0,80,96,23,133,
-116,132,185,192,43,132,157,64,124,68,153,66,120,96,169,2,95,56,57,70,
-77,96,21,2,51,56,50,97,40,131,38,0,67,66,162,242,202,0,2,95,
-57,48,177,62,129,20,160,55,162,102,2,54,48,50,192,249,192,18,2,57,
-48,52,64,4,98,5,0,66,134,33,70,192,0,57,225,93,7,102,68,225,
-218,15,170,47,197,156,0,85,141,180,194,74,196,220,1,80,32,96,40,0,
-85,64,231,64,165,224,231,12,128,110,224,231,27,135,204,128,223,192,55,224,
-231,50,192,72,224,231,19,98,177,224,231,15,69,60,65,206,84,96,96,83,
-226,84,21,131,106,206,225,200,10,224,38,14,226,159,27,224,74,24,128,38,
-224,74,21,97,235,224,74,25,128,38,224,74,21,131,17,224,74,24,128,38,
-224,74,21,198,29,224,74,22,128,38,0,67,64,74,192,71,224,29,2,103,
-5,133,5,224,19,4,231,227,52,3,49,53,58,53,135,226,101,64,0,52,
-148,156,230,228,1,244,15,0,224,114,5,0,52,84,178,160,36,1,95,49,
-226,154,2,128,0,224,75,31,114,80,224,75,9,1,55,54,98,130,224,80,
-2,224,81,32,103,142,224,81,68,64,32,224,239,26,0,50,224,76,9,102,
-174,129,225,224,80,3,103,41,160,80,233,45,0,128,44,161,242,0,66,73,
-207,100,81,150,90,224,112,4,224,126,10,224,203,32,100,40,224,203,11,147,
-211,96,94,1,55,53,96,121,103,93,2,55,54,49,224,11,1,1,53,56,
-224,11,2,100,119,96,11,1,49,48,225,90,0,2,95,49,48,224,47,0,
-0,58,96,6,196,79,0,56,86,213,101,10,102,223,103,234,193,154,0,53,
-100,34,96,192,193,19,0,90,134,234,224,214,4,96,21,64,58,64,66,2,
-90,32,80,64,27,226,249,51,3,55,58,49,56,130,249,225,59,3,65,46,
-160,118,133,159,224,163,3,225,32,4,65,50,193,32,128,11,129,32,160,11,
-97,32,96,11,161,32,160,11,224,47,0,0,58,96,6,65,32,2,51,50,
-56,168,61,0,85,192,119,160,144,2,95,51,50,96,71,99,115,1,51,51,
-96,71,64,11,0,58,96,6,136,223,0,55,77,248,0,95,65,95,0,58,
-70,35,230,170,0,67,91,134,170,135,190,171,56,105,59,64,133,109,221,0,
-58,102,118,96,50,0,90,64,126,64,16,135,193,3,95,50,55,32,196,137,
-235,197,71,228,86,16,137,191,130,153,232,228,1,96,0,228,67,21,224,56,
-7,1,49,53,74,108,224,61,1,228,49,23,224,63,25,224,236,12,236,40,
-29,228,83,14,224,236,24,228,63,19,170,233,228,62,15,106,214,224,86,5,
-224,99,7,228,38,23,224,158,7,99,194,192,0,1,95,51,98,199,64,34,
-0,58,96,6,226,49,0,227,226,6,206,155,99,101,160,180,227,99,0,187,
-49,224,35,1,128,87,128,105,0,58,96,6,107,143,160,163,235,91,0,236,
-128,3,136,193,199,46,224,194,4,128,188,141,3,67,18,169,34,169,130,239,
-90,0,1,56,57,76,22,110,82,195,59,128,90,64,20,164,195,131,59,125,
-213,227,69,0,79,166,185,13,0,58,96,89,123,194,128,54,195,157,1,80,
-32,96,137,128,20,227,156,2,64,237,128,20,131,156,138,69,250,23,17,3,
-46,103,105,116,132,172,244,226,3,0,67,91,41,3,55,32,95,50,145,69,
-0,53,64,6,69,21,210,238,185,170,130,17,2,56,32,95,74,201,1,95,
-53,143,36,98,175,114,182,1,95,56,69,161,146,91,178,222,160,43,96,108,
-64,12,1,56,57,98,116,1,53,55,65,72,1,95,55,64,166,128,16,173,
-125,96,97,145,196,224,19,0,101,60,224,137,4,0,58,96,33,100,241,77,
-150,2,64,95,57,192,89,0,58,96,6,132,207,84,12,1,95,53,80,252,
-0,58,64,152,128,21,0,89,97,199,98,5,78,208,1,56,55,66,33,201,
-71,107,88,224,31,0,243,159,26,130,118,243,157,14,0,66,95,32,6,32,
-112,97,99,107,97,103,249,68,1,224,93,3,225,45,0,1,95,56,91,39,
-175,194,98,127,97,9,224,37,5,1,95,53,110,125,224,66,1,227,165,0,
-65,128,249,89,3,192,19,64,171,110,62,64,66,97,103,0,50,111,94,96,
-66,224,222,31,244,126,17,0,80,160,218,14,110,111,116,32,102,111,117,110,
-100,44,32,114,117,110,110,84,142,0,39,127,175,160,244,0,67,180,59,4,
-79,32,35,51,57,242,138,0,64,112,158,203,242,204,3,192,136,225,124,60,
-151,89,225,122,0,225,40,7,2,95,56,54,66,77,0,85,195,124,129,136,
-130,116,73,134,191,144,1,64,58,127,34,163,113,160,21,226,47,1,129,180,
-225,203,7,68,96,173,57,255,17,6,119,160,226,113,0,254,69,2,192,34,
-225,240,9,226,24,0,64,35,194,166,224,83,0,184,140,245,225,18,226,117,
-4,160,39,248,70,10,225,100,11,98,46,225,100,15,0,70,65,228,65,100,
-225,98,0,192,170,160,103,226,197,2,226,159,3,128,105,66,160,126,215,192,
-117,1,95,54,92,239,192,197,64,114,0,56,126,56,228,10,2,227,33,9,
-224,88,4,160,87,224,196,12,224,86,2,224,201,9,1,85,110,67,167,64,
-202,160,201,98,157,98,181,224,50,15,226,89,3,77,182,3,95,56,56,53,
-68,81,0,56,194,75,225,78,40,6,65,108,114,101,97,100,121,224,88,4,
-195,59,229,193,2,5,116,97,114,46,103,122,160,33,162,176,224,38,22,97,
-128,96,204,0,54,95,187,225,7,7,86,35,245,237,2,1,95,53,81,124,
-2,95,54,55,197,127,227,12,2,0,58,99,177,146,165,224,85,0,192,234,
-97,166,161,1,128,105,224,106,37,0,58,96,204,128,92,160,76,0,53,75,
-252,224,213,1,165,77,120,56,0,58,96,104,216,4,225,245,0,1,95,50,
-149,211,225,238,19,5,116,97,114,32,45,67,225,235,34,4,45,120,32,45,
-102,225,149,0,0,58,97,234,1,10,65,236,50,2,8,104,116,116,112,115,
-58,47,47,104,128,160,12,46,104,97,115,107,101,108,108,46,111,114,103,47,
-160,180,1,47,34,70,137,66,209,248,184,11,0,56,70,243,227,9,0,198,
-239,227,186,2,229,205,0,0,54,152,7,117,45,173,45,224,181,13,2,103,
-101,116,165,162,7,73,110,102,111,58,32,110,111,230,141,8,224,113,1,0,
-56,129,130,178,17,136,17,130,184,233,84,0,161,210,161,1,136,111,166,72,
-228,178,1,117,100,128,221,230,150,6,230,147,22,228,36,5,73,127,229,231,
-2,224,212,1,0,78,224,196,1,3,108,105,115,116,230,114,2,14,117,112,
-100,97,116,101,39,32,99,111,109,109,97,110,100,96,226,3,67,32,95,55,
-74,28,229,225,0,232,192,3,0,54,64,129,0,55,67,184,136,131,65,88,
-106,175,98,233,226,131,6,1,95,55,100,156,0,58,97,168,102,11,179,144,
-129,159,0,80,171,102,133,156,241,152,3,192,8,98,101,0,54,64,106,1,
-95,54,72,142,3,64,95,51,54,89,173,0,56,170,187,1,49,55,133,41,
-0,80,77,62,67,31,79,188,224,33,1,97,166,0,55,149,53,2,85,32,
-65,128,205,2,95,50,53,243,189,0,119,139,1,35,54,132,235,192,235,226,
-36,1,227,12,17,68,116,162,39,130,22,3,95,49,54,52,65,38,0,55,
-160,4,0,50,77,201,128,0,1,95,52,74,159,0,58,97,49,105,127,64,
-96,0,51,64,46,128,165,2,95,51,54,75,225,160,11,88,34,0,48,64,
-110,67,150,0,52,64,20,242,117,6,98,50,5,52,56,57,32,95,52,73,
-209,224,147,1,1,98,105,161,192,64,49,234,210,22,2,84,114,117,160,184,
-130,52,224,41,17,3,70,97,108,115,192,227,1,51,54,66,168,99,104,128,
-159,172,83,224,17,2,184,47,160,247,224,227,0,0,58,96,6,130,251,227,
-192,2,0,53,123,166,224,19,4,130,73,231,166,0,232,19,17,237,109,0,
-231,140,21,174,11,225,200,15,11,78,111,114,109,97,108,105,122,101,100,32,
-67,80,166,126,15,4,58,92,49,48,38,225,215,3,1,56,53,168,84,227,
-165,2,64,101,128,129,2,50,54,56,224,129,1,98,196,160,25,255,55,4,
-191,46,224,13,6,132,11,231,250,6,224,10,1,128,245,225,159,19,8,101,
-120,101,99,117,116,97,98,108,255,213,1,232,227,2,111,27,151,33,0,56,
-67,206,1,95,54,104,220,1,95,56,76,77,103,10,89,38,232,116,3,158,
-215,224,112,18,6,108,105,98,114,97,114,121,231,198,2,224,110,20,112,90,
-224,110,2,193,72,236,159,2,0,50,155,140,96,30,100,114,2,95,56,55,
-68,55,110,93,230,168,1,0,55,121,209,0,39,84,79,3,57,32,95,55,
-69,76,1,95,55,104,236,64,28,71,5,1,95,53,81,131,228,184,0,2,
-95,56,52,156,169,0,58,108,178,140,225,99,221,65,211,67,226,224,213,1,
-5,110,111,32,103,108,111,66,0,6,115,101,99,116,105,111,110,160,223,75,
-111,69,229,0,89,106,200,132,98,129,214,225,197,2,224,10,2,234,52,2,
-130,5,225,76,21,128,115,232,185,1,68,239,161,43,96,0,0,58,97,9,
-159,92,80,85,0,90,69,95,99,79,64,148,111,159,118,214,65,42,224,152,
-10,225,154,3,143,161,224,140,34,203,120,100,123,0,39,166,161,0,79,97,
-130,0,79,101,194,3,95,55,51,52,225,66,2,226,24,3,69,95,83,26,
-225,96,2,1,97,109,130,161,64,170,172,184,217,143,96,207,0,54,161,161,
-215,168,96,199,64,197,224,196,7,64,23,236,231,61,160,177,0,32,226,203,
-4,227,142,8,235,45,4,2,95,56,53,68,225,224,147,4,224,141,11,228,
-19,1,1,95,56,157,158,0,53,96,56,135,179,1,56,55,111,103,66,173,
-218,4,0,58,99,26,126,17,5,75,50,32,75,52,32,193,28,0,58,96,
-44,225,26,103,228,86,1,225,29,92,80,100,227,96,1,114,114,224,228,0,
-224,7,1,66,85,227,28,1,2,95,53,53,131,222,161,82,66,212,225,82,
-7,137,112,72,27,97,81,226,112,0,0,58,96,46,233,139,9,128,74,0,
-54,145,170,160,74,64,127,240,25,22,101,167,83,113,0,56,72,75,234,104,
-28,9,100,101,112,101,110,100,101,110,99,121,112,11,9,105,110,115,116,97,
-108,108,101,100,58,225,111,0,193,186,2,95,56,54,96,244,161,59,0,56,
-71,132,0,83,65,9,0,53,64,245,64,170,0,49,97,117,129,106,107,8,
-104,74,0,50,82,243,173,199,240,46,4,0,58,97,115,72,138,6,53,55,
-54,32,75,32,85,228,48,0,129,210,96,240,128,43,224,14,5,224,11,2,
-1,95,53,236,233,0,64,79,210,42,3,95,57,51,49,98,107,128,157,1,
-54,56,224,157,0,1,79,32,134,12,96,132,0,58,96,196,224,129,7,128,
-1,135,23,224,96,1,0,58,96,69,128,93,161,166,1,95,56,106,118,101,
-45,193,185,161,29,240,169,8,236,22,3,0,58,97,73,232,133,6,3,67,
-32,95,52,66,58,1,56,54,70,154,225,234,14,221,237,64,48,253,124,0,
-225,229,26,22,115,101,116,67,117,114,114,101,110,116,68,105,114,101,99,116,
-111,114,121,32,102,97,105,225,231,4,0,58,96,168,10,10,65,32,94,99,
-104,100,105,114,32,58,96,137,160,165,109,157,0,56,74,167,136,90,226,169,
-1,0,67,65,95,64,9,236,4,6,224,190,14,69,247,103,14,0,95,153,
-78,230,255,6,0,103,224,168,9,169,0,73,214,96,224,0,49,162,89,8,
-95,49,55,50,32,35,49,48,48,150,206,0,58,97,140,64,190,5,103,101,
-116,99,119,100,64,191,131,118,161,146,117,174,73,134,118,157,64,14,228,6,
-0,65,119,0,52,133,29,160,74,131,149,0,85,229,0,2,0,58,99,83,
-224,20,1,227,197,4,67,169,172,88,228,50,11,204,83,137,82,0,83,103,
-149,113,196,224,5,3,67,184,243,60,28,99,74,225,233,15,4,67,114,101,
-97,116,69,57,8,112,97,116,104,32,109,111,100,117,229,58,4,229,19,2,
-224,2,0,224,112,3,67,208,73,154,1,95,53,129,111,130,97,227,126,0,
-194,9,0,54,141,103,224,28,4,224,145,15,224,131,8,224,77,0,208,130,
-224,19,2,239,197,16,4,119,104,101,114,101,235,15,1,224,50,26,18,105,
-109,112,111,114,116,32,68,97,116,97,46,86,101,114,115,105,111,110,224,63,
-36,0,118,128,51,3,32,58,58,32,160,62,1,59,32,192,19,5,61,32,
-109,97,107,101,160,22,224,218,1,160,215,209,91,64,91,237,142,1,88,70,
-99,174,0,53,73,65,67,201,68,80,224,111,8,225,39,7,224,158,5,0,
-79,66,241,229,66,1,224,193,21,2,103,101,116,64,253,0,68,67,204,14,
-58,32,73,79,32,70,105,108,101,80,97,116,104,59,32,224,26,2,6,61,
-32,114,101,116,117,114,224,198,1,226,173,0,193,158,192,101,224,203,0,238,
-85,0,224,42,1,179,230,1,95,56,71,12,230,94,2,2,97,116,97,128,
-87,224,185,6,192,0,224,105,4,242,135,0,130,125,224,70,1,1,46,104,
-114,54,96,33,224,236,14,64,215,1,115,95,224,37,0,79,147,78,125,164,
-114,143,97,82,190,103,75,0,35,67,72,234,30,20,96,0,0,58,104,71,
-99,216,200,11,126,149,96,4,224,17,4,195,231,204,36,96,198,225,23,0,
-67,212,240,143,2,64,31,78,135,172,39,224,126,2,243,35,3,96,199,227,
-35,0,226,8,10,243,140,9,226,84,26,160,214,134,202,168,144,112,145,0,
-58,109,28,251,194,6,0,80,68,115,239,96,0,0,80,155,173,175,92,155,
-166,185,212,64,6,64,59,2,49,52,51,197,111,1,53,51,130,230,2,49,
-57,50,81,180,97,128,141,97,68,208,64,42,0,53,229,248,2,0,67,78,
-245,225,189,0,160,30,88,117,0,50,192,228,2,95,49,52,64,22,66,127,
-0,56,124,217,0,35,64,242,160,25,96,20,109,227,2,49,53,48,192,11,
-0,58,96,6,192,150,253,79,1,196,246,224,161,17,226,243,0,224,167,8,
-0,83,237,150,4,224,38,6,224,175,4,226,14,3,69,81,224,190,1,131,
-62,192,190,224,64,17,197,252,224,60,17,225,42,27,104,43,193,42,96,0,
-193,47,110,164,161,47,64,11,0,58,96,6,193,47,146,207,226,210,2,225,
-45,17,225,42,13,3,70,105,101,108,178,9,224,228,81,2,53,52,48,71,
-18,224,222,0,225,224,56,1,73,102,225,219,47,0,53,72,66,225,213,46,
-225,166,4,225,213,53,106,116,161,213,64,11,0,58,96,6,1,10,65,95,
-108,202,184,94,37,68,65,0,54,160,91,115,125,86,60,3,95,56,53,49,
-133,45,229,98,10,1,46,99,227,164,1,233,184,7,5,110,111,32,80,75,
-71,128,33,114,188,128,38,154,241,234,252,1,88,142,224,56,5,7,109,117,
-108,116,105,112,108,101,224,62,12,132,151,213,181,1,95,56,74,51,69,207,
-64,21,137,141,102,63,213,162,0,55,88,224,1,95,50,109,143,128,6,0,
-58,96,50,160,39,133,181,73,131,129,131,187,142,243,249,12,193,252,75,90,
-117,242,224,18,0,0,55,151,81,226,0,1,242,16,49,240,122,1,225,20,
-6,5,99,109,100,80,97,114,180,240,2,58,56,52,134,133,234,12,2,2,
-95,54,51,95,146,65,192,96,79,127,41,64,85,67,189,66,139,0,51,96,
-36,135,7,0,89,170,122,192,253,146,22,241,136,2,65,239,135,28,96,28,
-225,21,1,224,36,45,173,49,224,36,22,97,69,224,36,0,225,199,0,224,
-34,2,127,88,224,0,2,103,207,0,39,242,59,1,103,231,2,57,49,32,
-117,92,3,95,52,48,54,231,237,5,129,167,226,191,2,1,45,45,97,79,
-72,0,226,221,0,195,207,184,66,0,58,97,74,97,68,0,51,87,152,98,
-112,224,10,2,0,56,65,0,1,95,54,130,97,0,54,124,248,165,58,65,
-138,101,58,4,56,32,95,54,52,98,3,97,131,0,49,96,35,108,175,224,
-25,0,71,105,224,40,4,242,191,3,242,254,1,64,155,1,95,54,119,149,
-78,26,64,165,160,13,104,54,0,58,96,140,119,202,79,110,160,171,64,154,
-1,95,54,73,170,224,4,16,224,146,2,224,156,10,64,141,4,64,95,55,
-49,48,226,143,3,2,111,109,109,198,244,2,95,56,48,99,39,0,56,64,
-45,224,66,4,224,76,30,245,185,4,128,145,96,82,1,95,50,67,63,96,
-65,163,20,128,98,224,99,43,246,142,7,224,180,5,224,81,43,12,115,111,
-117,114,99,101,45,114,101,112,111,115,105,238,151,2,224,88,56,3,102,108,
+97,116,160,48,161,217,4,64,95,55,51,48,96,7,2,56,53,49,96,7,
+1,57,51,128,7,2,54,49,56,128,23,0,56,128,7,0,57,64,84,96,
+15,0,57,128,113,21,58,57,51,51,32,64,10,65,32,90,32,83,32,95,
+53,57,57,32,64,95,53,50,66,59,0,58,96,43,1,10,65,64,192,6,
+67,39,32,95,49,55,57,130,97,192,62,1,95,57,64,116,0,58,96,106,
+128,38,194,140,64,135,0,50,160,254,224,19,1,1,51,48,64,171,6,83,
+39,32,66,32,64,66,96,83,3,83,32,64,67,192,8,192,24,97,1,3,
+64,66,32,66,224,113,4,64,20,6,66,32,95,54,51,32,64,65,29,4,
+57,53,32,64,35,96,201,64,38,2,52,52,32,225,39,10,25,78,111,114,
+109,97,108,105,122,101,100,32,67,97,98,97,108,32,102,105,108,101,58,92,
+49,48,38,161,59,6,49,54,52,32,95,56,53,97,64,224,98,0,64,233,
+64,101,128,129,2,50,54,56,224,129,1,64,27,0,67,160,25,0,83,64,
+171,128,10,64,1,0,90,96,67,224,13,5,129,250,128,213,192,27,64,231,
+160,10,128,245,225,232,19,8,101,120,101,99,117,116,97,98,108,194,29,225,
+60,2,66,36,64,251,2,50,55,55,64,195,0,54,99,241,67,150,2,95,
+56,53,65,188,65,234,97,197,224,121,0,96,187,226,89,21,6,108,105,98,
+114,97,114,121,224,109,0,224,110,22,65,56,224,110,3,162,81,65,89,0,
+49,196,148,0,49,98,150,64,39,0,55,100,52,2,95,56,55,66,136,0,
+73,129,81,1,66,32,96,91,2,95,55,55,65,215,9,39,32,95,55,54,
+57,32,95,55,56,64,58,2,55,56,52,97,107,3,95,55,56,55,66,147,
+0,48,64,14,0,95,64,122,130,231,128,88,0,58,98,131,1,10,65,161,
+93,96,87,193,130,225,140,2,224,200,3,226,202,5,226,88,11,131,74,226,
+86,14,0,73,131,231,3,105,110,103,32,161,47,0,32,225,158,3,128,2,
+224,97,3,65,26,1,51,32,224,27,17,0,52,224,27,18,0,53,96,27,
+3,95,57,50,56,193,2,96,225,96,0,0,58,97,113,11,10,65,32,85,
+32,75,51,32,75,52,32,65,64,26,0,58,96,43,225,16,110,226,177,1,
+225,19,91,66,133,225,19,9,0,55,225,19,4,102,162,0,58,96,43,97,
+19,131,183,225,16,3,192,7,227,209,4,97,35,225,46,11,132,5,100,165,
+160,5,0,83,71,23,226,240,9,224,98,7,196,221,224,208,6,225,109,11,
+101,185,228,215,17,225,111,2,0,67,100,211,0,115,161,108,2,95,53,54,
+101,18,161,58,192,232,229,184,4,0,53,100,36,96,22,228,219,2,99,222,
+2,95,53,55,160,187,64,0,160,152,64,131,1,64,67,70,145,0,53,69,
+230,131,127,231,152,2,7,45,115,111,117,114,99,101,115,128,129,224,40,32,
+229,78,0,3,39,32,95,53,104,169,67,210,0,56,231,243,4,2,98,105,
+116,224,45,0,129,196,0,53,225,196,62,97,183,69,201,128,228,134,223,225,
+199,14,224,75,14,230,44,0,198,16,137,88,230,236,0,65,205,1,57,50,
+225,142,0,192,119,225,253,68,6,105,110,99,108,117,100,101,226,3,13,226,
+4,5,98,172,226,10,12,130,196,64,197,2,95,54,48,224,243,1,64,147,
+2,95,55,55,64,140,225,212,1,8,79,32,79,32,35,52,54,32,64,67,
+85,99,89,232,254,3,96,140,3,45,100,105,114,225,181,2,226,69,29,169,
+58,0,45,160,67,226,76,24,224,47,13,226,84,27,160,49,226,86,5,0,
+52,228,27,119,162,63,233,41,1,66,57,225,106,2,224,100,1,226,64,69,
+3,100,97,116,97,228,65,48,136,77,98,51,224,170,5,128,0,225,249,29,
+64,129,0,45,96,129,225,243,23,224,41,7,225,236,26,64,50,225,233,5,
+138,233,160,154,234,171,1,0,57,64,244,193,72,1,95,50,72,131,0,50,
+97,69,104,147,0,53,73,45,128,102,0,57,105,4,2,57,50,48,74,252,
+160,34,64,87,139,39,7,80,32,95,57,49,49,32,64,237,101,10,65,86,
+1,35,52,97,91,0,67,234,245,0,0,66,233,143,0,224,30,2,64,95,
+6,49,50,32,95,56,57,51,64,4,74,161,1,57,53,205,105,224,116,1,
+0,67,167,28,224,94,7,160,219,64,66,64,74,64,64,96,82,1,48,49,
+64,108,0,79,225,164,0,192,73,224,110,13,65,208,0,55,225,208,1,224,
+118,0,0,58,96,8,172,18,128,223,234,79,9,128,53,110,119,3,49,54,
+56,32,225,143,1,11,92,51,52,38,46,46,47,77,105,99,114,111,107,145,
+3,47,115,114,99,224,14,3,7,82,101,103,101,120,46,104,115,64,40,5,
+44,50,52,58,49,50,129,190,128,210,65,117,101,86,65,134,128,150,65,247,
+0,58,96,24,99,192,0,89,132,229,0,85,97,205,65,31,163,49,65,39,
+5,67,32,60,32,64,35,98,194,237,155,6,128,25,74,93,224,25,0,161,
+191,128,25,108,31,96,85,162,32,1,56,57,109,75,224,20,0,160,22,1,
+57,48,141,98,0,50,130,141,224,30,8,131,253,224,30,1,229,121,0,224,
+137,6,97,106,224,137,12,162,32,0,85,64,15,105,2,79,233,65,6,96,
+188,128,25,224,246,6,129,35,129,230,167,234,162,32,96,141,166,250,0,39,
+66,25,224,37,2,0,67,64,21,64,18,227,210,2,128,119,140,69,96,5,
+1,95,57,78,91,2,95,57,48,64,150,130,249,96,0,0,58,97,160,130,
+36,0,80,66,160,76,51,100,87,3,95,50,55,56,160,10,0,58,96,60,
+105,168,0,83,225,162,9,226,221,0,225,155,1,96,146,225,148,5,80,220,
+131,177,102,167,160,234,64,23,3,95,57,49,54,64,4,161,105,80,184,1,
+55,53,224,16,2,224,95,6,166,229,225,106,7,2,85,32,75,69,83,160,
+83,196,208,1,53,52,225,85,0,224,97,3,2,75,32,95,143,130,96,219,
+138,132,64,158,64,117,109,40,97,247,0,58,64,152,64,26,3,95,50,55,
+50,192,76,64,98,0,58,96,37,65,52,75,178,196,30,69,101,3,67,32,
+61,61,193,251,99,166,160,224,97,243,0,58,96,7,100,211,65,146,228,121,
+2,2,95,50,55,166,20,64,130,103,217,161,170,224,20,15,225,18,0,224,
+29,4,97,214,227,238,1,224,29,11,0,64,103,30,128,121,96,182,134,208,
+192,185,130,23,132,146,195,19,64,38,226,107,0,194,154,64,0,107,202,96,
+4,128,152,0,58,96,27,172,206,1,80,32,128,76,0,80,96,23,133,116,
+132,185,192,43,132,157,64,124,68,153,66,120,96,169,2,95,56,57,70,77,
+96,21,2,51,56,50,97,40,131,38,0,67,66,162,242,202,0,2,95,57,
+48,97,238,193,20,160,55,162,102,2,54,48,50,192,249,192,18,2,57,48,
+52,64,4,98,5,0,66,134,33,70,192,0,57,225,93,7,102,68,225,218,
+15,170,47,197,156,0,85,141,180,194,74,196,220,1,80,32,96,40,0,85,
+64,231,64,165,224,231,12,128,110,224,231,27,135,204,128,223,192,55,224,231,
+50,192,72,224,231,19,98,177,224,231,15,69,60,65,206,84,96,96,83,226,
+84,21,131,106,206,225,200,10,224,38,14,226,159,27,224,74,24,128,38,224,
+74,21,97,235,224,74,25,128,38,224,74,21,131,17,224,74,24,128,38,224,
+74,21,198,29,224,74,22,128,38,0,67,64,74,192,71,224,29,2,103,5,
+133,5,224,19,4,231,227,52,3,49,53,58,53,135,226,101,64,0,52,148,
+156,230,228,1,244,15,0,224,114,5,0,52,84,178,160,36,1,95,49,226,
+154,2,128,0,224,75,31,114,80,224,75,9,1,55,54,98,130,224,80,2,
+224,81,32,103,142,224,81,68,64,32,224,239,26,0,50,224,76,9,102,174,
+129,225,224,80,3,103,41,160,80,233,45,0,128,44,161,242,0,66,73,207,
+100,81,150,90,224,112,4,224,126,10,224,203,32,100,40,224,203,11,147,211,
+96,94,1,55,53,96,121,103,93,2,55,54,49,224,11,1,1,53,56,224,
+11,2,100,119,96,11,1,49,48,225,90,0,2,95,49,48,224,47,0,0,
+58,96,6,196,79,0,56,86,213,101,10,102,223,103,234,193,154,148,71,96,
+192,193,19,0,90,134,234,224,214,4,96,21,64,58,64,66,2,90,32,80,
+64,27,226,249,51,3,55,58,49,56,130,249,225,59,3,65,46,160,118,133,
+159,224,163,3,225,32,4,65,50,193,32,128,11,129,32,160,11,97,32,96,
+11,161,32,160,11,224,47,0,0,58,96,6,65,32,2,51,50,56,168,61,
+0,85,192,119,160,144,2,95,51,50,96,71,99,115,1,51,51,96,71,64,
+11,0,58,96,6,136,223,0,55,77,248,0,95,65,95,0,58,70,35,230,
+170,0,67,91,134,170,135,190,171,56,105,59,64,133,109,221,0,58,102,118,
+96,50,0,90,64,126,64,16,135,193,3,95,50,55,32,196,137,235,197,71,
+228,86,16,137,191,130,153,232,228,1,96,0,228,67,21,224,56,7,1,49,
+53,74,108,224,61,1,228,49,23,224,63,25,224,236,12,236,40,29,228,83,
+14,224,236,24,228,63,19,170,233,228,62,15,106,214,224,86,5,224,99,7,
+228,38,23,224,158,7,99,194,192,0,1,95,51,98,199,64,34,0,58,96,
+6,226,49,0,227,226,6,206,155,99,101,160,180,227,99,0,187,49,224,35,
+1,128,87,128,105,0,58,96,6,107,143,160,163,235,91,0,236,128,3,136,
+193,199,46,224,194,4,128,188,141,3,67,18,169,34,169,130,239,90,0,1,
+56,57,76,22,110,82,195,59,128,90,64,20,164,195,131,59,125,213,227,69,
+0,79,166,185,13,0,58,96,89,123,194,128,54,195,157,1,80,32,96,137,
+128,20,227,156,2,64,237,128,20,131,156,138,69,250,23,17,3,46,103,105,
+116,132,172,244,226,3,0,67,91,41,3,55,32,95,50,145,69,0,53,64,
+6,69,21,210,238,185,170,130,17,2,56,32,95,74,201,1,95,53,143,36,
+98,175,114,182,1,95,56,69,161,146,91,178,222,160,43,96,108,64,12,1,
+56,57,98,116,1,53,55,65,72,1,95,55,64,166,128,16,173,125,96,97,
+145,196,224,19,0,101,60,224,137,4,0,58,96,33,100,241,77,150,2,64,
+95,57,192,89,0,58,96,6,132,207,84,12,1,95,53,80,252,0,58,64,
+152,128,21,0,89,97,199,98,5,78,208,1,56,55,66,33,201,71,107,88,
+224,31,0,243,159,26,130,118,243,157,14,0,66,95,32,6,32,112,97,99,
+107,97,103,249,68,1,224,93,3,225,45,0,1,95,56,91,39,175,194,98,
+127,97,9,224,37,5,1,95,53,110,125,224,66,1,227,165,0,65,128,249,
+89,3,192,19,64,171,110,62,64,66,97,103,0,50,111,94,96,66,224,222,
+31,244,126,17,0,80,160,218,14,110,111,116,32,102,111,117,110,100,44,32,
+114,117,110,110,84,142,0,39,127,175,160,244,0,67,180,59,4,79,32,35,
+51,57,242,138,0,64,112,158,203,242,204,3,192,136,225,124,60,151,89,225,
+122,0,225,40,7,2,95,56,54,66,77,0,85,195,124,129,136,130,116,73,
+134,191,144,1,64,58,127,34,163,113,160,21,226,47,1,129,180,225,203,7,
+68,96,173,57,255,17,6,119,160,226,113,0,254,69,2,192,34,225,240,9,
+226,24,0,64,35,194,166,224,83,0,184,140,245,225,18,226,117,4,160,39,
+248,70,10,225,100,11,98,46,225,100,15,0,70,65,228,65,100,225,98,0,
+192,170,160,103,226,197,2,226,159,3,128,105,66,160,126,215,192,117,1,95,
+54,92,239,192,197,64,114,0,56,126,56,228,10,2,227,33,9,224,88,4,
+160,87,224,196,12,224,86,2,224,201,9,1,85,110,67,167,64,202,160,201,
+98,157,98,181,224,50,15,226,89,3,77,182,3,95,56,56,53,68,81,0,
+56,194,75,225,78,40,6,65,108,114,101,97,100,121,224,88,4,195,59,229,
+193,2,5,116,97,114,46,103,122,160,33,162,176,224,38,22,97,128,96,204,
+0,54,95,187,225,7,7,86,35,245,237,2,1,95,53,81,124,2,95,54,
+55,197,127,227,12,2,0,58,99,177,146,165,224,85,0,192,234,97,166,161,
+1,128,105,224,106,37,0,58,96,204,128,92,160,76,0,53,75,252,224,213,
+1,165,77,120,56,0,58,96,104,216,4,225,245,0,1,95,50,149,211,225,
+238,19,5,116,97,114,32,45,67,225,235,34,4,45,120,32,45,102,225,149,
+0,0,58,97,234,1,10,65,236,50,2,8,104,116,116,112,115,58,47,47,
+104,128,160,12,46,104,97,115,107,101,108,108,46,111,114,103,47,160,180,1,
+47,34,70,137,66,209,248,184,11,0,56,70,243,227,9,0,198,239,227,186,
+2,229,205,0,0,54,152,7,117,45,173,45,224,181,13,2,103,101,116,165,
+162,7,73,110,102,111,58,32,110,111,230,141,8,224,113,1,0,56,129,130,
+178,17,136,17,130,184,233,84,0,161,210,161,1,136,111,166,72,228,178,1,
+117,100,128,221,230,150,6,230,147,22,228,36,5,73,127,229,231,2,224,212,
+1,0,78,224,196,1,3,108,105,115,116,230,114,2,14,117,112,100,97,116,
+101,39,32,99,111,109,109,97,110,100,96,226,3,67,32,95,55,74,28,229,
+225,0,232,192,3,0,54,64,129,0,55,67,184,136,131,65,88,106,175,98,
+233,226,131,6,1,95,55,100,156,0,58,97,168,102,11,179,144,129,159,0,
+80,171,102,133,156,241,152,3,192,8,98,101,0,54,64,106,1,95,54,72,
+142,3,64,95,51,54,89,173,0,56,170,187,1,49,55,133,41,0,80,77,
+62,67,31,79,188,224,33,1,97,166,0,55,149,53,2,85,32,65,128,205,
+2,95,50,53,243,189,0,119,139,1,35,54,132,235,192,235,226,36,1,227,
+12,17,68,116,162,39,130,22,3,95,49,54,52,65,38,0,55,160,4,0,
+50,77,201,128,0,1,95,52,74,159,0,58,97,49,105,127,64,96,0,51,
+64,46,128,165,2,95,51,54,75,225,160,11,88,34,0,48,64,110,67,150,
+0,52,64,20,242,117,6,98,50,5,52,56,57,32,95,52,73,209,224,147,
+1,1,98,105,161,192,64,49,234,210,22,2,84,114,117,160,184,130,52,224,
+41,17,3,70,97,108,115,192,227,1,51,54,66,168,99,104,128,159,172,83,
+224,17,2,184,47,160,247,224,227,0,0,58,96,6,130,251,227,192,2,0,
+53,123,166,224,19,4,130,73,231,166,0,232,19,17,237,109,0,231,140,21,
+174,11,225,200,15,11,78,111,114,109,97,108,105,122,101,100,32,67,80,166,
+126,15,4,58,92,49,48,38,225,215,3,1,56,53,168,84,227,165,2,64,
+101,128,129,2,50,54,56,224,129,1,98,196,160,25,255,55,4,191,46,224,
+13,6,132,11,231,250,6,224,10,1,128,245,225,159,19,8,101,120,101,99,
+117,116,97,98,108,255,213,1,232,227,2,111,27,151,33,0,56,67,206,1,
+95,54,104,220,1,95,56,76,77,103,10,89,38,232,116,3,158,215,224,112,
+18,6,108,105,98,114,97,114,121,231,198,2,224,110,20,112,90,224,110,2,
+193,72,236,159,2,0,50,155,140,96,30,100,114,2,95,56,55,68,55,110,
+93,230,168,1,0,55,121,209,0,39,84,79,3,57,32,95,55,69,76,1,
+95,55,104,236,64,28,71,5,1,95,53,81,131,228,184,0,1,95,56,178,
+57,0,58,108,178,140,225,99,221,65,211,67,226,224,213,1,5,110,111,32,
+103,108,111,66,0,6,115,101,99,116,105,111,110,160,223,75,111,69,229,0,
+89,106,200,132,98,129,214,225,197,2,224,10,2,234,52,2,130,5,225,76,
+21,128,115,232,185,1,68,239,161,43,96,0,0,58,97,9,159,92,80,85,
+0,90,69,95,99,79,64,148,111,159,118,214,65,42,224,152,10,225,154,3,
+143,161,224,140,34,203,120,100,123,0,39,166,161,0,79,97,130,0,79,101,
+194,3,95,55,51,52,225,66,2,226,24,3,69,95,83,26,225,96,2,1,
+97,109,130,161,64,170,172,184,217,143,96,207,0,54,161,161,215,168,96,199,
+64,197,224,196,7,64,23,236,231,61,160,177,0,32,226,203,4,227,142,8,
+235,45,4,2,95,56,53,68,225,224,147,4,224,141,11,228,19,1,1,95,
+56,157,158,0,53,96,56,135,179,1,56,55,111,103,66,173,218,4,0,58,
+99,26,126,17,5,75,50,32,75,52,32,193,28,0,58,96,44,225,26,103,
+228,86,1,225,29,92,80,100,227,96,1,114,114,224,228,0,224,7,1,66,
+85,227,28,1,2,95,53,53,106,180,193,82,66,212,225,82,7,137,112,72,
+27,97,81,226,112,0,0,58,96,46,233,139,9,128,74,0,54,145,170,160,
+74,64,127,240,25,22,101,167,83,113,0,56,72,75,234,104,28,9,100,101,
+112,101,110,100,101,110,99,121,112,11,9,105,110,115,116,97,108,108,101,100,
+58,225,111,0,193,186,2,95,56,54,96,244,161,59,0,56,71,132,0,83,
+65,9,0,53,64,245,64,170,0,49,97,117,129,106,107,8,104,74,0,50,
+82,243,173,199,240,46,4,0,58,97,115,72,138,6,53,55,54,32,75,32,
+85,228,48,0,129,210,96,240,128,43,224,14,5,224,11,2,1,95,53,236,
+233,0,64,79,210,42,3,95,57,51,49,98,107,128,157,1,54,56,224,157,
+0,1,79,32,134,12,96,132,0,58,96,196,224,129,7,128,1,135,23,224,
+96,1,0,58,96,69,128,93,161,166,1,95,56,106,118,101,45,193,185,161,
+29,240,169,8,236,22,3,0,58,97,73,232,133,6,3,67,32,95,52,66,
+58,1,56,54,70,154,225,234,14,221,237,64,48,253,124,0,225,229,26,22,
+115,101,116,67,117,114,114,101,110,116,68,105,114,101,99,116,111,114,121,32,
+102,97,105,225,231,4,0,58,96,168,10,10,65,32,94,99,104,100,105,114,
+32,58,96,137,160,165,109,157,0,56,74,167,136,90,226,169,1,0,67,65,
+95,64,9,236,4,6,224,190,14,69,247,0,52,67,47,0,95,135,20,230,
+255,6,0,103,224,168,9,169,0,73,214,96,224,0,49,162,89,8,95,49,
+55,50,32,35,49,48,48,150,206,0,58,97,140,64,190,5,103,101,116,99,
+119,100,64,191,131,118,161,146,117,174,73,134,118,157,64,14,228,6,0,65,
+119,0,52,133,29,160,74,131,149,0,85,229,0,2,0,58,99,83,224,20,
+1,227,197,4,67,169,172,88,228,50,11,204,83,137,82,0,83,103,149,113,
+196,224,5,3,67,184,243,60,28,99,74,225,233,15,4,67,114,101,97,116,
+69,57,8,112,97,116,104,32,109,111,100,117,229,58,4,229,19,2,224,2,
+0,224,112,3,67,208,73,154,1,95,53,129,111,130,97,227,126,0,194,9,
+0,54,141,103,224,28,4,224,145,15,224,131,8,224,77,0,208,130,224,19,
+2,239,197,16,4,119,104,101,114,101,235,15,1,224,50,26,18,105,109,112,
+111,114,116,32,68,97,116,97,46,86,101,114,115,105,111,110,224,63,36,0,
+118,128,51,3,32,58,58,32,160,62,1,59,32,192,19,5,61,32,109,97,
+107,101,160,22,224,218,1,160,215,209,91,64,91,237,142,1,88,70,99,174,
+0,53,73,65,67,201,68,80,224,111,8,225,39,7,224,158,5,0,79,66,
+241,229,66,1,224,193,21,2,103,101,116,64,253,0,68,67,204,14,58,32,
+73,79,32,70,105,108,101,80,97,116,104,59,32,224,26,2,6,61,32,114,
+101,116,117,114,224,198,1,226,173,0,193,158,192,101,224,203,0,238,85,0,
+224,42,1,179,230,1,95,56,71,12,230,94,2,2,97,116,97,128,87,224,
+185,6,192,0,224,105,4,242,135,0,130,125,224,70,1,1,46,104,114,54,
+96,33,224,236,14,64,215,1,115,95,224,37,0,79,147,78,125,164,114,143,
+97,82,190,103,75,0,35,67,72,234,30,20,96,0,0,58,104,71,99,216,
+200,11,126,149,96,4,224,17,4,195,231,204,36,96,198,225,23,0,67,212,
+240,143,2,64,31,78,135,172,39,224,126,2,243,35,3,96,199,227,35,0,
+226,8,10,243,140,9,226,84,26,160,214,134,202,168,144,112,145,0,58,109,
+28,251,194,6,0,80,68,115,239,96,0,0,80,155,173,175,92,155,166,185,
+212,64,6,64,59,2,49,52,51,197,111,1,53,51,130,230,2,49,57,50,
+81,180,97,128,141,97,68,208,64,42,0,53,229,248,2,0,67,78,245,225,
+189,0,160,30,88,117,0,50,192,228,2,95,49,52,64,22,66,127,0,56,
+124,217,0,35,64,242,160,25,96,20,109,227,2,49,53,48,192,11,0,58,
+96,6,192,150,253,79,1,196,246,224,161,17,226,243,0,224,167,8,0,83,
+237,150,4,224,38,6,224,175,4,226,14,3,69,81,224,190,1,131,62,192,
+190,224,64,17,197,252,224,60,17,225,42,27,104,43,193,42,96,0,193,47,
+110,164,161,47,64,11,0,58,96,6,193,47,146,207,226,210,2,225,45,17,
+225,42,13,3,70,105,101,108,178,9,224,228,81,2,53,52,48,71,18,224,
+222,0,225,224,56,1,73,102,225,219,47,0,53,72,66,225,213,46,225,166,
+4,225,213,53,106,116,161,213,64,11,0,58,96,6,1,10,65,95,108,202,
+184,94,37,68,65,0,54,160,91,115,125,86,60,3,95,56,52,56,133,45,
+229,98,10,1,46,99,227,164,1,233,184,7,5,110,111,32,80,75,71,128,
+33,114,188,128,38,154,241,234,252,1,88,142,224,56,5,7,109,117,108,116,
+105,112,108,101,224,62,12,132,151,137,140,240,5,1,73,69,129,69,187,80,
+243,187,12,193,190,75,28,117,180,224,18,0,0,55,151,19,225,194,1,241,
+210,49,240,60,1,224,214,6,5,99,109,100,80,97,114,180,178,1,58,56,
+81,45,234,138,1,137,67,0,51,95,84,65,130,64,79,1,52,57,85,155,
+64,85,67,127,66,77,0,51,96,36,134,201,0,89,170,60,192,253,145,216,
+241,74,2,65,177,134,222,96,28,225,21,1,224,36,45,172,243,224,36,22,
+97,69,224,36,0,103,201,224,34,6,127,26,224,0,2,103,145,0,39,241,
+253,1,103,169,2,57,49,32,117,30,3,95,52,48,54,231,175,5,129,167,
+226,129,2,1,45,45,97,79,118,86,226,169,19,8,45,45,78,79,84,95,
+77,72,83,130,70,71,242,224,37,0,161,174,224,14,5,248,67,0,0,58,
+97,137,141,230,1,56,52,65,249,0,50,119,53,76,179,162,132,248,17,0,
+0,55,91,79,1,95,50,111,254,128,6,0,58,96,50,97,193,0,51,87,
+215,65,207,224,10,3,0,56,65,125,1,95,54,128,49,0,54,125,55,165,
+121,66,7,101,121,64,212,0,52,98,128,98,0,0,49,96,35,108,238,224,
+25,0,71,168,224,40,4,242,254,3,243,61,1,64,217,1,95,54,119,212,
+78,89,64,227,160,13,104,117,0,58,96,140,120,9,79,173,160,171,64,154,
+1,95,54,73,233,224,4,16,224,146,2,224,156,10,64,141,4,64,95,55,
+49,48,227,12,3,2,111,109,109,199,51,2,95,56,48,99,164,0,56,64,
+45,224,66,4,224,76,30,245,248,4,128,145,96,82,1,95,50,67,188,96,
+65,161,226,128,98,224,99,43,246,205,7,224,180,5,224,81,43,12,115,111,
+117,114,99,101,45,114,101,112,111,115,105,238,214,2,224,88,56,3,102,108,
97,103,224,75,63,8,116,101,115,116,45,115,117,105,116,224,246,64,8,98,
101,110,99,104,109,97,114,107,224,80,12,0,58,98,138,226,130,6,224,10,
-2,1,55,48,70,230,0,56,71,163,226,201,4,0,58,96,63,99,46,78,
-122,0,54,68,224,162,186,224,16,3,0,57,64,5,0,48,192,14,224,168,
-2,0,48,64,15,0,55,96,138,235,228,2,99,240,224,186,1,0,105,135,
-201,206,223,128,68,0,55,101,137,165,240,96,18,2,64,95,56,74,213,101,
-90,224,40,3,120,161,167,199,119,172,194,156,65,6,1,55,51,221,78,224,
-159,1,2,56,51,57,141,243,224,68,1,128,249,146,30,160,211,227,206,2,
-224,114,19,224,48,2,67,177,225,37,33,227,7,6,219,53,135,252,224,131,
-8,224,128,11,224,234,5,96,227,224,17,1,253,141,2,225,26,13,64,244,
-232,150,3,0,58,96,104,182,55,209,20,83,187,69,245,0,58,96,43,101,
-110,1,54,51,142,32,0,58,97,51,229,73,5,1,56,48,83,197,83,210,
-64,188,79,76,224,26,7,102,1,64,26,102,235,8,95,51,50,53,32,95,
-55,48,55,64,150,207,118,224,51,2,69,152,226,167,5,1,57,49,105,107,
-0,51,230,16,0,229,61,18,224,71,2,131,47,96,151,224,77,3,225,130,
-4,3,97,114,99,104,97,130,2,95,56,49,105,191,224,62,1,70,75,131,
+2,1,55,48,71,37,0,56,71,226,226,201,4,0,58,96,63,99,46,78,
+185,0,54,67,178,162,186,224,16,3,0,57,64,5,0,48,192,14,224,168,
+2,0,48,64,15,0,55,96,138,236,35,2,100,109,224,186,1,0,105,136,
+8,207,30,128,68,0,55,102,6,166,109,96,18,2,64,95,56,75,20,101,
+215,224,40,3,120,224,168,6,119,235,194,156,65,6,1,55,51,221,141,224,
+159,1,2,56,51,57,142,50,224,68,1,128,249,146,93,160,211,227,206,2,
+224,114,19,224,48,2,67,177,225,37,33,227,7,6,219,116,136,59,224,131,
+8,224,128,11,224,234,5,96,227,224,17,1,253,204,2,225,26,13,64,244,
+232,213,3,0,58,96,104,182,118,209,83,83,250,70,114,0,58,96,43,101,
+110,1,54,51,142,95,0,58,97,51,229,73,5,1,56,48,84,4,84,17,
+64,188,79,139,224,26,7,102,126,64,26,103,104,8,95,51,50,53,32,95,
+55,48,55,64,150,207,181,224,51,2,69,152,226,167,5,1,57,49,105,170,
+0,51,230,78,0,229,61,18,224,71,2,131,47,96,151,224,77,3,225,130,
+4,3,97,114,99,104,97,130,2,95,56,49,105,254,224,62,1,70,75,131,
80,64,30,224,65,16,228,33,0,224,65,9,99,94,224,65,25,2,105,109,
-112,137,183,160,65,227,252,10,1,56,51,70,148,195,222,1,48,52,225,63,
-4,1,95,56,83,35,224,100,22,0,111,142,182,224,164,9,66,176,224,164,
+112,137,246,160,65,227,252,10,1,56,51,70,148,195,222,1,48,52,225,63,
+4,1,95,56,83,98,224,100,22,0,111,142,245,224,164,9,66,176,224,164,
1,96,30,99,43,96,14,65,122,224,67,1,1,124,124,132,103,224,23,7,
-0,38,177,183,0,58,96,56,98,77,0,80,223,80,64,20,213,154,96,22,
+0,38,177,246,0,58,96,56,98,77,0,80,223,143,64,20,213,217,96,22,
96,105,0,80,96,23,135,204,96,21,67,247,128,44,0,54,224,20,1,64,
-213,128,20,135,74,96,20,66,200,128,20,216,241,2,80,32,35,72,248,128,
+213,128,20,135,74,96,20,66,200,128,20,217,48,2,80,32,35,73,117,128,
20,132,185,160,107,99,13,128,107,226,230,1,2,80,32,35,98,117,128,23,
-170,168,95,10,0,55,95,47,235,93,14,0,120,136,157,100,155,213,57,72,
-147,195,100,245,224,20,8,85,110,107,110,111,119,110,32,102,77,115,245,211,
-1,75,213,0,48,95,20,99,31,0,56,191,21,2,95,56,50,106,47,68,
-246,149,223,0,79,111,234,224,86,9,5,97,115,109,45,111,112,78,240,161,
-219,0,55,113,56,192,49,224,40,5,135,33,96,40,1,95,56,117,148,224,
+170,57,72,242,0,55,95,110,232,242,14,0,120,137,26,100,155,213,120,72,
+209,195,100,246,31,20,8,85,110,107,110,111,119,110,32,102,77,178,246,18,
+1,76,20,0,48,95,83,99,31,0,56,191,84,3,95,56,50,55,96,153,
+255,74,0,0,79,112,41,224,86,9,5,97,115,109,45,111,112,79,47,161,
+219,0,55,113,119,192,49,224,40,5,135,33,96,40,1,95,56,117,211,224,
39,10,12,117,116,111,103,101,110,45,105,110,99,108,117,100,224,44,0,64,
-158,224,44,17,148,65,224,88,21,0,98,90,49,0,45,152,205,160,41,0,
+158,224,44,17,148,128,224,88,21,0,98,90,112,0,45,153,12,160,41,0,
50,165,233,224,41,12,3,116,111,111,108,224,46,38,224,128,26,200,112,231,
84,4,133,89,101,19,224,54,9,0,99,225,54,28,1,99,99,225,134,3,
224,38,17,0,109,225,133,29,64,39,224,79,28,1,112,112,224,39,6,225,
168,13,2,99,120,120,224,79,28,12,100,101,102,97,117,108,116,45,101,120,
-116,101,110,82,151,224,86,21,192,46,6,108,97,110,103,117,97,103,225,89,
-8,70,40,1,95,55,90,94,224,61,11,6,101,120,112,111,115,101,100,226,
+116,101,110,82,214,224,86,21,192,46,6,108,97,110,103,117,97,103,225,89,
+8,70,40,1,95,55,90,157,224,61,11,6,101,120,112,111,115,101,100,226,
61,6,224,105,13,1,114,101,64,45,1,114,116,224,46,30,224,191,30,13,
101,120,116,114,97,45,98,117,110,100,108,101,100,45,138,246,0,105,225,154,
22,128,51,6,100,121,110,97,109,105,99,160,51,8,121,45,102,108,97,118,
@@ -319,37 +320,37 @@
45,115,116,97,116,105,99,224,49,29,224,136,26,224,228,0,225,128,21,1,
103,104,227,55,5,228,189,15,64,39,3,112,114,111,102,224,44,32,5,115,
104,97,114,101,100,224,46,31,1,106,115,224,41,34,224,135,35,1,106,115,
-224,137,35,1,104,115,164,28,225,189,3,225,56,13,153,59,96,34,227,111,
-32,165,210,224,92,26,229,251,27,190,136,230,40,29,65,7,228,246,26,0,
-108,225,39,29,3,109,105,120,105,195,217,82,107,224,34,10,4,110,104,99,
+224,137,35,1,104,115,164,28,225,189,3,225,56,13,153,122,96,34,227,111,
+32,165,210,224,92,26,229,251,27,190,199,230,40,29,65,7,228,246,26,0,
+108,225,39,29,3,109,105,120,105,195,217,80,59,224,34,10,4,110,104,99,
57,56,224,76,28,4,111,116,104,101,114,228,240,31,128,44,196,238,128,43,
225,127,32,128,60,228,190,27,9,112,107,103,45,99,111,110,102,105,103,231,
1,5,225,54,14,6,118,105,114,116,117,97,108,231,134,28,8,118,105,115,
105,98,105,108,105,116,111,30,224,188,33,5,97,117,116,104,111,114,225,115,
20,2,98,117,103,111,125,1,114,116,225,155,21,167,176,1,121,112,230,47,
-38,116,123,0,45,249,48,2,224,97,16,4,99,97,116,101,103,176,1,224,
-36,17,6,111,112,121,114,105,103,104,131,69,224,37,15,91,31,67,49,226,
-67,20,96,36,85,20,225,214,21,5,100,101,115,99,114,105,98,147,224,115,
+38,116,186,0,45,249,111,2,224,97,16,4,99,97,116,101,103,176,1,224,
+36,17,6,111,112,121,114,105,103,104,131,69,224,37,15,91,94,67,49,226,
+67,20,96,36,85,83,225,214,21,5,100,101,115,99,114,105,98,147,224,115,
20,166,98,1,111,99,224,83,26,128,43,164,54,224,46,31,2,116,109,112,
224,43,26,4,104,111,109,101,112,199,213,224,171,15,4,108,105,99,101,110,
142,194,224,35,23,96,114,224,113,20,224,40,3,224,155,21,8,109,97,105,
-110,116,97,105,110,101,226,146,21,220,45,226,100,33,187,224,2,45,117,114,
+110,116,97,105,110,101,226,146,21,220,108,226,100,33,188,31,2,45,117,114,
109,143,224,89,16,2,115,116,97,227,70,2,224,37,16,1,117,98,194,59,
224,34,16,5,121,110,111,112,115,105,195,50,76,67,224,36,9,82,54,5,
101,100,45,119,105,116,110,169,224,76,16,227,28,3,237,224,2,0,50,109,
-224,0,49,118,26,225,75,13,0,45,160,128,225,39,32,114,200,132,112,224,
+224,0,49,118,151,225,75,13,0,45,160,128,225,39,32,114,200,132,112,224,
56,38,227,247,40,3,108,111,99,97,227,51,24,3,109,97,110,117,149,148,
-235,218,33,170,190,224,52,19,0,67,224,191,9,143,234,160,136,214,157,224,
+235,218,33,170,190,224,52,19,0,67,224,191,9,143,234,160,136,214,219,224,
0,64,110,145,78,6,206,214,79,43,110,214,65,196,246,191,7,112,17,1,
50,53,96,30,183,22,225,86,7,192,30,0,54,128,30,242,99,1,1,53,
50,176,60,78,207,0,49,87,36,78,140,174,254,64,31,65,142,224,18,6,
-216,92,242,85,8,96,16,248,214,7,0,95,87,239,0,83,243,250,1,255,
-27,4,218,217,247,237,10,248,41,16,216,4,112,103,64,215,225,15,7,66,
-231,1,55,57,91,37,122,42,0,58,110,51,154,92,241,83,1,128,240,224,
-13,0,224,64,1,242,248,3,64,228,245,39,7,122,67,0,54,175,242,244,
-178,8,224,28,0,224,80,1,65,61,122,93,64,60,248,166,4,242,218,9,
-0,49,64,177,128,254,128,193,145,143,224,30,1,249,11,3,243,238,10,242,
-18,15,248,123,9,0,55,101,83,0,58,97,34,155,182,228,42,2,115,173,
+216,217,242,85,8,96,16,249,83,7,0,95,88,108,0,83,243,250,1,255,
+90,4,219,24,248,58,10,248,166,16,216,66,112,103,64,215,225,15,7,66,
+231,1,55,57,91,100,122,167,0,58,110,51,152,84,241,83,1,128,240,224,
+13,0,224,64,1,242,248,3,64,228,245,39,7,122,192,0,54,175,242,244,
+178,8,224,28,0,224,80,1,65,61,122,218,64,60,248,166,4,242,218,9,
+0,49,64,177,128,254,128,193,145,143,224,30,1,249,73,3,243,238,10,242,
+18,15,248,123,9,0,55,101,83,0,58,97,34,153,134,228,42,2,115,173,
96,236,160,208,0,55,128,237,224,33,7,113,62,224,33,0,224,251,0,224,
8,0,113,36,209,29,248,216,10,1,56,49,64,76,246,137,9,132,164,178,
131,178,211,225,138,6,242,119,4,1,61,61,67,141,225,125,12,2,95,56,
@@ -356,7 +357,7 @@
49,97,7,245,255,1,64,92,224,152,0,98,19,64,152,64,43,64,28,130,
60,224,92,3,1,46,42,128,92,113,233,226,236,0,2,95,56,49,179,27,
224,154,21,1,94,62,160,155,193,2,229,145,3,129,3,128,236,224,23,3,
-181,153,224,153,1,1,95,56,93,155,2,51,49,49,66,5,249,121,1,224,
+181,153,224,153,1,1,95,56,93,218,2,51,49,49,66,5,249,121,1,224,
106,5,2,45,97,110,184,238,224,57,5,0,48,224,57,25,2,110,111,110,
150,128,243,234,40,226,207,38,160,236,226,207,9,0,58,97,231,244,50,0,
65,98,132,240,147,151,96,21,243,220,0,65,56,244,6,8,65,143,192,20,
@@ -368,11 +369,11 @@
5,65,72,224,35,0,224,205,0,224,35,6,64,164,225,221,5,194,180,224,
40,6,69,190,224,40,5,0,60,160,40,196,148,0,58,99,210,230,182,8,
64,57,192,20,245,225,0,64,119,192,20,67,227,128,20,225,218,2,246,56,
-0,64,233,149,2,127,31,0,85,100,80,1,51,55,133,118,184,57,0,90,
-64,20,96,4,100,157,96,33,66,94,192,33,64,155,0,48,246,128,4,127,
-221,103,106,64,33,224,23,1,246,20,1,65,126,96,23,0,89,134,23,0,
+0,64,233,149,2,127,156,0,85,100,80,1,51,55,133,118,184,57,0,90,
+64,20,96,4,100,157,96,33,66,94,192,33,64,155,0,48,246,128,4,94,
+29,135,106,64,33,224,23,1,246,20,1,65,126,96,23,0,89,134,23,0,
80,149,224,224,254,1,5,102,111,108,100,114,49,163,33,64,33,128,162,0,
-85,128,146,217,75,224,10,3,127,62,160,141,130,3,0,83,159,120,66,46,
+85,128,146,217,75,224,10,3,126,214,160,141,130,3,0,83,159,245,66,46,
64,175,100,145,0,56,133,111,64,190,0,51,150,21,0,53,200,137,100,132,
160,22,0,95,190,213,70,122,226,58,12,101,229,0,58,102,69,232,22,7,
65,244,0,56,86,117,137,114,0,58,107,100,195,21,229,188,7,227,26,4,
@@ -390,7 +391,7 @@
145,124,77,0,67,65,201,234,103,11,128,71,99,188,2,49,54,56,224,212,
2,12,92,51,52,38,46,46,47,77,105,99,114,111,67,80,86,3,47,115,
114,99,224,14,3,7,80,97,114,115,101,46,104,115,64,40,5,44,49,57,
-51,58,49,163,234,162,223,224,136,1,129,183,128,175,233,150,2,0,50,102,
+53,58,49,163,234,162,223,224,136,1,129,183,128,175,233,150,2,0,50,102,
199,96,251,186,94,232,160,10,99,217,233,204,4,161,181,197,9,2,95,55,
56,65,172,75,188,0,58,90,154,128,21,164,146,64,138,2,85,32,95,186,
51,192,17,1,66,39,64,20,90,57,128,21,100,117,192,28,195,88,96,103,
@@ -1741,7 +1742,7 @@
32,125,
};
unsigned char *combexpr = data;
-int combexprlen = 34782;
+int combexprlen = 34802;
#include "mhsffi.h"
static struct ffi_entry table[] = { { 0,0 }--- a/src/MicroHs/Compile.hs
+++ b/src/MicroHs/Compile.hs
@@ -128,11 +128,21 @@
when (verbosityGT flags 1) $ do
ms <- gets getWorking
putStrLnInd $ "[from " ++ head (map showIdent ms ++ ["-"]) ++ "]"
- putStrLnInd $ "importing " ++ showIdent mn
+ putStrInd $ "importing " ++ showIdent mn
mres <- liftIO (readModulePath flags ".hs" mn)
case mres of
- Nothing -> findPkgModule flags mn
+ Nothing -> do
+ (fn, res) <- findPkgModule flags mn
+ liftIO $ when (verbosityGT flags 1) $ do
+ when (verbosityGT flags 2) $
+ putStrLn $ " (" ++ show fn ++ ")"+ putStrLn ""
+ return res
Just (pathfn, file) -> do
+ liftIO $ when (verbosityGT flags 1) $ do
+ when (verbosityGT flags 2) $
+ putStrLn $ " (" ++ show pathfn ++ ")"+ putStrLn ""
modify $ addWorking mn
compileModule flags ImpNormal mn pathfn file
Just tm -> do
@@ -145,6 +155,11 @@
ms <- gets getWorking
liftIO $ putStrLn $ map (const ' ') ms ++ msg
+putStrInd :: String -> CM ()
+putStrInd msg = do
+ ms <- gets getWorking
+ liftIO $ putStr $ map (const ' ') ms ++ msg
+
noSymbols :: Symbols
noSymbols = (stEmpty, stEmpty)
@@ -384,7 +399,7 @@
packageTxtSuffix = ".txt"
-- Find the module mn in the package path, and return it's contents.
-findPkgModule :: Flags -> IdentModule -> CM (TModule [LDef], Symbols, Time)
+findPkgModule :: Flags -> IdentModule -> CM (FilePath, (TModule [LDef], Symbols, Time))
findPkgModule flags mn = do
t0 <- liftIO getTimeMilli
let fn = moduleToFile mn <.> packageTxtSuffix
@@ -400,7 +415,7 @@
Nothing -> error $ "package does not contain module " ++ pkg ++ " " ++ showIdent mn
Just t -> do
t1 <- liftIO getTimeMilli
- return (t, noSymbols, t1 - t0)
+ return (pfn, (t, noSymbols, t1 - t0))
Nothing ->
errorMessage (getSLoc mn) $
"Module not found: " ++ show mn ++