Value expression architecture is now rewritten, but the functionality of the

old system (for example, the meaning of 'a') has yet to be restored.  In the
new scheme, this will be done by definition a function outside of the value
expression logic, rather than the tight coupling between journal innards and
value expressions that occurred in 2.x.

1 files changed, 83 insertions, 118 deletions

diff --git a/parser.h b/parser.h
index 3815780c..6b68c41b 100644
--- a/parser.h
+++ b/parser.h
@@ -1,137 +1,102 @@
+/*
+ * Copyright (c) 2003-2008, John Wiegley.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of New Artisans LLC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef _PARSER_H
 #define _PARSER_H
 
-#include "utils.h"
+#include "token.h"
+#include "op.h"
 
 namespace ledger {
 
-class account_t;
-class journal_t;
-class session_t;
-
-class parser_t : public noncopyable
+class expr_t::parser_t : public noncopyable
 {
-public:
-  parser_t() {
-    TRACE_CTOR(parser_t, "");
-  }
-  virtual ~parser_t() {
-    TRACE_DTOR(parser_t);
+#define EXPR_PARSE_NORMAL     0x00
+#define EXPR_PARSE_PARTIAL    0x01
+#define EXPR_PARSE_NO_MIGRATE 0x02
+#define EXPR_PARSE_NO_REDUCE  0x04
+#define EXPR_PARSE_NO_ASSIGN  0x08
+#define EXPR_PARSE_NO_DATES   0x10
+
+  mutable token_t lookahead;
+  mutable bool	  use_lookahead;
+
+  token_t& next_token(std::istream& in, token_t::flags_t tflags) const
+  {
+    if (use_lookahead)
+      use_lookahead = false;
+    else
+      lookahead.next(in, tflags);
+    return lookahead;
   }
 
-  virtual bool test(std::istream& in) const = 0;
-
-  virtual unsigned int parse(std::istream& in,
-			     session_t&    session,
-			     journal_t&	   journal,
-			     account_t *   master        = NULL,
-			     const path *  original_file = NULL) = 0;
-};
-
-unsigned int parse_journal(std::istream& in,
-			   session_t&    session,
-			   journal_t&	 journal,
-			   account_t *	 master        = NULL,
-			   const path *	 original_file = NULL);
-
-unsigned int parse_journal_file(const path&  path,
-				session_t&   session,
-				journal_t&   journal,
-				account_t *  master        = NULL,
-				const path * original_file = NULL);
+  void push_token(const token_t& tok) const
+  {
+    assert(&tok == &lookahead);
+    use_lookahead = true;
+  }
 
-unsigned int parse_ledger_data(session_t& session,
-			       journal_t& journal,
-			       parser_t * cache_parser = NULL,
-			       parser_t * xml_parser   = NULL,
-			       parser_t * stdin_parser = NULL);
+  void push_token() const
+  {
+    use_lookahead = true;
+  }
 
-class parse_error : public error
-{
 public:
-  parse_error(const string& reason, error_context * ctxt = NULL) throw()
-    : error(reason, ctxt) {}
-  virtual ~parse_error() throw() {}
-};
-
-/************************************************************************
- *
- * General utility parsing functions
- */
-
-inline char * skip_ws(char * ptr) {
-  while (*ptr == ' ' || *ptr == '\t' || *ptr == '\n')
-    ptr++;
-  return ptr;
-}
+  typedef uint_least8_t flags_t;
+
+private:
+  ptr_op_t parse_value_term(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_unary_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_mul_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_add_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_logic_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_and_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_or_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_querycolon_expr(std::istream& in, const flags_t flags) const;
+  ptr_op_t parse_value_expr(std::istream& in, const flags_t flags) const;
 
-inline char * next_element(char * buf, bool variable = false) {
-  for (char * p = buf; *p; p++) {
-    if (! (*p == ' ' || *p == '\t'))
-      continue;
-
-    if (! variable) {
-      *p = '\0';
-      return skip_ws(p + 1);
-    }
-    else if (*p == '\t') {
-      *p = '\0';
-      return skip_ws(p + 1);
-    }
-    else if (*(p + 1) == ' ') {
-      *p = '\0';
-      return skip_ws(p + 2);
-    }
+public:
+  parser_t() : use_lookahead(false) {
+    TRACE_CTOR(parser_t, "");
   }
-  return NULL;
-}
-
-inline char peek_next_nonws(std::istream& in) {
-  char c = in.peek();
-  while (! in.eof() && std::isspace(c)) {
-    in.get(c);
-    c = in.peek();
+  ~parser_t() throw() {
+    TRACE_DTOR(parser_t);
   }
-  return c;
-}
-
-#define READ_INTO(str, targ, size, var, cond) {				\
-  char * _p = targ;							\
-  var = str.peek();							\
-  while (! str.eof() && var != '\n' && (cond) && _p - targ < size) {	\
-    str.get(var);							\
-    if (str.eof())							\
-      break;								\
-    if (var == '\\') {							\
-      str.get(var);							\
-      if (in.eof())							\
-	break;								\
-    }									\
-    *_p++ = var;							\
-    var = str.peek();							\
-  }									\
-  *_p = '\0';								\
-}
 
-#define READ_INTO_(str, targ, size, var, idx, cond) {			\
-  char * _p = targ;							\
-  var = str.peek();							\
-  while (! str.eof() && var != '\n' && (cond) && _p - targ < size) {	\
-    str.get(var);							\
-    if (str.eof())							\
-      break;								\
-    idx++;								\
-    if (var == '\\') {							\
-      str.get(var);							\
-      if (in.eof())							\
-	break;								\
-      idx++;								\
-    }									\
-    *_p++ = var;							\
-    var = str.peek();							\
-  }									\
-  *_p = '\0';								\
-}
+  ptr_op_t parse(std::istream& in, const flags_t flags = EXPR_PARSE_NORMAL);
+  ptr_op_t parse(string& str, const flags_t flags = EXPR_PARSE_NORMAL) {
+    std::istringstream stream(str);
+    return parse(stream, flags);
+  }
+};
 
 } // namespace ledger