Generalize attributes to be comma-separated with arbitrary values

Before:

x = [string null]

After:

x = [string, null]

2 files changed, 7 insertions, 7 deletions

diff --git a/libbuild2/test/script/lexer.cxx b/libbuild2/test/script/lexer.cxx
index a65eb25..11913d5 100644
--- a/libbuild2/test/script/lexer.cxx
+++ b/libbuild2/test/script/lexer.cxx
@@ -131,7 +131,7 @@ namespace build2
             //
             assert (ps == '\0' ||
                     m == lexer_mode::eval ||
-                    m == lexer_mode::attributes);
+                    m == lexer_mode::attribute_value);
 
             base_lexer::mode (m, ps, esc);
             return;
diff --git a/libbuild2/test/script/parser+pre-parse.test.testscript b/libbuild2/test/script/parser+pre-parse.test.testscript
index f98512a..b2839eb 100644
--- a/libbuild2/test/script/parser+pre-parse.test.testscript
+++ b/libbuild2/test/script/parser+pre-parse.test.testscript
@@ -5,19 +5,19 @@
 : attribute
 :
 {
-  : pair
+  : name
   :
   $* <<EOI 2>>EOE != 0
-  x = [foo=bar]
+  x = [foo]
   EOI
-  testscript:1:5: error: unknown value attribute foo=bar
+  testscript:1:5: error: unknown value attribute foo
   EOE
 
-  : pair-empty
+  : name-value
   :
   $* <<EOI 2>>EOE != 0
-  x = [foo=]
+  x = [foo=bar]
   EOI
-  testscript:1:5: error: unknown value attribute foo
+  testscript:1:5: error: unknown value attribute foo=bar
   EOE
 }