Add support for single quotes in option files

13 files changed, 45 insertions, 16 deletions

diff --git a/tests/file/makefile b/tests/file/makefile
index 2029d83..af71907 100644
--- a/tests/file/makefile
+++ b/tests/file/makefile
@@ -8,7 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 cxx_tun := driver.cxx
 cli_tun := test.cli
 
-tests := 000 001 002 003 004 005 006 007
+tests := 000 001 002 003 004 005 006 007 008 009 010 011 012
 
 #
 #
@@ -63,21 +63,9 @@ $(out_base)/.test-003: $(driver)
 	$(call message,test $(out_base)/003,$(driver) -a 1 --file \
 $(src_base)/base.ops --file test-003.ops b | diff -u $(src_base)/test-003.std -)
 
-$(out_base)/.test-004: $(driver) $(src_base)/test-004.ops
-	$(call message,test $(out_base)/004,$(driver) --file \
-$(src_base)/test-004.ops | diff -u $(src_base)/test-004.std -)
-
-$(out_base)/.test-005: $(driver) $(src_base)/test-005.ops
-	$(call message,test $(out_base)/005,$(driver) --file \
-$(src_base)/test-005.ops | diff -u $(src_base)/test-005.std -)
-
-$(out_base)/.test-006: $(driver) $(src_base)/test-006.ops
-	$(call message,test $(out_base)/006,$(driver) --file \
-$(src_base)/test-006.ops | diff -u $(src_base)/test-006.std -)
-
-$(out_base)/.test-007: $(driver) $(src_base)/test-007.ops
-	$(call message,test $(out_base)/007,$(driver) --file \
-$(src_base)/test-007.ops | diff -u $(src_base)/test-007.std -)
+$(out_base)/.test-%: $(driver) $(src_base)/test-%.ops $(src_base)/test-%.std
+	$(call message,test $(out_base)/$*,$(driver) --file \
+$(src_base)/test-$*.ops | diff -u $(src_base)/test-$*.std -)
 
 # Clean.
 #
diff --git a/tests/file/test-004.ops b/tests/file/test-004.ops
index 3246233..dee1b30 100644
--- a/tests/file/test-004.ops
+++ b/tests/file/test-004.ops
@@ -4,3 +4,14 @@
 -a ""
 -a " abc "
 -a " "
+-a """
+-a "'"
+
+-a a'b'c
+-a 'abc'
+-a 'a'b'
+-a ''
+-a ' abc '
+-a ' '
+-a '''
+-a '"'
diff --git a/tests/file/test-004.std b/tests/file/test-004.std
index 01114a0..b06e8b9 100644
--- a/tests/file/test-004.std
+++ b/tests/file/test-004.std
@@ -10,3 +10,23 @@ a"b
  abc 
 -a
  
+-a
+"
+-a
+'
+-a
+a'b'c
+-a
+abc
+-a
+a'b
+-a
+
+-a
+ abc 
+-a
+ 
+-a
+'
+-a
+"
diff --git a/tests/file/test-008.ops b/tests/file/test-008.ops
new file mode 100644
index 0000000..773a366
--- /dev/null
+++ b/tests/file/test-008.ops
@@ -0,0 +1 @@
+-a '
diff --git a/tests/file/test-008.std b/tests/file/test-008.std
new file mode 100644
index 0000000..5d74dc3
--- /dev/null
+++ b/tests/file/test-008.std
@@ -0,0 +1 @@
+unmatched quote in argument '''
diff --git a/tests/file/test-009.ops b/tests/file/test-009.ops
new file mode 100644
index 0000000..6c3d5c9
--- /dev/null
+++ b/tests/file/test-009.ops
@@ -0,0 +1 @@
+-a 'abc
diff --git a/tests/file/test-009.std b/tests/file/test-009.std
new file mode 100644
index 0000000..b212446
--- /dev/null
+++ b/tests/file/test-009.std
@@ -0,0 +1 @@
+unmatched quote in argument ''abc'
diff --git a/tests/file/test-010.ops b/tests/file/test-010.ops
new file mode 100644
index 0000000..eb33825
--- /dev/null
+++ b/tests/file/test-010.ops
@@ -0,0 +1 @@
+-a abc'
diff --git a/tests/file/test-010.std b/tests/file/test-010.std
new file mode 100644
index 0000000..868ee9d
--- /dev/null
+++ b/tests/file/test-010.std
@@ -0,0 +1 @@
+unmatched quote in argument 'abc''
diff --git a/tests/file/test-011.ops b/tests/file/test-011.ops
new file mode 100644
index 0000000..2330c9c
--- /dev/null
+++ b/tests/file/test-011.ops
@@ -0,0 +1 @@
+-a "abc'
diff --git a/tests/file/test-011.std b/tests/file/test-011.std
new file mode 100644
index 0000000..2133ddf
--- /dev/null
+++ b/tests/file/test-011.std
@@ -0,0 +1 @@
+unmatched quote in argument '"abc''
diff --git a/tests/file/test-012.ops b/tests/file/test-012.ops
new file mode 100644
index 0000000..d5efe67
--- /dev/null
+++ b/tests/file/test-012.ops
@@ -0,0 +1 @@
+-a 'abc"
diff --git a/tests/file/test-012.std b/tests/file/test-012.std
new file mode 100644
index 0000000..2e85d39
--- /dev/null
+++ b/tests/file/test-012.std
@@ -0,0 +1 @@
+unmatched quote in argument ''abc"'