hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced error location handling for awk

Browse Source
This commit is contained in:
hyung-hwan
2009-08-26 03:50:07 +00:00
parent 48aa3f2d34
commit 9253c8644f
15 changed files with 746 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qse/samples/awk/awk05.cpp
View File

@ -20,10 +20,10 @@
#include <qse/cmn/stdio.h>
#include <qse/cmn/main.h>
static void print_error (unsigned long line, const qse_char_t* msg)
static void print_error (const qse_awk_loc_t& loc, const qse_char_t* msg)
{
if (line > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu\n"), msg, line);
if (loc.lin > 0 || loc.col > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu COLUMN %lu\n"), msg, loc.lin, loc.col);
else
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s\n"), msg);
@ -61,7 +61,11 @@ static int awk_main (int argc, qse_char_t* argv[])
int ret = awk.open ();
if (ret >= 0) ret = run_awk (awk);
if (ret <= -1) print_error (awk.getErrorLine(), awk.getErrorMessage());
if (ret <= -1)
{
qse_awk_loc_t loc = awk.getErrorLocation();
print_error (loc, awk.getErrorMessage());
}
awk.close ();
return ret;

12
qse/samples/awk/awk06.cpp
View File

@ -20,10 +20,10 @@
#include <qse/cmn/stdio.h>
#include <qse/cmn/main.h>
static void print_error (unsigned long line, const qse_char_t* msg)
static void print_error (const qse_awk_loc_t& loc, const qse_char_t* msg)
{
if (line > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu\n"), msg, line);
if (loc.lin > 0 || loc.col > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu COLUMN %lu\n"), msg, loc.lin, loc.col);
else
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s\n"), msg);
@ -88,7 +88,11 @@ static int awk_main (int argc, qse_char_t* argv[])
int ret = awk.open();
if (ret >= 0) ret = run_awk (awk);
if (ret <= -1) print_error (awk.getErrorLine(), awk.getErrorMessage());
if (ret <= -1)
{
qse_awk_loc_t loc = awk.getErrorLocation();
print_error (loc, awk.getErrorMessage());
}
awk.close ();
return -1;

12
qse/samples/awk/awk07.cpp
View File

@ -20,10 +20,10 @@
#include <qse/cmn/stdio.h>
#include <qse/cmn/main.h>
static void print_error (unsigned long line, const qse_char_t* msg)
static void print_error (const qse_awk_loc_t& loc, const qse_char_t* msg)
{
if (line > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu\n"), msg, line);
if (loc.lin > 0 || loc.col > 0)
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s at LINE %lu COLUMN %lu\n"), msg, loc.lin, loc.col);
else
qse_fprintf (QSE_STDERR, QSE_T("ERROR: %s\n"), msg);
@ -123,7 +123,11 @@ static int awk_main (int argc, qse_char_t* argv[])
QSE::StdAwk::OPT_RESET);
if (ret >= 0) ret = run_awk (awk);
if (ret <= -1) print_error (awk.getErrorLine(), awk.getErrorMessage());
if (ret <= -1)
{
qse_awk_loc_t loc = awk.getErrorLocation();
print_error (loc, awk.getErrorMessage());
}
awk.close ();
return -1;

4
qse/samples/awk/awk08.cpp
View File

@ -173,9 +173,11 @@ static void print_error (const qse_char_t* fmt, ...)
static void print_error (MyAwk& awk)
{
MyAwk::loc_t loc = awk.getErrorLocation();
print_error (
QSE_T("LINE [%u] %s\n"),
(unsigned)awk.getErrorLine(),
(unsigned)loc.lin,
awk.getErrorMessage()
);
}