suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added printing of locations if prop:exn:srcloc is supported

Browse Source
This commit is contained in:
Danny Yoo 2011-10-03 18:38:43 -04:00
parent 13c385bd8b
commit 884a4d3abb
2 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
js-assembler/package.rkt
View File

@ -597,7 +597,36 @@ var invokeMainModule = function() {
} }
}, },
function(M, e) { function(M, e) {
var contMarkSet, context, i, appName, contextDiv; var contMarkSet, context, i, appName, contextDiv, srclocProcedure;
var displayContext = function() {
var subcontextDiv = $('<div/>').css('color', 'red');
subcontextDiv.append("Stacktrace:\n");
if (contMarkSet) {
context = contMarkSet.getContext(M);
for (i = 0; i < context.length; i++) {
if (plt.runtime.isVector(context[i])) {
$('<div/>').text('at ' + context[i].elts[0] +
', line ' + context[i].elts[2] +
', column ' + context[i].elts[3])
.addClass('stacktrace')
.css('margin-left', '10px')
.css('whitespace', 'pre')
.appendTo(subcontextDiv);
} else if (plt.runtime.isProcedure(context[i])) {
$('<div/>').text('in ' + context[i].displayName)
.addClass('stacktrace')
.css('margin-left', '10px')
.css('whitespace', 'pre')
.appendTo(subcontextDiv);
}
}
}
contextDiv.append(subcontextDiv);
M.params.currentErrorDisplayer(M, contextDiv);
};
// On main module invokation failure // On main module invokation failure
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(e.stack || e); window.console.log(e.stack || e);
@ -615,33 +644,36 @@ var invokeMainModule = function() {
plt.baselib.structs.supportsStructureTypeProperty( plt.baselib.structs.supportsStructureTypeProperty(
e.racketError.structType, e.racketError.structType,
plt.baselib.structs.propExnSrcloc)) { plt.baselib.structs.propExnSrcloc)) {
srclocProcedure = plt.baselib.functions.asJavaScriptFunction(
plt.baselib.structs.lookupStructureTypeProperty(
e.racketError.structType,
plt.baselib.structs.propExnSrcloc),
M);
srclocProcedure(function(v) {
if (plt.baselib.lists.isList(v)) {
while(v !== plt.baselib.lists.EMPTY) {
if (plt.baselib.srclocs.isSrcloc(v.first)) {
$('<div/>').text('at ' + plt.baselib.srclocs.srclocSource(v.first) +
', line ' + plt.baselib.srclocs.srclocLine(v.first) +
', column ' + plt.baselib.srclocs.srclocColumn(v.first))
.addClass('srcloc')
.css('margin-left', '10px')
.css('whitespace', 'pre')
.css('color', 'red')
.appendTo(contextDiv);
}
v = v.rest;
}
}
displayContext();
},
function(err) {
displayContext();
},
e.racketError);
} else {
displayContext();
} }
if (contMarkSet) {
context = contMarkSet.getContext(M);
for (i = 0; i < context.length; i++) {
if (plt.runtime.isVector(context[i])) {
$('<div/>').text('at ' + context[i].elts[0] +
', line ' + context[i].elts[2] +
', column ' + context[i].elts[3])
.addClass('stacktrace')
.css('margin-left', '10px')
.css('whitespace', 'pre')
.css('color', 'red')
.appendTo(contextDiv);
} else if (plt.runtime.isProcedure(context[i])) {
$('<div/>').text('in ' + context[i].displayName)
.addClass('stacktrace')
.css('margin-left', '10px')
.css('whitespace', 'pre')
.css('color', 'red')
.appendTo(contextDiv);
}
}
}
M.params.currentErrorDisplayer(M, contextDiv);
} }
}); });
}; };

1
tests/more-tests/sigs-cs019.rkt
View File

@ -19,7 +19,6 @@
(define: (g [x : Number$]) -> String$ "x") (define: (g [x : Number$]) -> String$ "x")
(check-expect (g 10) "x") (check-expect (g 10) "x")
(g "x")
#;(check-error (g "x")) #;(check-error (g "x"))
#;(check-violation-highlights #;(check-violation-highlights
(g "x") (g "x")