From 4b36a8e9b5451b751ca727ca133f876dc128e9c1 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 8 Dec 2014 05:33:09 -0700 Subject: [PATCH] fix handling of "links.rktd" errors --- racket/src/racket/src/cstartup.inc | 12 ++++++------ racket/src/racket/src/startup.inc | 2 +- racket/src/racket/src/startup.rktl | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/racket/src/racket/src/cstartup.inc b/racket/src/racket/src/cstartup.inc index 43498eb202..6a7fde2522 100644 --- a/racket/src/racket/src/cstartup.inc +++ b/racket/src/racket/src/cstartup.inc @@ -1,5 +1,5 @@ { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,53,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,51,0,0,0,1,0,0,10,0,14,0, 19,0,24,0,37,0,42,0,45,0,52,0,56,0,60,0,67,0,74,0,83, 0,87,0,93,0,107,0,121,0,124,0,130,0,134,0,136,0,147,0,149,0, @@ -100,7 +100,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 2056); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,53,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,193,0,0,0,1,0,0,8,0,21,0, 26,0,43,0,55,0,77,0,106,0,150,0,156,0,165,0,172,0,187,0,205, 0,217,0,233,0,247,0,13,1,32,1,39,1,73,1,90,1,107,1,130,1, @@ -513,7 +513,7 @@ 111,114,32,114,101,97,100,105,110,103,32,99,111,108,108,101,99,116,105,111,110, 32,108,105,110,107,115,32,102,105,108,101,32,126,115,58,32,126,97,23,203,2, 248,22,145,12,23,206,2,247,22,29,12,12,28,23,193,2,250,22,158,2,80, -144,42,8,25,38,23,198,1,249,22,82,21,17,0,0,23,198,1,86,95,23, +144,42,8,25,38,23,198,1,249,22,82,23,198,1,21,17,0,0,86,95,23, 195,1,23,193,1,12,28,248,22,149,12,23,198,2,86,94,23,197,1,248,23, 195,1,247,22,140,2,196,88,148,36,37,55,8,240,0,0,0,2,9,226,0, 2,1,3,33,136,2,20,20,94,248,22,149,6,23,194,2,28,248,22,149,7, @@ -1045,7 +1045,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 19762); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,53,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,14,0,0,0,1,0,0,15,0,40,0, 57,0,75,0,97,0,120,0,140,0,162,0,171,0,180,0,187,0,196,0,203, 0,0,0,231,1,0,0,74,35,37,112,108,97,99,101,45,115,116,114,117,99, @@ -1075,7 +1075,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 557); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,53,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,102,0,0,0,1,0,0,7,0,18,0, 45,0,51,0,60,0,67,0,89,0,102,0,128,0,145,0,167,0,175,0,187, 0,202,0,218,0,236,0,0,1,12,1,28,1,51,1,75,1,87,1,118,1, @@ -1542,7 +1542,7 @@ EVAL_ONE_SIZED_STR((char *)expr, 9735); } { - SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,53,84,0,0,0,0,0,0,0,0,0,0, + SHARED_OK static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,54,46,49,46,49,46,54,84,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,11,0,0,0,1,0,0,10,0,16,0, 29,0,44,0,58,0,78,0,90,0,104,0,118,0,170,0,0,0,101,1,0, 0,69,35,37,98,117,105,108,116,105,110,65,113,117,111,116,101,29,94,2,2, diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index be740278e0..d093df4439 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -530,7 +530,7 @@ "(current-continuation-marks))))" "(void))" "(when ts" -"(hash-set! links-cache links-path(cons #hasheq() ts)))" +"(hash-set! links-cache links-path(cons ts #hasheq())))" "(if(exn:fail? exn)" "(esc(make-hasheq))" " exn))))" diff --git a/racket/src/racket/src/startup.rktl b/racket/src/racket/src/startup.rktl index 25ca46f762..850f262104 100644 --- a/racket/src/racket/src/startup.rktl +++ b/racket/src/racket/src/startup.rktl @@ -631,7 +631,7 @@ (current-continuation-marks)))) (void)) (when ts - (hash-set! links-cache links-path (cons #hasheq() ts))) + (hash-set! links-cache links-path (cons ts #hasheq()))) (if (exn:fail? exn) (esc (make-hasheq)) ;; re-raise the exception (which is probably a break)