aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/test/script
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-11-15 15:00:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-11-15 15:00:25 +0200
commit497793c854b9dfbf70c2c23813b6b7f06012bcc2 (patch)
treebe2ec7600889314efbaef22037c094e32b3af6e5 /libbuild2/test/script
parent417497632ddfa2bdc17688703c24ca3fd60af318 (diff)
Generalize attributes to be comma-separated with arbitrary values
Before: x = [string null] After: x = [string, null]
Diffstat (limited to 'libbuild2/test/script')
-rw-r--r--libbuild2/test/script/lexer.cxx2
-rw-r--r--libbuild2/test/script/parser+pre-parse.test.testscript12
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
}