2007-04-03 Pierre Peiffer <pierre.peiffer@bull.net>

	* parse.cxx, parse.h (lexer::scan): Add $# and @# identifiers.
	(eval_pp_conditional, scan_pp): Allow the use of $x and @x identifiers.
	Produce more accurate error messages.
	* stap.1.in: Document $# and @# identifiers.

2007-04-04  Pierre Peiffer  <pierre.peiffer@bull.net>

	* parseok/fourteen.stp: Add test about $# and @# usage during
	the preprocessing.
	* parseko/preprocess10.stp: New test.
	* parseko/preprocess11.stp: New test.
	* parseko/preprocess12.stp: New test.

1 files changed, 3 insertions, 2 deletions

diff --git a/parse.h b/parse.h
index c6a778ca..b160b4f9 100644
--- a/parse.h
+++ b/parse.h
@@ -1,5 +1,6 @@
 // -*- C++ -*-
 // Copyright (C) 2005 Red Hat Inc.
+// Copyright (C) 2007 Bull S.A.S
 //
 // This file is part of systemtap, and is free software.  You can
 // redistribute it and/or modify it under the terms of the GNU General
@@ -68,7 +69,7 @@ struct systemtap_session;
 class lexer
 {
 public:
-  token* scan ();
+  token* scan (bool expand_args=true);
   lexer (std::istream&, const std::string&, systemtap_session&);
 
 private:
@@ -128,7 +129,7 @@ private:
 
   // preprocessing subordinate
   std::vector<const token*> enqueued_pp;
-  const token* scan_pp ();
+  const token* scan_pp (bool expand_args=true);
 
   // scanning state
   const token* last ();