From 94f0866683bdf063b30323bac227e11a23110fa2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 22 Aug 2009 10:20:34 +0200
Subject: Add call and template expressions

Also add support for querying the lexer failure state.
---
 cli/token.ixx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'cli/token.ixx')

diff --git a/cli/token.ixx b/cli/token.ixx
index bcf040a..93db6d8 100644
--- a/cli/token.ixx
+++ b/cli/token.ixx
@@ -24,7 +24,7 @@ column () const
 inline Token::Keyword Token::
 keyword () const
 {
-  return keyword_;
+  return type_ == t_keyword ? keyword_ : k_invalid;
 }
 
 inline std::string const& Token::
@@ -36,7 +36,7 @@ identifier () const
 inline Token::Punctuation Token::
 punctuation () const
 {
-  return punctuation_;
+  return type_ == t_punctuation ? punctuation_ : p_invalid;
 }
 
 inline std::string const& Token::
@@ -45,6 +45,12 @@ literal () const
   return str_;
 }
 
+inline std::string const& Token::
+expression () const
+{
+  return str_;
+}
+
 inline Token::
 Token (std::size_t l, std::size_t c)
     : l_ (l), c_ (c), type_ (t_eos)
-- 
cgit v1.1