Change pairs semantics from separated to unseparated

Before we use to recognize 'x @ y' as a pair. Now it has to be written
unseparated, as 'x@y'. See tests/pairs for details on the new semantics.

3 files changed, 70 insertions, 0 deletions

diff --git a/tests/pairs/buildfile b/tests/pairs/buildfile
new file mode 100644
index 0000000..3b55044
--- /dev/null
+++ b/tests/pairs/buildfile
@@ -0,0 +1,40 @@
+print foo@bar       # foo@bar
+print foo@{bar}     # foo@bar
+print {foo}@bar     # foo@bar
+print {foo@bar}     # foo@bar
+print {{foo}@{bar}} # foo@bar
+print "{foo}@bar"   # {foo}@bar
+
+print foo@          # foo@{}
+print {foo}@        # foo@{}
+print {foo}@{}      # foo@{}
+print {foo}@ {FOO}@ # foo@{} FOO@{}
+v=foo@
+print $v            # foo@{}
+
+print @bar          # {}@bar
+print @{bar}        # {}@bar
+print {}@{bar}      # {}@bar
+print @{BAR} @{bar} # {}@BAR {}@bar
+v=@bar
+print $v            # {}@bar
+
+print @             # {}@{}
+print @{}           # {}@{}
+print {}@           # {}@{}
+print {}@{}         # {}@{}
+print {@}           # {}@{}
+v=@
+print $v            # {}@{}
+
+print @ @           # {}@{} {}@{}
+v=@ @
+print $v            # {}@{} {}@{}
+
+print @{bar BAR}    # {}@bar {}@BAR
+print @{bar {BAR}}  # {}@bar {}@BAR
+print foo@{bar BAR} # foo@bar foo@BAR
+
+#print @@           # error: double pair separator
+
+./:
diff --git a/tests/pairs/test.out b/tests/pairs/test.out
new file mode 100644
index 0000000..6033c84
--- /dev/null
+++ b/tests/pairs/test.out
@@ -0,0 +1,27 @@
+foo@bar
+foo@bar
+foo@bar
+foo@bar
+foo@bar
+{foo}@bar
+foo@{}
+foo@{}
+foo@{}
+foo@{} FOO@{}
+foo@{}
+{}@bar
+{}@bar
+{}@bar
+{}@BAR {}@bar
+{}@bar
+{}@{}
+{}@{}
+{}@{}
+{}@{}
+{}@{}
+{}@{}
+{}@{} {}@{}
+{}@{} {}@{}
+{}@bar {}@BAR
+{}@bar {}@BAR
+foo@bar foo@BAR
diff --git a/tests/pairs/test.sh b/tests/pairs/test.sh
new file mode 100755
index 0000000..b898b3c
--- /dev/null
+++ b/tests/pairs/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+valgrind -q b -q | diff -u test.out -