[anjuta] am-project: Fix configure.ac parser allowing to load gnucash



commit d6a21342f1f0fa283ac278367d22cf254c25f05e
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Fri Feb 10 22:51:29 2012 +0100

    am-project: Fix configure.ac parser allowing to load gnucash
    
    The errors were syntax errors due to forgotten cases in the parser.
    There are still some errors when loading some Makefile.am but it doesn't matter.
    I have added a test case with gnucash.

 plugins/am-project/ac-parser.y        |    3 +++
 plugins/am-project/tests/Makefile.am  |    7 +++++--
 plugins/am-project/tests/testsuite.at |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/plugins/am-project/ac-parser.y b/plugins/am-project/ac-parser.y
index ac06d75..442ef2c 100644
--- a/plugins/am-project/ac-parser.y
+++ b/plugins/am-project/ac-parser.y
@@ -523,6 +523,7 @@ not_single_token:
 	| HASH
 	| END_OF_LINE
 	| DOUBLE_QUOTE
+	| RIGHT_BRACE
     ;
 
 double_string:
@@ -658,6 +659,7 @@ arg_string_body:
         anjuta_token_merge ($1, $2);
     }
     | arg_string_body macro
+    | arg_string_body dnl
     | arg_string_body raw_string {
         anjuta_token_merge ($1, $2);
     }
@@ -702,6 +704,7 @@ arg_part:
     arg_string
     | expression
     | macro
+	| dnl
     | arg_token
     ;
 
diff --git a/plugins/am-project/tests/Makefile.am b/plugins/am-project/tests/Makefile.am
index 15c1897..fa7e8c2 100644
--- a/plugins/am-project/tests/Makefile.am
+++ b/plugins/am-project/tests/Makefile.am
@@ -7,7 +7,9 @@ EXTRA_DIST = testsuite.at \
 	atlocal.in \
 	anjuta.lst \
 	nemiver.shar \
-	nemiver.lst
+	nemiver.lst \
+	gnucash.shar \
+	gnucash.lst
 
 DISTCLEANFILES = atconfig
 
@@ -42,7 +44,8 @@ TESTSUITE_AT = \
 	$(srcdir)/bugs.at \
 	$(srcdir)/nemiver.at \
 	$(srcdir)/ltinit.at \
-	$(srcdir)/comment.at
+	$(srcdir)/comment.at \
+	$(srcdir)/gnucash.at
 
 TESTSUITE = $(srcdir)/testsuite
 
diff --git a/plugins/am-project/tests/testsuite.at b/plugins/am-project/tests/testsuite.at
index f1dc221..df13349 100644
--- a/plugins/am-project/tests/testsuite.at
+++ b/plugins/am-project/tests/testsuite.at
@@ -16,3 +16,4 @@ m4_include([bugs.at])
 m4_include([nemiver.at])
 m4_include([ltinit.at])
 m4_include([comment.at])
+m4_include([gnucash.at])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]