summaryrefslogtreecommitdiffabout
path: root/components
Side-by-side diff
Diffstat (limited to 'components') (more/less context) (ignore whitespace changes)
-rw-r--r--components/exception_dev3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/exception_dev b/components/exception_dev
index d62f462..49b7f45 100644
--- a/components/exception_dev
+++ b/components/exception_dev
@@ -1,123 +1,123 @@
%%decl using namespace std;
<%impl>
#include <iostream>
#include <fstream>
#include <sstream>
#include <cassert>
#include <cstdarg>
#include <stdexcept>
#include <cxxabi.h>
#include <sitecing/sitecing_util.h>
#include <sitecing/util.h>
#include <sitecing/magic.h>
#include <konforka/util.h>
#include <konforka/exception.h>
</%impl>
%%var string message;
%%var string root_source;
%%var string root_intermediate;
%%var string root_so;
%%var string component;
%%var int line_number = -1;
%%var const exception* exception_caught;
<%code>
__SCIF->headers.clear();
__SCIF->out->seekp(0);
int magic = _magic;
- va_list va = _args;
+ va_list va; va_copy(va,_args);
switch(magic) {
case sitecing::__magic_compile_error:
message = va_arg(va,const char*);
root_source = va_arg(va,const char*);
root_intermediate = va_arg(va,const char*);
root_so = va_arg(va,const char*);
component = va_arg(va,const char*);
break;
case sitecing::__magic_preprocess_error:
message = va_arg(va,const char*);
root_source = va_arg(va,const char*);
root_intermediate = va_arg(va,const char*);
root_so = va_arg(va,const char*);
component = va_arg(va,const char*);
line_number = va_arg(va,int);
break;
case sitecing::__magic_generic_exception:
message = va_arg(va,const char*);
root_source = va_arg(va,const char*);
root_intermediate = va_arg(va,const char *);
root_so = va_arg(va,const char *);
component = va_arg(va,const char*);
exception_caught = va_arg(va,const exception*);
break;
default:
break;
}
</%code>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title><% message %></title>
<style type="text/css">
<!--
body {
font-family: sans-serif;
font-size: 11pt;
}
h1 {
font-family: serif;
font-size: 130%;
font-weight: bold;
text-align: center;
}
p {
text-indent: 2em;
text-align: justify;
}
dl.exception-props {
margin: 1ex 1em;
padding: 0.5ex;
border: solid 1px gray;
background-color: #e0e0e0;
}
dl.exception-props dt {
font-weight: bold;
color: blue;
}
dl.exception-props dd {
color: gray;
}
div.exception-codepoint-report {
border: solid 1px black;
margin: 0.5ex 1em 0.ex 3em;
}
div.exception-codepoint-report h3 {
display: block;
color: blue;
border-bottom: 3px double black;
padding: 0.3ex; margin: 0px;
background: #e0e0e0;
}
div.exception-codepoint-report ul {
padding: 0px;
margin: 0px;
background: #87fdff;
font-size: 70%;
}
div.exception-codepoint-report li {
font-family: monospace;
list-style-type: none;
white-space: nowrap;
overflow: hidden;
}
div.exception-codepoint-report li.focused {
color: red;
border-top: solid 1px red; border-bottom: solid 1px red;
}
div.exception-codepoint-report li .lineno {
padding-right: 0.5ex;
border-right: dotted black 1px;
}
div.exception-codepoint-report div.what {
@@ -233,115 +233,116 @@
long error_line = -1;
while(!err.eof()) {
string oef = error_file;
long oel = error_line;
string line;
getline(err,line);
if(line[0]!=' ') {
string::size_type c = line.find(':');
if(c!=string::npos) {
string fn = line.substr(0,c);
string::size_type c1 = line.find(':',c+1);
if(c1!=string::npos) {
string ln = line.substr(c+1,c1-c-1);
string::size_type nd = ln.find_first_not_of("0123456789");
if(nd==string::npos) {
try {
error_file = sitecing::strip_prefix(fn,"In file included from ");
}catch(sitecing::utility_no_prefix& unp) {
error_file = fn;
}
error_line = strtol(ln.c_str(),0,10);
}
}
}
if((oel>0 && !oef.empty()) && (oel!=error_line || oef!=error_file)) {
string ef = "/"+konforka::combine_path(root_source+component,oef);
report_error(ef,oel,remove_roots(cumulative));
cumulative.clear();
}
}
if(!cumulative.empty())
cumulative += '\n';
cumulative += line;
}
if(!(cumulative.empty() || error_file.empty() || error_line<0)) {
error_file = "/"+konforka::combine_path(root_source+component,error_file);
report_error(error_file,error_line,remove_roots(cumulative));
}
}
</%code>
</div>
</%method>
<%method void handle_unknown_error() %>
<div class="exception-unknown">
<h1>unknown error</h1>
</div>
</%method>
<%method void report_error(const string& file,long line,const string& message) %>
<div class="exception-codepoint-report">
<h3><% sitecing::html_escape(strip_roots(file)) %></h3>
<%code>
if(line>=0) {
int firstline = line-5, lastline = line+5;
if(firstline<1)
firstline = 1;
ifstream ifs(file.c_str(),ios::in);
if(ifs.bad()) {
// TODO:
}else{
for(int l=1;l<firstline && !ifs.eof();l++) {
ifs.ignore(65536,'\n');
}
if(ifs.eof()) {
// TODO: no such line in file
}else{
<%output><ul></%output>
for(int l=firstline;l<=lastline && !ifs.eof();l++) {
string str;
getline(ifs,str);
for(string::size_type t=str.find('\t');t!=string::npos;t=str.find('\t')) {
str.replace(t,1,8-(t%8),' ');
}
char tln[16];
snprintf(tln,sizeof(tln),"%5d",l);
<%output>
<li class="<% l==line?"focused":"unfocused" %>"><span class="lineno"><% sitecing::html_escape(tln,sitecing::html_escape_nbsp) %></span>&nbsp;<span class="line"><% sitecing::html_escape(str,sitecing::html_escape_nbsp) %></span></li>
</%output>
}
<%output></ul></%output>
}
}
}
</%code>
<div class="what">
<% sitecing::html_escape(message,sitecing::html_escape_br) %>
</div>
</div>
</%method>
<%codemethod string strip_roots(const string& filename) %>
string np = konforka::normalize_path(filename);
try{
return sitecing::strip_prefix(np,root_source);
}catch(sitecing::utility_no_prefix& e){ }
try{
return sitecing::strip_prefix(np,root_intermediate);
}catch(sitecing::utility_no_prefix& e){ }
+ return np;
</%codemethod>
<%codemethod string remove_roots(const string& str) %>
string rv = str;
string::size_type rp;
string::size_type rl = root_source.length();
while((rp=rv.find(root_source))!=string::npos) {
rv.erase(rp,rl);
}
rl = root_intermediate.length();
while((rp=rv.find(root_intermediate))!=string::npos) {
rv.erase(rp,rl);
}
rl = root_so.length();
while((rp=rv.find(root_so))!=string::npos) {
rv.erase(rp,rl);
}
return rv;
</%codemethod>
% /* vim:set ft=sitecing: */