From e4725c3bb8235da450f9d7121c93b34a5b2c5c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <pawel.kedzia@pwr.wroc.pl>
Date: Fri, 10 Dec 2010 09:55:41 +0100
Subject: [PATCH] Caught the antlr::TokenStreamRecognitionException exception
---
libwccl/parser/Parser.cpp | 21 +++++++++++++++++++++
wcclparser/bool_main.cpp | 8 +++++++-
wcclparser/strop_main.cpp | 4 ++++
wcclparser/tagset_main.cpp | 4 ++++
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index b713ae6..86389a3 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -4,6 +4,7 @@
#include <antlr/NoViableAltException.hpp>
#include <antlr/MismatchedTokenException.hpp>
+#include <antlr/TokenStreamRecognitionException.hpp>
namespace Wccl {
@@ -190,6 +191,11 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
<< "(as tset ) "
<< e.getFileLineColumnString()
<< " " << e.getMessage();
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ errors << std::endl
+ << "(as tset ) "
+ << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage();
} catch (antlr::ANTLRException& e) {
errors << std::endl
<< "(as tset ) " << e.getMessage();
@@ -213,6 +219,11 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
<< "(as strset ) "
<< e.getFileLineColumnString()
<< " " << e.getMessage();
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ errors << std::endl
+ << "(as strset ) "
+ << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage();
} catch (antlr::ANTLRException& e) {
errors << std::endl
<< "(as strset ) " << e.getMessage();
@@ -236,6 +247,11 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
<< "(as bool ) "
<< e.getFileLineColumnString()
<< " " << e.getMessage();
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ errors << std::endl
+ << "(as bool ) "
+ << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage();
} catch (antlr::ANTLRException& e) {
errors << std::endl
<< "(as bool ) " << e.getMessage();
@@ -254,6 +270,11 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
<< "(as position) "
<< e.getFileLineColumnString()
<< " " << e.getMessage() << std::endl;
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ errors << std::endl
+ << "(as position) "
+ << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage();
} catch(antlr::NoViableAltException &e) {
errors << std::endl
<< "(as position) "
diff --git a/wcclparser/bool_main.cpp b/wcclparser/bool_main.cpp
index c1570b0..05c8427 100644
--- a/wcclparser/bool_main.cpp
+++ b/wcclparser/bool_main.cpp
@@ -2,8 +2,10 @@
#include <libwccl/values/bool.h>
#include <libwccl/parser/Parser.h>
#include <libwccl/parser/ANTLRParserResult.h>
+
#include <antlr/NoViableAltException.hpp>
#include <antlr/MismatchedTokenException.hpp>
+#include <antlr/TokenStreamRecognitionException.hpp>
// ----------------------------------------------------------------------------
@@ -68,11 +70,15 @@ int main()
} catch(antlr::NoViableAltException &e) {
std::cerr << e.getFileLineColumnString()
<< " " << e.getMessage() << std::endl;
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ std::cerr << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage() << std::endl;
} catch (Wccl::InvalidVariableName &e) {
std::cerr << "Wccl::InvalidVariableName" << std::endl;
} catch (Wccl::VariableTypeMismatch &e) {
std::cerr << "Wccl::VariableTypeMismatch" << std::endl;
- } catch (...) {
+ }
+ catch (...) {
std::cerr << "[N] Syntax error!" << std::endl;
}
}
diff --git a/wcclparser/strop_main.cpp b/wcclparser/strop_main.cpp
index 13be60b..aaf4c97 100644
--- a/wcclparser/strop_main.cpp
+++ b/wcclparser/strop_main.cpp
@@ -4,6 +4,7 @@
#include <libwccl/parser/ANTLRParserResult.h>
#include <antlr/NoViableAltException.hpp>
#include <antlr/MismatchedTokenException.hpp>
+#include <antlr/TokenStreamRecognitionException.hpp>
// ----------------------------------------------------------------------------
@@ -67,6 +68,9 @@ int main()
} catch(antlr::NoViableAltException &e) {
std::cerr << e.getFileLineColumnString()
<< " " << e.getMessage() << std::endl;
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ std::cerr << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage() << std::endl;
} catch (Wccl::InvalidVariableName &e) {
std::cerr << "Wccl::InvalidVariableName" << std::endl;
} catch (Wccl::VariableTypeMismatch &e) {
diff --git a/wcclparser/tagset_main.cpp b/wcclparser/tagset_main.cpp
index ddfaaa4..94f84f9 100644
--- a/wcclparser/tagset_main.cpp
+++ b/wcclparser/tagset_main.cpp
@@ -4,6 +4,7 @@
#include <libwccl/parser/ANTLRParserResult.h>
#include <antlr/NoViableAltException.hpp>
#include <antlr/MismatchedTokenException.hpp>
+#include <antlr/TokenStreamRecognitionException.hpp>
#include <libcorpus2/tagsetmanager.h>
@@ -69,6 +70,9 @@ int main()
} catch(antlr::NoViableAltException &e) {
std::cerr << e.getFileLineColumnString()
<< " " << e.getMessage() << std::endl;
+ } catch(antlr::TokenStreamRecognitionException &e) {
+ std::cerr << e.getLine() << ":" << e.getColumn()
+ << " " << e.getMessage() << std::endl;
} catch (Wccl::InvalidVariableName &e) {
std::cerr << "Wccl::InvalidVariableName" << std::endl;
} catch (Wccl::VariableTypeMismatch &e) {
--
GitLab