[Emacs-diffs] scratch/merge-cedet-tests 6945c33 126/316: Expand preprocessor to handle macros which open or close scope.

[Edward John Steere]

branch: scratch/merge-cedet-tests
commit 6945c33baa7934a7a1a79735399f7e34b0ece627
Author: David Engster <address@hidden>
Commit: Edward John Steere <address@hidden>

    Expand preprocessor to handle macros which open or close scope.
    
    * semantic/lex-spp.el (semantic-c-end-of-macro): Declare.
    (semantic-lex-spp-token-macro-to-macro-stream): Deal with macros which
    open/close a scope.  For this, leave an overlay if we encounter a
    single open paren and return a semantic-list in the lexer.  When this
    list gets expanded, retrieve the old position from the overlay.  See
    the comments in the function for further details.
    (semantic-lex-spp-find-closing-macro): New function to find the next
    macro which closes scope (i.e., has a closing paren).
    (semantic-lex-spp-replace-or-symbol-or-keyword): Go to end of closing
    macro if necessary.
    (semantic-lex-spp-paren-or-list): New lexer to specially deal with
    parens in macro definitions.
    
    * bovine/c.el (semantic-cpp-lexer): Use new
    `semantic-lex-spp-paren-or-list'.
    
    * tests/cedet/semantic/test/manual/cedet/testsppreplace.c:
    * tests/cedet/semantic/test/manual/cedet/testsppreplaced.c: Add tests for 
the
    above.
---
 .../cedet/cedet/semantic/tests/testsppreplaced.c     |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/manual/cedet/cedet/semantic/tests/testsppreplaced.c 
b/test/manual/cedet/cedet/semantic/tests/testsppreplaced.c
index 105d6ac..ca87030 100644
--- a/test/manual/cedet/cedet/semantic/tests/testsppreplaced.c
+++ b/test/manual/cedet/cedet/semantic/tests/testsppreplaced.c
@@ -99,6 +99,24 @@ int MACROA () {
 /* TEST: Fancy concat/recursive macros */
 int ABtest;
 
+/* TEST: Macros which open a scope which is closed by another macro */
+namespace foo {
+  struct inside_foo {};
+  struct inside_foo_as_well {};
+}
+
+namespace foo {
+  namespace bar {
+    struct inside_foo_bar {};
+  }
+}
+
+namespace one {
+  namespace two {
+    struct inside_one_two ();
+  }
+}
+
 /* TEST: Macro Recursion limits in arguments to a macro.
  * This code is from ALSA, noticed by Yupeng. */
 /* See commentary in testsppreplace.c. This test is broken.